aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mime type consistencyDominik Schürmann2015-10-157-18/+19
* Use correct filename when sharing backupDominik Schürmann2015-10-151-8/+8
* Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for d...Dominik Schürmann2015-10-1514-63/+71
* Show the Internal Storage menu item on openFileDominik Schürmann2015-10-151-4/+4
* Add restore to backup fragment, cleanup, renamingsDominik Schürmann2015-10-156-20/+80
* Rename DrawerBackupFragment to BackupRestoreFragmentDominik Schürmann2015-10-152-3/+3
* Cleanup in BackupCodeFragmentDominik Schürmann2015-10-151-16/+14
* Fix drawer selection for backupDominik Schürmann2015-10-151-1/+1
* Layout consistency for backup fragmentDominik Schürmann2015-10-154-435/+373
* Unify backup filenameDominik Schürmann2015-10-152-4/+5
* Dont force OpenKeychain in open with for pgp-keysDominik Schürmann2015-10-151-1/+1
* Open decrypted application/pgp-keys only in OpenKeychainDominik Schürmann2015-10-151-2/+7
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-094-39/+83
|\
| * Revert "viewkeyactivity: ask for passphrase for backup only if key has one"Vincent Breitmoser2015-10-091-29/+3
| * fix variable name mistake (wth did I commit there?!)Vincent Breitmoser2015-10-091-2/+2
| * viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
| * make openInputStreamSafe static and move to FileHelperVincent Breitmoser2015-10-092-87/+85
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-0811-447/+546
| |\
| * | Revert "Check that the encrypt input uris are not linked to our own internal ...Dominik Schürmann2015-10-081-26/+3
| * | Dont allow encryption of app files via Os methods (OKC-01-010)Dominik Schürmann2015-10-081-3/+73
* | | viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
* | | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0851-738/+773
|\ \ \ | | |/ | |/|
| * | pgpdecryptverify: only use keys for verification which are allowed to sign (O...Vincent Breitmoser2015-10-081-2/+10
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-10-085-160/+9
| |\|
| | * Remove ShareHelper: Not compat with Android >= 5, reduce code complexityDominik Schürmann2015-10-084-159/+6
| | * Constant for max number of canonicalized user idsDominik Schürmann2015-10-081-1/+3
| * | improve tests, get rid of some redundant checksVincent Breitmoser2015-10-082-14/+7
| * | pgpdecryptverify: get rid of duplicate code path for binary signature verific...Vincent Breitmoser2015-10-084-108/+3
| * | pgpdecryptverify: fix non-onepass signature checkingVincent Breitmoser2015-10-082-1/+3
| * | test: add tests for detached and clearsign signaturesVincent Breitmoser2015-10-081-1/+114
| * | pgpsignencrypt: unsupported parameter combinations are a bugVincent Breitmoser2015-10-083-5/+1
| * | pgpdecryptverify: externalize PgpSignatureCheckerVincent Breitmoser2015-10-082-297/+369
| * | fix jacoco coverageVincent Breitmoser2015-10-081-6/+5
| * | pgpdecryptverify: move cleartext verification into SignatureCheckerVincent Breitmoser2015-10-081-156/+139
| * | pgpdecryptverify: refactor signature verification state into SignatureChecker...Vincent Breitmoser2015-10-082-135/+141
| * | pgpdecryptverify: fix one pass signature check, actually use bracketed structureVincent Breitmoser2015-10-073-6/+35
| * | pgpdecryptverify: refactor signature processingVincent Breitmoser2015-10-063-79/+82
| |/
| * use only primary and mutually bound subkeys for fingerprint verificationVincent Breitmoser2015-10-063-7/+11
| * Fix tests for min requirement of 2048 bitsDominik Schürmann2015-10-045-41/+41
| * center wizard buttons for other languagesDominik Schürmann2015-10-0410-21/+21
| * Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-0422-61/+63
| * Show dialog before sharing logDominik Schürmann2015-10-043-5/+88
* | decrypt: fix broken file saveVincent Breitmoser2015-10-061-2/+2
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0113-116/+143
|\|
| * spongy: use version which doesn't skip bad signaturesVincent Breitmoser2015-10-012-0/+3
| * spongy: treat eddsa signatures as non-verifiable signaturesVincent Breitmoser2015-10-011-0/+0
| * No show key button for RESULT_INVALID_SIGNATURE, CleanupDominik Schürmann2015-09-304-10/+20
| * Cleanup in BaseNfcActivityDominik Schürmann2015-09-301-10/+2
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-307-59/+68
| * Fix crashes with Fluffys PGP appletDominik Schürmann2015-09-304-20/+32