aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Yubikey: use PINDominik Schürmann2014-09-081-0/+2
* Prepare Yubikey decryptionDominik Schürmann2014-09-081-1/+2
* Add experimental support for yubikey PINs, remove caching of empty passphrasesDominik Schürmann2014-09-051-7/+5
* work on passphrase caching, make use of cached SecretKeyType data (WIP!)Vincent Breitmoser2014-09-031-23/+32
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-0/+2
* remove broken(?) cancellation codeVincent Breitmoser2014-09-011-29/+7
* add cancel prevention mechanism, improve cancellation for key importVincent Breitmoser2014-08-312-3/+11
* don't make our service stickyVincent Breitmoser2014-08-311-1/+1
* add cancel support to edit key actionVincent Breitmoser2014-08-312-19/+38
* Add cancelable mechanism and support in key importVincent Breitmoser2014-08-314-25/+49
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-301-2/+4
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-286-96/+321
|\
| * Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-282-6/+30
| |\
| | * add ecc supportVincent Breitmoser2014-08-242-6/+30
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-271-3/+3
| |\ \
| | * | small language fixes for previous commitVincent Breitmoser2014-08-271-3/+3
| * | | Strip out duplicate user idsDominik Schürmann2014-08-271-0/+1
| |/ /
| * / Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-271-0/+1
| |/
| * Change account typeDominik Schürmann2014-08-212-5/+5
| * 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