Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-21 | 11 | -13/+85 |
|\ | |||||
| * | decrypt: special case single encrypted text -> directly display text, if not ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -0/+23 |
| | | | | | | | | too large | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-21 | 2 | -6/+19 |
| |\ | |||||
| * | | encrypttext: localization, and truncate overlong input | Vincent Breitmoser | 2015-10-21 | 2 | -3/+9 |
| | | | |||||
| * | | encrypttext: handle input via Intent.EXTRA_STREAM in addition to ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -6/+34 |
| | | | | | | | | | | | | Intent.EXTRA_TEXT | ||||
| * | | displaytextactivity: truncate displayed text if too long | Vincent Breitmoser | 2015-10-21 | 3 | -0/+13 |
| | | | |||||
| * | | fix crash due to malformed log entry | Vincent Breitmoser | 2015-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | linked: fix colors for dark theme | Vincent Breitmoser | 2015-10-21 | 5 | -5/+5 |
| | | | |||||
| * | | re-add accidentally deleted string | Vincent Breitmoser | 2015-10-21 | 2 | -1/+3 |
| | | | |||||
* | | | Improve file handling in TemporaryFileProvider | Dominik Schürmann | 2015-10-21 | 1 | -16/+21 |
| |/ |/| | |||||
* | | SHA1 and RIPEMD160 are not declared insecure until widely deployed | Dominik Schürmann | 2015-10-21 | 1 | -2/+2 |
| | | |||||
* | | Use Github OAuth ID and secret from properties | Dominik Schürmann | 2015-10-21 | 1 | -4/+17 |
|/ | |||||
* | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 3 | -6/+38 |
| | |||||
* | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 5 | -160/+248 |
| | |||||
* | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 8 | -63/+1 |
| | |||||
* | Clear cache when PIN is too short | Dominik Schürmann | 2015-10-16 | 2 | -12/+7 |
| | |||||
* | 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 |
| | | |