Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 3 | -13/+85 |
| | |||||
* | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 2 | -9/+6 |
| | |||||
* | 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 | 4 | -55/+74 |
| | |||||
* | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 4 | -40/+60 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 4 | -28/+317 |
| | |||||
* | 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 | 2 | -16/+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 | 4 | -18/+102 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 5 | -90/+133 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 6 | -40/+71 |
| | |||||
* | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 3 | -3/+7 |
| | |||||
* | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 3 | -4/+107 |
| | |||||
* | 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 | 5 | -98/+251 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 3 | -16/+41 |
| | |||||
* | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 3 | -8/+19 |
| | |||||
* | 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 | 6 | -60/+51 |
|\ | |||||
| * | 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 | 6 | -37/+25 |
| | | |||||
* | | 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 | 16 | -186/+300 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | 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 |
| | | | |||||
| | * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 5 | -5/+75 |
| | | | |||||
| | * | Support mutliple search words and highlight them | Thialfihar | 2014-05-16 | 3 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything. | ||||
| * | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 9 | -38/+34 |
| |/ |