aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-08-012-9/+15
|\
| * Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-013-15/+72
| |\
| | * Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
| | |\ | | | | | | | | Fix import from server
| | | * Undo import changesmar-v-in2014-08-011-3/+27
| | | |
| | | * Fix import from servermar-v-in2014-08-011-30/+17
| | | | | | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable
| | * | Fix CachedPublicKeyringmar-v-in2014-08-012-12/+58
| | | | | | | | | | | | | | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
| * | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| |/ /
* | | Fixes after mergemar-v-in2014-08-011-2/+5
| | |
* | | Merge branch 'master' into improve-file-moremar-v-in2014-08-0125-206/+299
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-013-23/+26
| | |
| * | Certifying instead of signingDominik Schürmann2014-08-012-7/+7
| | |
| * | Remove runtime check to fix passphrase serviceDominik Schürmann2014-08-011-6/+0
| | |
| * | Use darker colorsDominik Schürmann2014-08-013-9/+9
| | |
| * | Show file tab only for import of existing keysDominik Schürmann2014-08-011-15/+42
| | |
| * | 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 string resourcesmar-v-in2014-07-313-6/+7
| |
* | Fix mergemar-v-in2014-07-314-37/+21
| |
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-31212-3361/+4240
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * 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-3115-36/+52
| |/
| * 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
| |
| * 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-3121-209/+193
| |
| * 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
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 09:16:30 +0000