aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Fix import from servermar-v-in2014-08-011-30/+17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix CachedPublicKeyringmar-v-in2014-08-012-12/+58
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-012-22/+26
* | | | | | | Certifying instead of signingDominik Schürmann2014-08-011-7/+6
* | | | | | | 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-314-34/+45
|\ \ \ \ \ \ \
| * | | | | | | lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
| * | | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-313-32/+43
* | | | | | | | Show revoked and expired for private keysDominik Schürmann2014-07-311-29/+28
|/ / / / / / /
* | | | | | | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
* | | | | | | Fixes for uploadDominik Schürmann2014-07-313-15/+19
* | | | | | | 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-311-1/+7
|/ / / / / /
* | | | | | Fix animations in create keyDominik Schürmann2014-07-313-22/+18
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-313-19/+85
|\ \ \ \ \ \
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-313-19/+85
* | | | | | | Robots like coffee too...Dominik Schürmann2014-07-316-21/+16
|/ / / / / /
* | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-313-16/+128
* | | | | | 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
* | | | | | Keyserver exception translateableDominik Schürmann2014-07-314-4/+13
* | | | | | Smaller notesDominik Schürmann2014-07-311-0/+8
* | | | | | 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-311-5/+13
* | | | | | 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-313-41/+21
* | | | | | More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-312-14/+24
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-302-23/+14
|\ \ \ \ \ \
| * | | | | | couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-302-23/+14
* | | | | | | Create key: work on uploadDominik Schürmann2014-07-305-10/+23
|/ / / / / /
* | | | | | Create key: repeat passphraseDominik Schürmann2014-07-302-7/+32
* | | | | | Create key: uploadDominik Schürmann2014-07-301-13/+20
* | | | | | return values for create keyDominik Schürmann2014-07-303-8/+22
* | | | | | Fix conflictsDominik Schürmann2014-07-301-1/+2
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3028-948/+299
|\ \ \ \ \ \
| * | | | | | fix a couple remaining AppMsgsVincent Breitmoser2014-07-292-10/+7
| * | | | | | Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2922-920/+276
| |\ \ \ \ \ \
| | * | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-277-45/+93
| | * | | | | | some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-2710-53/+66
| | * | | | | | Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2641-1050/+1505
| | |\ \ \ \ \ \
| | * | | | | | | 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-0713-106/+75