aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Expand)AuthorAgeFilesLines
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-67/+64
* couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-23/+13
* Fallback if no primary user id existsDominik Schürmann2014-07-161-0/+4
* 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
* pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+2
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-282-65/+41
* 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, more...Vincent Breitmoser2014-06-161-23/+41
* 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
* canonicalize: implementation, first draftVincent Breitmoser2014-06-121-1/+1
* import-log: properly distinguish return statesVincent Breitmoser2014-06-121-8/+10
* import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-13/+5
* import-log: work on log fragment uiVincent Breitmoser2014-06-101-1/+1
* import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-9/+15
* import-log: more interface workVincent Breitmoser2014-06-101-14/+30
* import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-64/+103
* import-log: better stripped key loggingVincent Breitmoser2014-06-061-14/+37
* import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-061-0/+7
* import-log: add log statements in import routineVincent Breitmoser2014-06-061-94/+188
* import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-061-4/+23
* fix bug with bad verifying master keysVincent Breitmoser2014-06-041-3/+3
* neatness refactoringVincent Breitmoser2014-06-041-3/+3
* wrapped-key-ring: add documentationVincent Breitmoser2014-06-021-0/+16
* make everything work againVincent Breitmoser2014-06-021-2/+14
* wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-023-12/+11
* new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-272-214/+85
* wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-8/+7