Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -18/+18 |
| | |||||
* | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -42/+54 |
| | |||||
* | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -43/+166 |
| | |||||
* | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 |
| | |||||
* | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 1 | -10/+2 |
| | |||||
* | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+8 |
| | |||||
* | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | |||||
* | import-log: don't count self certs as unknown | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| | |||||
* | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -73/+85 |
| | |||||
* | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -1/+4 |
| | |||||
* | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -0/+6 |
| | |||||
* | import-log: clean up progress messages | Vincent Breitmoser | 2014-06-17 | 1 | -1/+0 |
| | |||||
* | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+3 |
| | |||||
* | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -1/+26 |
| | |||||
* | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -23/+41 |
| | | | | more docs | ||||
* | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -35/+9 |
| | |||||
* | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -6/+5 |
| | |||||
* | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -25/+19 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -48/+65 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -8/+10 |
| | |||||
* | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -13/+5 |
| | |||||
* | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -1/+1 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -9/+15 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -14/+30 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -64/+103 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -14/+37 |
| | |||||
* | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 1 | -0/+7 |
| | |||||
* | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 1 | -94/+188 |
| | |||||
* | import-log: improve operationresultparcel, add indentation | Vincent Breitmoser | 2014-06-06 | 1 | -4/+23 |
| | |||||
* | fix bug with bad verifying master keys | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 |
| | |||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 |
| | |||||
* | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 1 | -0/+16 |
| | |||||
* | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -2/+14 |
| | |||||
* | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 3 | -12/+11 |
| | |||||
* | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 2 | -214/+85 |
| | |||||
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -8/+7 |
| | |||||
* | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 2 | -28/+22 |
| | |||||
* | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 3 | -12/+14 |
| | |||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 3 | -38/+152 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 3 | -143/+178 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 3 | -127/+159 |
| | | |||||
| * | use longsparsearrays instead of hashmaps in that one place | Vincent Breitmoser | 2014-05-08 | 1 | -16/+19 |
| | | |||||
* | | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 1 | -17/+0 |
| | | |||||
* | | wrapped-key-ring: redesign underlying CachedKeyRing | Vincent Breitmoser | 2014-05-04 | 1 | -65/+35 |
| | | |||||
* | | wrapped-key-ring: cached data revamp | Vincent Breitmoser | 2014-05-04 | 1 | -33/+37 |
| | | |||||
* | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 1 | -8/+0 |
| | | |||||
* | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -1/+19 |
| | | | | | | | | KeychainIntentService! | ||||
* | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 1 | -0/+4 |
| | | |||||
* | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 3 | -1/+123 |
|/ | | | | signencrypt |