Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | nfc dialog: button placeholder to retain size | Dominik Schürmann | 2015-10-16 | 1 | -2/+24 | |
| | | ||||||
* | | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 5 | -7/+27 | |
| | | ||||||
* | | Allow choosing of YubiKey PIN | Dominik Schürmann | 2015-10-16 | 6 | -281/+116 | |
| | | ||||||
* | | Add NFC reset method | Dominik Schürmann | 2015-10-16 | 1 | -10/+46 | |
| | | ||||||
* | | Remove debug log | Dominik Schürmann | 2015-10-15 | 1 | -1/+0 | |
| | | ||||||
* | | Layout for backup code input | Dominik Schürmann | 2015-10-15 | 1 | -0/+152 | |
| | | ||||||
* | | Renaming export strings to backup | Dominik Schürmann | 2015-10-15 | 17 | -163/+164 | |
| | | ||||||
* | | Display backup code UI instead of passphrase on decrypt | Dominik Schürmann | 2015-10-15 | 2 | -2/+58 | |
| | | ||||||
* | | Check if backup code in passphrase dialog | Dominik Schürmann | 2015-10-15 | 3 | -0/+23 | |
| | | ||||||
* | | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 8 | -25/+95 | |
| | | ||||||
* | | File ending consisitency for backups | Dominik Schürmann | 2015-10-15 | 3 | -7/+15 | |
| | | ||||||
* | | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 11 | -237/+100 | |
| | | ||||||
* | | Remove debug code | Dominik Schürmann | 2015-10-15 | 3 | -11/+3 | |
| | | ||||||
* | | Mime type consistency | Dominik Schürmann | 2015-10-15 | 7 | -18/+19 | |
| | | ||||||
* | | Use correct filename when sharing backup | Dominik Schürmann | 2015-10-15 | 1 | -8/+8 | |
| | | ||||||
* | | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵ | Dominik Schürmann | 2015-10-15 | 14 | -63/+71 | |
| | | | | | | | | db contract | |||||
* | | Show the Internal Storage menu item on openFile | Dominik Schürmann | 2015-10-15 | 1 | -4/+4 | |
| | | ||||||
* | | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 6 | -20/+80 | |
| | | ||||||
* | | Rename DrawerBackupFragment to BackupRestoreFragment | Dominik Schürmann | 2015-10-15 | 2 | -3/+3 | |
| | | ||||||
* | | Cleanup in BackupCodeFragment | Dominik Schürmann | 2015-10-15 | 1 | -16/+14 | |
| | | ||||||
* | | Fix drawer selection for backup | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 | |
| | | ||||||
* | | Layout consistency for backup fragment | Dominik Schürmann | 2015-10-15 | 4 | -435/+373 | |
| | | ||||||
* | | Unify backup filename | Dominik Schürmann | 2015-10-15 | 2 | -4/+5 | |
| | | ||||||
* | | Dont force OpenKeychain in open with for pgp-keys | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 | |
| | | ||||||
* | | Open decrypted application/pgp-keys only in OpenKeychain | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 | |
| | | ||||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 4 | -39/+83 | |
|\ \ | ||||||
| * | | Revert "viewkeyactivity: ask for passphrase for backup only if key has one" | Vincent Breitmoser | 2015-10-09 | 1 | -29/+3 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 3316cb65e6b739deb7d0652fcd16a9d9bedf8c5b. Committed to wrong branch, derp :) | |||||
| * | | fix variable name mistake (wth did I commit there?!) | Vincent Breitmoser | 2015-10-09 | 1 | -2/+2 | |
| | | | ||||||
| * | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 | |
| | | | ||||||
| * | | make openInputStreamSafe static and move to FileHelper | Vincent Breitmoser | 2015-10-09 | 2 | -87/+85 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-08 | 11 | -447/+546 | |
| |\ \ | ||||||
| * | | | Revert "Check that the encrypt input uris are not linked to our own internal ↵ | Dominik Schürmann | 2015-10-08 | 1 | -26/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage (OKC-01-010)" Fix was not sufficient This reverts commit b10b14d9bc737edc56af0eec3a14bed5ebf3ea39. | |||||
| * | | | Dont allow encryption of app files via Os methods (OKC-01-010) | Dominik Schürmann | 2015-10-08 | 1 | -3/+73 | |
| | | | | ||||||
* | | | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 | |
| | | | | ||||||
* | | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 51 | -738/+773 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | pgpdecryptverify: only use keys for verification which are allowed to sign ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | (OKC-01-013) | |||||
| * | | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-10-08 | 5 | -160/+9 | |
| |\| | | ||||||
| | * | | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 4 | -159/+6 | |
| | | | | ||||||
| | * | | Constant for max number of canonicalized user ids | Dominik Schürmann | 2015-10-08 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | improve tests, get rid of some redundant checks | Vincent Breitmoser | 2015-10-08 | 2 | -14/+7 | |
| | | | | ||||||
| * | | | pgpdecryptverify: get rid of duplicate code path for binary signature ↵ | Vincent Breitmoser | 2015-10-08 | 4 | -108/+3 | |
| | | | | | | | | | | | | | | | | verification | |||||
| * | | | pgpdecryptverify: fix non-onepass signature checking | Vincent Breitmoser | 2015-10-08 | 2 | -1/+3 | |
| | | | | ||||||
| * | | | test: add tests for detached and clearsign signatures | Vincent Breitmoser | 2015-10-08 | 1 | -1/+114 | |
| | | | | ||||||
| * | | | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 3 | -5/+1 | |
| | | | | ||||||
| * | | | pgpdecryptverify: externalize PgpSignatureChecker | Vincent Breitmoser | 2015-10-08 | 2 | -297/+369 | |
| | | | | ||||||
| * | | | fix jacoco coverage | Vincent Breitmoser | 2015-10-08 | 1 | -6/+5 | |
| | | | | ||||||
| * | | | pgpdecryptverify: move cleartext verification into SignatureChecker | Vincent Breitmoser | 2015-10-08 | 1 | -156/+139 | |
| | | | | ||||||
| * | | | pgpdecryptverify: refactor signature verification state into ↵ | Vincent Breitmoser | 2015-10-08 | 2 | -135/+141 | |
| | | | | | | | | | | | | | | | | SignatureChecker subclass | |||||
| * | | | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 3 | -6/+35 | |
| | | | | ||||||
| * | | | pgpdecryptverify: refactor signature processing | Vincent Breitmoser | 2015-10-06 | 3 | -79/+82 | |
| |/ / |