aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
| | * 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
| | * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-172-83/+20
| * | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-177-15/+281
| * | parametrize FileImportCache for filenameVincent Breitmoser2014-08-173-7/+9
| * | modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-162-2/+52
| * | use correct algorithm for signatures (actually fix heterogeneous subkeys)Vincent Breitmoser2014-08-161-4/+4
| * | fix small log format string mistake for adding subkeysVincent Breitmoser2014-08-161-1/+2
| * | Fixing date picker issuesDominik Schürmann2014-08-162-22/+47
| * | Fix flags UI in add subkey dialogDominik Schürmann2014-08-162-5/+44
| * | Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master keyDominik Schürmann2014-08-161-1/+1
| * | Fix expiry when adding subkeysDominik Schürmann2014-08-163-6/+5
| * | Always return a SaveKeyringResult from savingDominik Schürmann2014-08-162-4/+7
| * | Fix and simplify in OperationResultParcelDominik Schürmann2014-08-161-11/+7
| * | fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-4/+3
| * | tests: add test for master key revocationVincent Breitmoser2014-08-161-2/+1
| * | tests: more expected error typesVincent Breitmoser2014-08-161-1/+2
| * | typed expected failures and a couple minor thingsVincent Breitmoser2014-08-162-5/+6
| * | support for master key modifications, among other stuffVincent Breitmoser2014-08-162-182/+310
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 19:42:43 +0000