Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 2 | -11/+76 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 2 | -7/+7 |
| | |||||
* | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -32/+47 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 2 | -25/+295 |
| | |||||
* | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -10/+7 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -19/+25 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -2/+0 |
| | |||||
* | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 1 | -1/+4 |
| | |||||
* | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 2 | -2/+65 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 2 | -185/+29 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 2 | -2/+4 |
| | |||||
* | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 2 | -8/+12 |
| | |||||
* | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 1 | -3/+37 |
| | |||||
* | import-log: improve operationresultparcel, add indentation | Vincent Breitmoser | 2014-06-06 | 1 | -6/+14 |
| | |||||
* | import-log: add parcelable prototype | Vincent Breitmoser | 2014-06-05 | 1 | -0/+123 |
| | |||||
* | do respect expectedFingerprint during key import | Vincent Breitmoser | 2014-06-04 | 1 | -1/+12 |
| | |||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 9 | -180/+75 |
| | |||||
* | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 6 | -7/+67 |
| | |||||
* | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -2/+3 |
| | |||||
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 2 | -101/+21 |
| | | | | ImportKeysListEntry | ||||
* | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 5 | -44/+60 |
| | |||||
* | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 9 | -72/+488 |
| | |||||
* | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -3/+3 |
| | |||||
* | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 1 | -2/+8 |
| | |||||
* | 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 | 1 | -0/+124 |
| | |||||
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 5 | -50/+99 |
| | |||||
* | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 1 | -0/+7 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -3/+3 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -3/+3 |
| | | |||||
* | | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 2 | -9/+4 |
| | | |||||
* | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 13 | -138/+173 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 2 | -6/+8 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 1 | -2/+0 |
| | | | | | | | | (tested and works, closes #569) | ||||
| * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -5/+8 |
| | | |||||
* | | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 1 | -91/+0 |
| | | |||||
* | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 3 | -32/+19 |
| | | |||||
* | | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 1 | -17/+0 |
| | | |||||
* | | wrapped-key-ring: introduce Uncached*Key objects | Vincent Breitmoser | 2014-05-04 | 5 | -129/+179 |
| | | |||||
* | | wrapped-key-ring: redesign underlying CachedKeyRing | Vincent Breitmoser | 2014-05-04 | 4 | -119/+117 |
| | | |||||
* | | wrapped-key-ring: view certify | Vincent Breitmoser | 2014-05-04 | 1 | -0/+13 |
| | | |||||
* | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 3 | -8/+11 |
| | | |||||
* | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 10 | -205/+151 |
| | | | | | | | | KeychainIntentService! | ||||
* | | wrapped-key-ring: small fix to make it work again | Vincent Breitmoser | 2014-05-03 | 2 | -14/+12 |
| | | |||||
* | | wrapped-key-ring: forgot to add UncachedKeyRing class | Vincent Breitmoser | 2014-05-03 | 1 | -0/+29 |
| | | |||||
* | | wrapped-key-ring: move more helper methods into keys | Vincent Breitmoser | 2014-05-03 | 4 | -15/+151 |
| | | |||||
* | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 5 | -96/+97 |
| | | |||||
* | | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 1 | -55/+0 |
| | | |||||
* | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 9 | -319/+621 |
|/ | | | | signencrypt | ||||
* | Rename setter methods for PgpDecryptVerify.Builder | Thialfihar | 2014-04-29 | 1 | -7/+7 |
| |