| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add TlsHelper (designed to be used with sks-keyservers.net) | mar-v-in | 2014-06-23 | 1 | -0/+83 |
| | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA | ||||
| * | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -5/+7 |
| | | |||||
| * | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 2 | -51/+187 |
| |\ | |||||
| | * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 1 | -51/+178 |
| | |\ | | | | | | | Improve contact sync | ||||
| | | * | 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 | ||||
| | * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -0/+9 |
| | |/ | |||||
| * / | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -0/+35 |
| |/ | |||||
| * | 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 | 1 | -3/+0 |
| |\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -3/+0 |
| | | | |||||
| * | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -2/+87 |
| | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
| * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -2/+4 |
| |\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 1 | -2/+4 |
| | | | |||||
| * | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 1 | -0/+97 |
| | | | | | | | | | | | | | | | | | | | 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) | ||||
| * | | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 1 | -0/+21 |
| |/ | |||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 1 | -5/+7 |
| | | |||||
| * | Better handling of actionbars back | Dominik Schürmann | 2014-05-07 | 1 | -19/+0 |
| | | |||||
| * | Optimize imports | Dominik Schürmann | 2014-04-15 | 5 | -1/+5 |
| | | |||||
| * | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 2 | -4/+2 |
| | | |||||
| * | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 4 | -4/+4 |
| | | |||||
| * | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 1 | -1/+1 |
| | | | | | context (first commit to get context out of pgp classes) | ||||
| * | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 1 | -1/+1 |
| | | | | | Closes #549 | ||||
| * | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 1 | -7/+11 |
| | | |||||
| * | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 3 | -27/+30 |
| | | |||||
| * | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | | |||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 6 | -0/+710 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |