Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 3 | -6/+16 | |
| | | ||||||
* | | Allow choosing of YubiKey PIN | Dominik Schürmann | 2015-10-16 | 3 | -155/+82 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | 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 | 1 | -0/+21 | |
| | | ||||||
* | | File ending consisitency for backups | Dominik Schürmann | 2015-10-15 | 1 | -3/+5 | |
| | | ||||||
* | | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 4 | -69/+75 | |
| | | ||||||
* | | Remove debug code | Dominik Schürmann | 2015-10-15 | 1 | -9/+1 | |
| | | ||||||
* | | Mime type consistency | Dominik Schürmann | 2015-10-15 | 4 | -8/+8 | |
| | | ||||||
* | | 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 | 5 | -12/+12 | |
| | | | | | | | | db contract | |||||
* | | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 3 | -20/+57 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | Unify backup filename | Dominik Schürmann | 2015-10-15 | 1 | -2/+3 | |
| | | ||||||
* | | 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 | 1 | -26/+3 | |
|\ \ | ||||||
| * | | 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 :) | |||||
| * | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 | |
| | | | ||||||
| * | | 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. | |||||
* | | | 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 | 7 | -79/+116 | |
|\| | | ||||||
| * | | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 3 | -55/+6 | |
| | | | ||||||
| * | | use only primary and mutually bound subkeys for fingerprint verification | Vincent Breitmoser | 2015-10-06 | 1 | -4/+4 | |
| | | | ||||||
| * | | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 1 | -15/+23 | |
| | | | ||||||
| * | | Show dialog before sharing log | Dominik Schürmann | 2015-10-04 | 2 | -5/+83 | |
| | | | ||||||
* | | | decrypt: fix broken file save | Vincent Breitmoser | 2015-10-06 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 8 | -103/+116 | |
|\| | | ||||||
| * | | No show key button for RESULT_INVALID_SIGNATURE, Cleanup | Dominik Schürmann | 2015-09-30 | 3 | -9/+19 | |
| | | | ||||||
| * | | Cleanup in BaseNfcActivity | Dominik Schürmann | 2015-09-30 | 1 | -10/+2 | |
| | | | ||||||
| * | | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 6 | -59/+66 | |
| | | | ||||||
| * | | Fix crashes with Fluffys PGP applet | Dominik Schürmann | 2015-09-30 | 3 | -19/+31 | |
| | | | ||||||
| * | | Enable YubiKey creation | Dominik Schürmann | 2015-09-30 | 1 | -14/+5 | |
| | | | ||||||
| * | | Full 160 bit for phrase confirm, stuffed with ones | Dominik Schürmann | 2015-09-29 | 1 | -2/+3 | |
| | | | ||||||
* | | | import: special treatment for application/pgp-keys | Vincent Breitmoser | 2015-09-30 | 1 | -4/+10 | |
| | | | ||||||
* | | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 1 | -159/+89 | |
| | | | ||||||
* | | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 2 | -9/+15 | |
| | | | ||||||
* | | | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 2 | -38/+86 | |
| | | | ||||||
* | | | enc-export: add "back" button to fail state | Vincent Breitmoser | 2015-09-29 | 1 | -6/+16 | |
| | | | ||||||
* | | | enc-export: add comments about debug mechanisms | Vincent Breitmoser | 2015-09-29 | 1 | -0/+3 | |
| | | | ||||||
* | | | enc-export: localize snackbar strings | Vincent Breitmoser | 2015-09-29 | 2 | -7/+7 | |
| | | | ||||||
* | | | enc-export: rename fragment to match class | Vincent Breitmoser | 2015-09-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ↵ | Vincent Breitmoser | 2015-09-29 | 2 | -16/+75 | |
| | | | | | | | | | | | | pre-kitkat | |||||
* | | | enc-export: mv BackupCodeEntryFragment BackupCodeFragment | Vincent Breitmoser | 2015-09-29 | 2 | -4/+4 | |
| | | | ||||||
* | | | use annotations for android sdk constraints | Vincent Breitmoser | 2015-09-28 | 3 | -8/+10 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 11 | -434/+179 | |
|\| | | ||||||
| * | | Check that the encrypt input uris are not linked to our own internal storage ↵ | Dominik Schürmann | 2015-09-25 | 1 | -3/+26 | |
| | | | | | | | | | | | | (OKC-01-010) |