aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-07-3168-2479/+3045
|\
| * 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
| | | * | get rid of AppMsg libraryVincent Breitmoser2014-07-071-744/+0
| | * | | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
| * | | | Create key with fragmentsDominik Schürmann2014-07-305-217/+472
| |/ / /
| * | | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-284-23/+49
| * | | Use verified icon for certify actionDominik Schürmann2014-07-281-2/+12
| * | | Set visibility at lastDominik Schürmann2014-07-282-6/+6
| * | | Use icons in key viewDominik Schürmann2014-07-282-22/+39
| * | | Use new status icons in key listDominik Schürmann2014-07-281-20/+23
| * | | Smaller status images, green testDominik Schürmann2014-07-281-1/+1
| * | | Fix resource names, add small testDominik Schürmann2014-07-281-5/+10
| * | | cleanup left-oversDominik Schürmann2014-07-271-2/+0
| * | | Redesigned QR Code viewDominik Schürmann2014-07-273-115/+119
| * | | Load QR Code asynchronously and with a fade in animationDominik Schürmann2014-07-271-5/+41
| * | | Open keyboard on passphrase dialog, this should now work on all Android versi...Dominik Schürmann2014-07-272-27/+92
| * | | Make PassphraseCacheService a foreground serviceDominik Schürmann2014-07-271-72/+67
| * | | Prettify buttonsDominik Schürmann2014-07-271-7/+6