Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-15 | 3 | -4/+9 | |
| |\ \ | ||||||
| | * | | fix keys with no expiry in ui code | Vincent Breitmoser | 2014-08-14 | 3 | -4/+9 | |
| | | | | ||||||
| * | | | Remove subkeys.pgp.net keyserver, often down and no hkps | Dominik Schürmann | 2014-08-15 | 2 | -8/+21 | |
| |/ / | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-14 | 1 | -1/+2 | |
| |\ \ | ||||||
| | * | | support changing expiry of subkeys to none | Vincent Breitmoser | 2014-08-14 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 3 | -25/+54 | |
| |/ / | ||||||
| * / | fix subkey certification canonicalization (why did the test not catch this?!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 8 | -162/+362 | |
| |\ | | | | | | | Use dropdown in CertifyActivity | |||||
| | * | Do not allow self certifying | mar-v-in | 2014-08-14 | 3 | -4/+20 | |
| | | | ||||||
| | * | Fix KeySpinner on cursor change | mar-v-in | 2014-08-14 | 1 | -1/+6 | |
| | | | ||||||
| | * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 2 | -18/+62 | |
| | | | ||||||
| | * | small bug in has_certify | mar-v-in | 2014-08-14 | 1 | -1/+1 | |
| | | | ||||||
| | * | add OnKeyChangedListener to KeySpinner | mar-v-in | 2014-08-14 | 2 | -11/+41 | |
| | | | ||||||
| | * | add HAS_CERTIFY (not sure why it's missing) | mar-v-in | 2014-08-14 | 2 | -0/+12 | |
| | | | ||||||
| | * | factor KeySpinner out | mar-v-in | 2014-08-14 | 4 | -136/+229 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-14 | 4 | -16/+38 | |
| |\ \ | ||||||
| | * | | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 3 | -16/+33 | |
| | | | | ||||||
| | * | | tests: add ProviderHelperSaveTest, with long key id collision test | Vincent Breitmoser | 2014-08-14 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | hacky fix to prevent key list from scrolling to top when opening nav drawer | Dominik Schürmann | 2014-08-14 | 1 | -7/+15 | |
| |/ / | ||||||
| * | | dem logix | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+3 | |
| | | | ||||||
| * | | Automcomplete names and emails in keyserver tab | Dominik Schürmann | 2014-08-14 | 2 | -2/+34 | |
| |/ | ||||||
| * | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 3 | -11/+8 | |
| | | ||||||
| * | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 3 | -0/+15 | |
| | | ||||||
| * | Remove MD5 support | Dominik Schürmann | 2014-08-14 | 3 | -3/+7 | |
| | | ||||||
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 6 | -112/+10 | |
| | | ||||||
* | | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 3 | -15/+28 | |
| | | ||||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 28 | -333/+822 | |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | |||||
| * | API: Return metadata only for v4 api clients and above... | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 | |
| | | ||||||
| * | API: Return metadata only for v4 api clients | Dominik Schürmann | 2014-08-14 | 1 | -3/+5 | |
| | | ||||||
| * | Merge pull request #766 from mar-v-in/patch-1 | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 | |
| |\ | | | | | | | Handle keys without expiry date right | |||||
| | * | Handle keys without expiry date right | mar-v-in | 2014-08-14 | 1 | -2/+2 | |
| | | | | | | | | | Fixes #765 | |||||
| * | | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 10 | -29/+46 | |
| |/ | ||||||
| * | Add user info dialog | Dominik Schürmann | 2014-08-13 | 3 | -20/+128 | |
| | | ||||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 4 | -25/+67 | |
| | | ||||||
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 7 | -71/+115 | |
| | | ||||||
| * | remove bundle for symmetric/asymmetric fragment as it was useless | mar-v-in | 2014-08-13 | 2 | -31/+16 | |
| | | ||||||
| * | fix message and uri from encrypt intent | mar-v-in | 2014-08-13 | 2 | -18/+4 | |
| | | ||||||
| * | Fix DECRYPT_METADATA api | Dominik Schürmann | 2014-08-12 | 1 | -9/+21 | |
| | | ||||||
| * | Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keys | Dominik Schürmann | 2014-08-12 | 4 | -23/+33 | |
| |\ | | | | | | | EncryptActivity: only show relevant keys | |||||
| | * | Only show relevant keys in encrypt, fix #756 #757 | mar-v-in | 2014-08-12 | 2 | -13/+27 | |
| | | | ||||||
| | * | Add convenience method to unified keyrings to determine whether a keyring is ↵ | mar-v-in | 2014-08-12 | 2 | -1/+5 | |
| | | | | | | | | | | | | expired, fix is_revoked for certain usages | |||||
| | * | Only show keyrings that have a valid sign key in from field, fixes #756 | mar-v-in | 2014-08-12 | 1 | -10/+2 | |
| | | | ||||||
| * | | Fix API version support, update api lib | Dominik Schürmann | 2014-08-12 | 1 | -2/+4 | |
| |/ | ||||||
| * | Implement EXTRA_ORIGINAL_FILENAME for API | Dominik Schürmann | 2014-08-11 | 1 | -1/+6 | |
| | | ||||||
| * | Update api lib | Dominik Schürmann | 2014-08-11 | 3 | -9/+9 | |
| | | ||||||
| * | Support mime type in metadata | Dominik Schürmann | 2014-08-11 | 2 | -3/+27 | |
| | | ||||||
| * | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 3 | -10/+24 | |
| | | ||||||
| * | Support API versions 3 and 4 | Dominik Schürmann | 2014-08-11 | 1 | -1/+4 | |
| | | ||||||
| * | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 4 | -20/+188 | |
| | |