aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-450/+0
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-061-2/+5
|\ | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-051-2/+5
| |
* | Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-051-31/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * version 2.5Dominik Schürmann2014-04-031-2/+2
| |
| * Version 2.4Dominik Schürmann2014-03-261-2/+2
| |
| * Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOTDominik Schürmann2014-03-261-3/+3
| |
| * Accounts API, user interfaceDominik Schürmann2014-03-261-25/+28
| |
| * More experimental work on API accountsDominik Schürmann2014-03-251-1/+1
| |
| * Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-231-4/+4
| |
* | Merge branch 'master' into certsVincent Breitmoser2014-03-121-27/+16
|\| | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-12/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * | Add Email suggestions in Create Key activityuberspot2014-03-121-0/+1
| | |
| * | beta4Dominik Schürmann2014-03-081-2/+2
| | |
| * | remove unused search definitions from manifestDominik Schürmann2014-03-061-40/+0
| | |
| * | 2.3.1 beta3Dominik Schürmann2014-03-061-2/+2
| | |
| * | Put Preferences in subscreenuberspot2014-03-051-1/+10
| | |
| * | 2.3.1 beta2Dominik Schürmann2014-03-041-2/+2
| | |
| * | return SIGNATURE_SUCCESS_UNCERTIFIED from serviceDominik Schürmann2014-03-041-1/+2
| | |
* | | add view cert activityVincent Breitmoser2014-03-121-0/+9
| |/ |/|
* | ditch old key list activitiesVincent Breitmoser2014-03-081-34/+4
| |
* | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-061-5/+11
|/
* version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
|
* version code 23101 for beta testingDominik Schürmann2014-03-021-1/+1
|
* AndroidManfiest code for later...Dominik Schürmann2014-02-211-2/+22
|
* import key from email app directlyDominik Schürmann2014-02-211-25/+37
|
* rename intent helperDominik Schürmann2014-02-161-0/+8
|
* fix some intents and demosDominik Schürmann2014-02-161-2/+3
|
* intent demo, fix some intentsDominik Schürmann2014-02-151-14/+28
|
* conversion of other methodsDominik Schürmann2014-02-141-13/+13
|
* PendingIntent to handle user inputDominik Schürmann2014-02-141-4/+3
|
* Introducing new ParcelFileDescriptor pipesDominik Schürmann2014-02-141-1/+1
|
* Hotfix for database upgrade, version 2.3.1Dominik Schürmann2014-02-051-2/+2
|
* Version 2.3Dominik Schürmann2014-02-051-2/+2
|
* temporary fix for nullpointer on orientation change in import activityDominik Schürmann2014-02-041-0/+1
|
* Certify not sign a key, added as button, does not belong to menuDominik Schürmann2014-02-041-2/+2
|
* expose key server APIDominik Schürmann2014-02-021-0/+1
|
* Update version code for betaDominik Schürmann2014-02-021-1/+1
|
* Use buttons for encrypt decrypt instead of actionbarDominik Schürmann2014-02-021-5/+1
|
* Hacks to make dialogs on Android 2.3 black on white, and not black on blackDominik Schürmann2014-02-021-1/+1
|
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-021-22/+22
|
* Reworking import, testing needed...Dominik Schürmann2014-02-011-4/+0
|
* rename KeyServerUploadActivity to UploadKeyActivityDominik Schürmann2014-02-011-1/+1
|
* Fix layout, add API notes to README, register fingerprint URIs, some ↵Dominik Schürmann2014-02-011-0/+14
| | | | reformatting (sry)
* New Gradle project structureDominik Schürmann2014-01-271-0/+408
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 00:10:28 +0000