| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Reset importDone at the beginning of sync | mar-v-in | 2014-06-18 | 1 | -0/+1 |
| | | |||||
| * | Wait for import to be done before writing contacts | mar-v-in | 2014-06-18 | 1 | -2/+19 |
| | | |||||
| * | Remove abandoned contacts | mar-v-in | 2014-06-18 | 1 | -26/+90 |
| | | |||||
| * | Code style | mar-v-in | 2014-06-18 | 1 | -13/+26 |
| | | |||||
| * | Continue contact db sync | mar-v-in | 2014-06-18 | 1 | -39/+89 |
| | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db | ||||
| * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 5 | -110/+463 |
| |\ | | | | | Parcelable operation result with logging capabilities + import logging | ||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 18 | -57/+632 |
| |\ \ | | | | | | | 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 | ||||
| | * | | | 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 | 142 | -2311/+4001 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+38 |
| | | | | | | |||||
| | * | | | | 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 |
| | |_|/ / |/| | | | |||||
| * | | | | 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 |
| |/ / | |||||
| * | | 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 |
| | |\| | |||||
| | | * | 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 |
| | |/ | |||||
| * | | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 7 | -7/+83 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |