aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-318-53/+92
|\
| * lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
| |
| * move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-317-51/+90
| |
* | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
|/
* Fix update from keyserverDominik Schürmann2014-07-311-0/+5
|
* Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
|
* Fixes for uploadDominik Schürmann2014-07-314-15/+20
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-315-46/+43
|\
| * fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-313-25/+21
| |
| * more fixes on canonicalization and progressVincent Breitmoser2014-07-312-21/+22
| |
* | Create key: design fixesDominik Schürmann2014-07-319-23/+52
|/
* Fix animations in create keyDominik Schürmann2014-07-315-47/+31
|
* Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-314-19/+99
|\
| * completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-314-19/+99
| | | | | | | | methods
* | Robots like coffee too...Dominik Schürmann2014-07-3117-36/+163
|/
* Parcelable data over 1MB can not be send through binder, parcel into a cache ↵Dominik Schürmann2014-07-313-16/+128
| | | | file, fix #592
* avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
|
* fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
|
* always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
|
* tests: adapt to new EditKeyResult return valueVincent Breitmoser2014-07-317-397/+98
|
* Handle result in create keyDominik Schürmann2014-07-311-2/+7
|
* Fix stringDominik Schürmann2014-07-311-1/+1
|
* Keyserver exception translateableDominik Schürmann2014-07-3113-25/+36
|
* Smaller notesDominik Schürmann2014-07-312-1/+9
|
* reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-312-30/+71
|
* Even better Exception handling with keyserver queriesDominik Schürmann2014-07-311-8/+10
|
* Exception handling with keyserver queriesDominik Schürmann2014-07-312-6/+14
|
* couple of logging fixesVincent Breitmoser2014-07-313-6/+4
|
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3125-236/+213
|
* Better exception handling for import of keysDominik Schürmann2014-07-319-47/+27
|
* More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-313-17/+181
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-303-23/+15
|\
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-303-23/+15
| |
* | Create key: work on uploadDominik Schürmann2014-07-308-192/+242
|/
* Create key: repeat passphraseDominik Schürmann2014-07-305-11/+46
|
* Create key: uploadDominik Schürmann2014-07-302-13/+22
|
* Fix drawer in key listDominik Schürmann2014-07-301-4/+4
|
* return values for create keyDominik Schürmann2014-07-303-8/+22
|
* Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
|
* Fix conflictsDominik Schürmann2014-07-302-3/+25
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3046-1033/+333
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
| * fix a couple remaining AppMsgsVincent Breitmoser2014-07-292-10/+7
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2940-1005/+310
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-2714-52/+100
| | |
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2715-120/+87
| | |
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-26174-1260/+5344
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-072-3/+64
| | | |
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-0717-112/+82
| | | |
| | * | get rid of AppMsg libraryVincent Breitmoser2014-07-077-753/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:40:35 +0000