Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 2 | -26/+20 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 5 | -56/+77 |
| | |||||
* | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 5 | -47/+70 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 5 | -29/+337 |
| | |||||
* | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 5 | -26/+25 |
| | |||||
* | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 3 | -17/+6 |
| | |||||
* | import-log: use holder pattern in log fragment | Vincent Breitmoser | 2014-06-11 | 1 | -16/+24 |
| | |||||
* | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 6 | -21/+113 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 16 | -160/+205 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 7 | -50/+94 |
| | |||||
* | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 8 | -26/+33 |
| | |||||
* | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 8 | -21/+204 |
| | |||||
* | import-log: use supertoast in ImportKeyActivity | Vincent Breitmoser | 2014-06-10 | 1 | -26/+87 |
| | |||||
* | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 3 | -3/+66 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 6 | -101/+260 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 4 | -17/+43 |
| | |||||
* | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 3 | -8/+19 |
| | |||||
* | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 |
| | |||||
* | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 2 | -97/+225 |
| | |||||
* | import-log: improve operationresultparcel, add indentation | Vincent Breitmoser | 2014-06-06 | 2 | -10/+37 |
| | |||||
* | import-log: add parcelable prototype | Vincent Breitmoser | 2014-06-05 | 1 | -0/+123 |
| | |||||
* | ui: do show Certify identities button even for secret keys | Vincent Breitmoser | 2014-06-04 | 1 | -8/+0 |
| | | | | Closes #636 | ||||
* | fix bug with bad verifying master keys | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 |
| | |||||
* | do respect expectedFingerprint during key import | Vincent Breitmoser | 2014-06-04 | 2 | -9/+18 |
| | |||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 33 | -241/+118 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 99 | -712/+1368 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-31 | 7 | -63/+54 |
| |\ | |||||
| | * | Finished cleaning up rebase conflicts post Keyserver exception refactor | Tim Bray | 2014-05-23 | 6 | -32/+33 |
| | | | |||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -0/+2 |
| | | | |||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 7 | -40/+28 |
| | | | |||||
| * | | Pull from transifex | Dominik Schürmann | 2014-05-31 | 92 | -649/+1314 |
| |/ | |||||
* | | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 7 | -7/+83 |
| | | |||||
* | | make everything work again | Vincent Breitmoser | 2014-06-02 | 3 | -8/+22 |
| | | |||||
* | | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 9 | -183/+119 |
| | | | | | | | | ImportKeysListEntry | ||||
* | | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 9 | -61/+75 |
| | | |||||
* | | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 16 | -356/+595 |
| | | |||||
* | | introduce new SaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -0/+113 |
| | | |||||
* | | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 4 | -14/+19 |
| | | |||||
* | | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 2 | -4/+9 |
| | | |||||
* | | wrapped-key-ring: forgot a part in PgpDecryptVerify | Vincent Breitmoser | 2014-05-23 | 1 | -2/+9 |
| | | |||||
* | | introduce WrappedSignature for the ViewCert* ui code | Vincent Breitmoser | 2014-05-23 | 3 | -31/+149 |
| | | |||||
* | | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader | Vincent Breitmoser | 2014-05-23 | 1 | -28/+8 |
| | | |||||
* | | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 8 | -101/+126 |
| | | |||||
* | | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 3 | -18/+27 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 27 | -253/+375 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Layout fixes for key import | Dominik Schürmann | 2014-05-19 | 9 | -66/+58 |
| | | |||||
| * | Add license header to FixedDrawerLayout | Dominik Schürmann | 2014-05-18 | 1 | -0/+16 |
| | | |||||
| * | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 9 | -91/+128 |
| |\ | |||||
| | * | Rename mCurQuery to mQuery for consistency | Thialfihar | 2014-05-16 | 1 | -5/+5 |
| | | | |||||
| | * | Use Highlighter instead of HighlightQueryCursorAdapter | Thialfihar | 2014-05-16 | 3 | -79/+28 |
| | | |