Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix TAG in account service as well | mar-v-in | 2014-06-06 | 1 | -7/+8 |
| | |||||
* | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 2 | -4/+4 |
| | |||||
* | Fix compile error introduced during merge | mar-v-in | 2014-06-06 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 37 | -340/+214 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Merge pull request #646 from timbray/master | Dominik Schürmann | 2014-06-05 | 2 | -67/+66 |
| |\ | | | | | | | Clean up keyimport.ImportKeysListEntry | ||||
| | * | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 2 | -67/+66 |
| |/ | |||||
| * | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 2 | -7/+4 |
| |\ | | | | | | | Don't show full fingerprint in key search result lists | ||||
| | * | Don't show full fingerprint in key search results | Tim Bray | 2014-06-05 | 1 | -6/+2 |
| | | | |||||
| | * | fixed error message | Tim Bray | 2014-06-04 | 2 | -4/+3 |
| | | | |||||
| * | | 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 |
| |/ | |||||
* | | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 4 | -1/+5 |
| | | |||||
* | | Show keys with android contacts | mar-v-in | 2014-06-05 | 8 | -11/+119 |
| | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
* | | Make keylist case insensitive | mar-v-in | 2014-06-05 | 1 | -3/+3 |
| | | | | | | | | You want "michael" to be next to "Michael", don't you? | ||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 149 | -2417/+4042 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | 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 |
| |\ \ | |||||
| * | | | 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 | ||||
| | | * | 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 | 505 | -5887/+4675 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |