| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | import-log: add parcelable prototype | Vincent Breitmoser | 2014-06-05 | 1 | -0/+123 | |
| |/ / | ||||||
| | * | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 22 | -57/+637 | |
| | |\ | | | | | | | Automatic contact discovery and more | |||||
| | | * | 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 | |||||
| | | * | | 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 | |||||
| | | * | | | 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 | 2 | -0/+39 | |
| | | | | | | ||||||
| | | * | | | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 2 | -0/+22 | |
| | | | | | | ||||||
| | * | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 6 | -6/+6 | |
| | | | | | | ||||||
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 4 | -10/+94 | |
| | | |_|/ | |/| | | ||||||
| | * | | | 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 | |
| |/ / | ||||||
| * | | 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 | |
| | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |