Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 142 | -2311/+4001 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | 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 |
| | |\ | |||||
| | * | | 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 | ||||
| * | | | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 7 | -42/+44 |
| | | | | |||||
| * | | | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 13 | -37/+33 |
| | | | | |||||
| * | | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 23 | -211/+370 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 439 | -1993/+4652 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 3 | -112/+4 |
| | | | | | |||||
| * | | | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 10 | -100/+98 |
| | | | | | |||||
| * | | | | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 4 | -98/+56 |
| | | | | | |||||
| * | | | | 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 | 6 | -191/+153 |
| | | | | | |||||
| * | | | | wrapped-key-ring: cached data revamp | Vincent Breitmoser | 2014-05-04 | 1 | -33/+37 |
| | | | | | |||||
| * | | | | wrapped-key-ring: view certify | Vincent Breitmoser | 2014-05-04 | 2 | -17/+18 |
| | | | | | |||||
| * | | | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 6 | -87/+61 |
| | | | | | |||||
| * | | | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 14 | -269/+209 |
| | | | | | | | | | | | | | | | | | | | | 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 | 5 | -15/+153 |
| | | | | | |||||
| * | | | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 7 | -125/+118 |
| | | | | | |||||
| * | | | | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 2 | -56/+1 |
| | | | | | |||||
| * | | | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 12 | -320/+744 |
| | | | | | | | | | | | | | | | | | | | | signencrypt | ||||
* | | | | | Fix regex for hkp parsing to support multiple uids | mar-v-in | 2014-06-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 9 | -0/+358 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes) | ||||
* | | | | | Store expired state within ImportKeysListEntry | mar-v-in | 2014-06-04 | 2 | -0/+12 |
| | | | | | |||||
* | | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS | mar-v-in | 2014-05-29 | 1 | -54/+15 |
| | | | | | |||||
* | | | | | Merge branch 'hkps-support' into automatic-contact-discovery | mar-v-in | 2014-05-29 | 1 | -15/+54 |
|\ \ \ \ \ | |||||
| * | | | | | Fix url building to support certificate check on hkps servers | mar-v-in | 2014-05-28 | 1 | -8/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert. | ||||
| * | | | | | Add hkps support | mar-v-in | 2014-05-27 | 1 | -9/+37 |
| | | | | | | |||||
* | | | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server) | mar-v-in | 2014-05-29 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Make abstract methods in Keyserver public (implementations make them public ↵ | mar-v-in | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | anyway) | ||||
* | | | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS | mar-v-in | 2014-05-29 | 1 | -3/+4 |
|/ / / / / | |||||
* | | | | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 3 | -0/+13 |
| | | | | | |||||
* | | | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV record | mar-v-in | 2014-05-27 | 1 | -0/+38 |
| | | | | | |||||
* | | | | | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 2 | -0/+22 |
| |_|_|/ |/| | | |