aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
Commit message (Collapse)AuthorAgeFilesLines
* consolidate: remove debug "breakpoint"Vincent Breitmoser2014-08-201-5/+0
|
* consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-86/+103
|
* consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-0/+5
|
* consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-201-2/+1
|
* Fix stringsDominik Schürmann2014-08-191-1/+1
|
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-23/+63
|
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-15/+50
|
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-8/+173
|
* Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-19/+19
|
* handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-0/+4
|
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-10/+0
|
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+10
|
* Dont write version header by defaultDominik Schürmann2014-08-141-1/+4
|
* API: User interaction when account keys are deletedDominik Schürmann2014-08-131-1/+1
|
* Optimize importsDominik Schürmann2014-08-051-5/+5
|
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-7/+7
|
* Fix CachedPublicKeyringmar-v-in2014-08-011-0/+4
| | | | I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
* Remove runtime check to fix passphrase serviceDominik Schürmann2014-08-011-6/+0
|
* fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-311-0/+6
|
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-67/+64
|
* couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-23/+13
|
* move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-151-1/+1
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
|\
| * merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-1/+1
| |
* | some fixes for editDominik Schürmann2014-07-151-1/+1
|/
* some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-111-6/+5
|
* don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
| | | | closes #703
* pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+2
|
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-60/+35
| | | | closes #698
* fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
|
* VERY basic test for save keyringArt O Cathain2014-06-211-13/+2
|
* generate public keyring from secret if not availableVincent Breitmoser2014-06-181-18/+18
|
* consolidate: almost sane loggingVincent Breitmoser2014-06-181-42/+54
|
* consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-43/+166
|
* consolidate: make it workVincent Breitmoser2014-06-181-0/+13
|
* code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-181-10/+2
|
* consolidate: add loggingVincent Breitmoser2014-06-181-0/+8
|
* consolidate: first draftVincent Breitmoser2014-06-181-1/+1
|
* import-log: don't count self certs as unknownVincent Breitmoser2014-06-181-0/+1
|
* prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-181-73/+85
|
* handle database error on secret key insertVincent Breitmoser2014-06-171-1/+4
|
* canonicalize: support secret keysVincent Breitmoser2014-06-171-0/+6
|
* import-log: clean up progress messagesVincent Breitmoser2014-06-171-1/+0
|
* drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+3
|
* add more progress info from import routineVincent Breitmoser2014-06-161-1/+26
|
* import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-23/+41
| | | | more docs
* canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-35/+9
|
* import-log: more minor improvementsVincent Breitmoser2014-06-121-6/+5
|
* import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-121-25/+19
|
* import-log: minor improvementsVincent Breitmoser2014-06-121-48/+65
|