Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
|/ / | ||||||
* | | Use fixed gradle versions | Dominik Schürmann | 2014-06-04 | 2 | -2/+2 | |
| | | ||||||
* | | Use fixed gradle versions | Dominik Schürmann | 2014-06-04 | 2 | -3/+6 | |
| | | ||||||
* | | Merge pull request #643 from open-keychain/v/dev | Dominik Schürmann | 2014-06-03 | 57 | -1790/+2727 | |
|\ \ | | | | | | | wrap bouncycastle objects and don't use them in android-related code | |||||
| * \ | 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 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #632 from timbray/master | Dominik Schürmann | 2014-05-25 | 7 | -63/+54 | |
| |\ \ | | | | | | | | | Refactor server query exceptions again | |||||
| | * | | 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 | |
|/ / | ||||||
| * | spongycastle: expose pskr constructor | Vincent Breitmoser | 2014-06-02 | 1 | -0/+0 | |
| | | ||||||
| * | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 8 | -8/+85 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 5 | -105/+36 | |
| | | ||||||
| * | 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 | 37 | -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 branch 'thi-highlight-keyserver-search-results-as-well' | Dominik Schürmann | 2014-05-18 | 9 | -91/+128 | |
|\ \ | ||||||
| * | | 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 | |
|/ / | ||||||
* | | Merge pull request #630 from timbray/master | Dominik Schürmann | 2014-05-16 | 2 | -24/+60 | |
|\ \ | | | | | | | Handle changed keybase.io search results format | |||||
| * | | keybase cleanups for revised search output format | Tim Bray | 2014-05-15 | 1 | -24/+7 | |
| | | | ||||||
| * | | keybase now has key info in search output | Tim Bray | 2014-05-15 | 1 | -0/+5 | |
| | | | ||||||
| * | | JWalk javadocs | Tim Bray | 2014-05-14 | 1 | -0/+48 | |
|/ / | ||||||
* | | New screenshots | Dominik Schürmann | 2014-05-14 | 10 | -0/+0 | |
| | |