aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-212-38/+62
| |\
| | * Comment extra in requestSyncDominik Schürmann2014-08-201-0/+1
| | * Sync in KeychainIntentService on delete, import, saveDominik Schürmann2014-08-202-0/+21
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-202-3/+54
| | |\
| | * | Enable sync adapter, changelogDominik Schürmann2014-08-201-0/+1
| | * | Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
| * | | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-214-0/+4
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-2/+3
| |\|
| | * Upload key workingDominik Schürmann2014-08-201-2/+3
| * | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-1/+49
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-5/+2
| |\|
| | * Notify duration, cleanupDominik Schürmann2014-08-201-5/+2
| * | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-201-2/+5
| |/
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-3/+3
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-3/+10
| | |\
| | * | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-202-3/+3
| * | | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-0/+1
| | |/ | |/|
| * | consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-3/+10
| |/
| * Fix stringsDominik Schürmann2014-08-191-2/+2
| * consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-5/+20
| * consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-192-10/+4
| * consolidate: working implementation, lacking uiVincent Breitmoser2014-08-173-0/+32
| * parametrize FileImportCache for filenameVincent Breitmoser2014-08-171-1/+1
| * modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-0/+4
| * Always return a SaveKeyringResult from savingDominik Schürmann2014-08-161-1/+6
| * Fix and simplify in OperationResultParcelDominik Schürmann2014-08-161-11/+7
| * typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-2/+3
| * support for master key modifications, among other stuffVincent Breitmoser2014-08-161-1/+12
| * modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
| * modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
| * Fix encrypt onlyDominik Schürmann2014-08-162-18/+22
| * fix keys with no expiry in ui codeVincent Breitmoser2014-08-141-2/+7
| * Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-4/+33
| * handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+22
| * move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
| * Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+1
| * Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-142-55/+144
|\|
| * Dont write version header by defaultDominik Schürmann2014-08-141-1/+1
| * Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-132-49/+72
| * Decrypt metadata apiDominik Schürmann2014-08-111-1/+1
| * Get original filename for decryptionDominik Schürmann2014-08-111-8/+73
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-067-81/+200
|\|
| * Optimize importsDominik Schürmann2014-08-055-10/+10
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-051-0/+1
| * Refactor expiry dialogDominik Schürmann2014-08-051-5/+67
| * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-041-2/+2
| * Add license headersDominik Schürmann2014-08-043-0/+51
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-2/+2
| * Remove support for IO_FILE, this is no longer used and was never a good pract...Dominik Schürmann2014-08-041-29/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:52:08 +0000