Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 4 | -15/+28 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 116 | -3257/+2404 |
|\ | | | | | | | | | | | | | | | 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 | 18 | -44/+61 |
| |/ | |||||
| * | Add user info dialog | Dominik Schürmann | 2014-08-13 | 4 | -20/+136 |
| | | |||||
| * | Move certify action down into actions section | Dominik Schürmann | 2014-08-13 | 1 | -12/+12 |
| | | |||||
| * | Fix tests | Dominik Schürmann | 2014-08-13 | 1 | -3/+3 |
| | | |||||
| * | Fix tests | Dominik Schürmann | 2014-08-13 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Dominik Schürmann | 2014-08-13 | 4 | -20/+23 |
| | | |||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 7 | -29/+72 |
| | | |||||
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 7 | -71/+115 |
| | | |||||
| * | Merge pull request #760 from mar-v-in/fix-encrypt-intent | Dominik Schürmann | 2014-08-13 | 3 | -49/+20 |
| |\ | | | | | | | Fix encrypt intent | ||||
| | * | 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 |
| | | |||||
| * | update api lib | Dominik Schürmann | 2014-08-12 | 1 | -0/+0 |
| | | |||||
| * | 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 | 2 | -2/+4 |
| |/ | |||||
| * | Implement EXTRA_ORIGINAL_FILENAME for API | Dominik Schürmann | 2014-08-11 | 2 | -1/+6 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2014-08-11 | 4 | -9/+9 |
| | | |||||
| * | update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | | |||||
| * | 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 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -0/+0 |
| | | |||||
| * | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 4 | -20/+188 |
| | | |||||
| * | Add option to pass original filename to PgpSignEncrypt | Dominik Schürmann | 2014-08-11 | 1 | -12/+20 |
| | | |||||
| * | progress for signing binary | Dominik Schürmann | 2014-08-11 | 1 | -15/+27 |
| | | |||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-11 | 1 | -18/+11 |
| | | |||||
| * | Handle missing MDC as failed only if no valid signature is present | Dominik Schürmann | 2014-08-10 | 2 | -1/+9 |
| | | |||||
| * | More fixes for decryption progress | Dominik Schürmann | 2014-08-10 | 1 | -6/+4 |
| | | |||||
| * | Handle missing integrity protection MDC packet as if integrity check would ↵ | Dominik Schürmann | 2014-08-10 | 1 | -4/+5 |
| | | | | | | | | | | | | have failed. An attacker could strip the MDC on its way to the receiver... | ||||
| * | Introduction of metadata api, starting to fix decryption progress | Dominik Schürmann | 2014-08-10 | 3 | -44/+84 |
| | | |||||
| * | Fix compression setting for encryption of files | Dominik Schürmann | 2014-08-10 | 1 | -4/+7 |
| | | |||||
| * | passphrase instead of pass phrase | Dominik Schürmann | 2014-08-07 | 2 | -4/+4 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-07 | 75 | -2811/+1509 |
| | | |||||
| * | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 |
| | | |||||
| * | Move design doc into wiki | Dominik Schürmann | 2014-08-07 | 1 | -55/+0 |
| | | |||||
| * | Edit key: prevent the combination of change to primary user id and revocation | Dominik Schürmann | 2014-08-07 | 1 | -0/+4 |
| | | |||||
| * | Info about travis test failings | Dominik Schürmann | 2014-08-06 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 207 | -5236/+4730 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | ModernPGP infos | Dominik Schürmann | 2014-08-06 | 3 | -6/+5 |
| | | |||||
| * | Update changelog and about | Dominik Schürmann | 2014-08-06 | 2 | -89/+104 |
| | | |||||
| * | Start with changelog | Dominik Schürmann | 2014-08-06 | 1 | -87/+101 |
| | |