aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
...
| * | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-203-40/+103
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-33/+49
| |\|
| | * Upload key workingDominik Schürmann2014-08-201-0/+3
| | * Fix key sharingDominik Schürmann2014-08-201-3/+1
| | * Work on upload keyDominik Schürmann2014-08-201-14/+24
| | * Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
| | * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+1
| | |\
| | * | return some more resultsDominik Schürmann2014-08-202-6/+14
| * | | consolidate: small ui thingsVincent Breitmoser2014-08-201-0/+4
| * | | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-202-5/+11
| * | | close actionmode in keylist on loading events (avoid inconsistent state)Vincent Breitmoser2014-08-201-0/+10
| * | | consolidate: remove debug "breakpoint"Vincent Breitmoser2014-08-201-5/+0
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-9/+7
| |\|
| | * progress dialog design fixDominik Schürmann2014-08-202-9/+7
| * | modifyKey: small logging changesVincent Breitmoser2014-08-201-1/+1
| |/
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-203-90/+113
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-206-18/+29
| | |\
| | * | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-203-90/+113
| * | | return some more resultsDominik Schürmann2014-08-206-35/+41
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-207-53/+73
| |\|
| | * consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-204-48/+66
| | * consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-204-5/+7
| * | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-206-18/+29
| |/
| * Fix mime types, #781mar-v-in2014-08-191-1/+1
| * Fix stringsDominik Schürmann2014-08-192-3/+3
| * consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-193-30/+85
| * Start consolidate activityDominik Schürmann2014-08-191-1/+8
| * ConsolidateDialogActivityDominik Schürmann2014-08-191-41/+26
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-199-27/+263
| |\
| | * stub for consolidate recovery in KeychainApplicationVincent Breitmoser2014-08-191-1/+8
| | * add ProgressFixedScaler (forgot in a previous commit)Vincent Breitmoser2014-08-191-0/+29
| | * add OpenDialogActivity (stub)Vincent Breitmoser2014-08-191-0/+117
| | * consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-196-26/+109
| * | Scroll fixes for certify activityDominik Schürmann2014-08-192-1/+16
| |/
| * Notes about criticalityDominik Schürmann2014-08-191-2/+15
| * Decrease iteration count, delayed for 2.9Dominik Schürmann2014-08-191-1/+1
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-191-1/+3
| |\
| | * fix primary user id in master key flag modificationVincent Breitmoser2014-08-191-1/+3
| * | Change criticallity of subpackets after discussionDominik Schürmann2014-08-191-5/+5
| |/
| * Use higher s2k countDominik Schürmann2014-08-191-10/+29
| * Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possibleDominik Schürmann2014-08-191-20/+22
| * Mark packets criticalDominik Schürmann2014-08-191-11/+11
| * add feature to key sig subpacket to indicate that we want MDCDominik Schürmann2014-08-191-0/+3
| * New preferred hash and symmetric algos, removed SHA-1, 3DES, new orderingDominik Schürmann2014-08-191-7/+17
| * Add license headersDominik Schürmann2014-08-193-0/+51
| * Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-181-53/+74
| * Fixes for expiry UIDominik Schürmann2014-08-185-69/+101
| * Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-173-97/+22
| |\
| | * Work-around rendering bug when switching back to asymmetric with multiple rec...mar-v-in2014-08-171-14/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:10:33 +0000