aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Support for multiple hash algosDominik Schürmann2014-08-143-15/+28
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-1428-333/+822
|\
| * API: Return metadata only for v4 api clients and above...Dominik Schürmann2014-08-141-1/+1
| * API: Return metadata only for v4 api clientsDominik Schürmann2014-08-141-3/+5
| * Merge pull request #766 from mar-v-in/patch-1Dominik Schürmann2014-08-141-2/+2
| |\
| | * Handle keys without expiry date rightmar-v-in2014-08-141-2/+2
| * | Dont write version header by defaultDominik Schürmann2014-08-1410-29/+46
| |/
| * Add user info dialogDominik Schürmann2014-08-133-20/+128
| * API: User interaction when account keys are deletedDominik Schürmann2014-08-134-25/+67
| * Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-137-71/+115
| * remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-132-31/+16
| * fix message and uri from encrypt intentmar-v-in2014-08-132-18/+4
| * Fix DECRYPT_METADATA apiDominik Schürmann2014-08-121-9/+21
| * Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keysDominik Schürmann2014-08-124-23/+33
| |\
| | * Only show relevant keys in encrypt, fix #756 #757mar-v-in2014-08-122-13/+27
| | * Add convenience method to unified keyrings to determine whether a keyring is ...mar-v-in2014-08-122-1/+5
| | * Only show keyrings that have a valid sign key in from field, fixes #756mar-v-in2014-08-121-10/+2
| * | Fix API version support, update api libDominik Schürmann2014-08-121-2/+4
| |/
| * Implement EXTRA_ORIGINAL_FILENAME for APIDominik Schürmann2014-08-111-1/+6
| * Update api libDominik Schürmann2014-08-113-9/+9
| * Support mime type in metadataDominik Schürmann2014-08-112-3/+27
| * Decrypt metadata apiDominik Schürmann2014-08-113-10/+24
| * Support API versions 3 and 4Dominik Schürmann2014-08-111-1/+4
| * Get original filename for decryptionDominik Schürmann2014-08-114-20/+188
| * Add option to pass original filename to PgpSignEncryptDominik Schürmann2014-08-111-12/+20
| * progress for signing binaryDominik Schürmann2014-08-111-15/+27
| * More fixes for decryption progressDominik Schürmann2014-08-111-18/+11
| * Handle missing MDC as failed only if no valid signature is presentDominik Schürmann2014-08-102-1/+9
| * More fixes for decryption progressDominik Schürmann2014-08-101-6/+4
| * Handle missing integrity protection MDC packet as if integrity check would ha...Dominik Schürmann2014-08-101-4/+5
| * Introduction of metadata api, starting to fix decryption progressDominik Schürmann2014-08-103-44/+84
| * Fix compression setting for encryption of filesDominik Schürmann2014-08-101-4/+7
| * Edit key: prevent the combination of change to primary user id and revocationDominik Schürmann2014-08-071-0/+4
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-0685-3041/+2839
|\|
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-057-31/+31
| * Optimize importsDominik Schürmann2014-08-0541-66/+64
| * Increase maximum custom RSA sizeDominik Schürmann2014-08-051-1/+1
| * Edit key: key flagsDominik Schürmann2014-08-055-16/+27
| * Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-059-77/+101
| * More work on add subkey dialog designDominik Schürmann2014-08-051-3/+6
| * Work on add subkey dialog designDominik Schürmann2014-08-053-13/+39
| * Better handling of user id revocation in UI codeDominik Schürmann2014-08-053-19/+70
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-053-6/+7
| * Refactor expiry dialogDominik Schürmann2014-08-055-226/+291
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-052-3/+7
| |\
| | * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-042-3/+7
| * | KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-059-34/+55
| |/
| * Add license headersDominik Schürmann2014-08-0419-0/+323
| * Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-046-13/+15