| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | 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 |
| * | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 3 | -9/+6 |
| * | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 5 | -238/+20 |
| * | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 1 | -5/+24 |
| * | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -11/+16 |
| * | phrase confirmation | Dominik Schürmann | 2015-09-24 | 2 | -129/+12 |
| * | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 1 | -1/+5 |
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ... | Dominik Schürmann | 2015-09-20 | 2 | -36/+66 |
| * | use intent icon as fallback if we get no thumbnail | Vincent Breitmoser | 2015-09-19 | 1 | -2/+4 |
| * | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 1 | -1/+1 |
* | | enc-export: easier mechanism to get backup code from edittexts | Vincent Breitmoser | 2015-09-28 | 1 | -7/+8 |
* | | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 1 | -0/+1 |
* | | enc-backup: working "save to file" | Vincent Breitmoser | 2015-09-28 | 1 | -8/+21 |
* | | enc-backup: working first version | Vincent Breitmoser | 2015-09-28 | 2 | -50/+82 |
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -2/+6 |
* | | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 2 | -7/+16 |
* | | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 2 | -19/+20 |
* | | enc-backup: fix copyright notices | Vincent Breitmoser | 2015-09-25 | 2 | -4/+2 |
* | | enc-backup: use black check icon for button, and some cleanup | Vincent Breitmoser | 2015-09-25 | 1 | -4/+2 |
* | | enc-backup: clean up backstack after restore | Vincent Breitmoser | 2015-09-25 | 1 | -6/+14 |
* | | enc-backup: use ValueAnimator rather than ObjectAnimator for compatibility | Vincent Breitmoser | 2015-09-25 | 1 | -34/+30 |
* | | enc-backup: use only one fragment after all | Vincent Breitmoser | 2015-09-25 | 4 | -166/+200 |
* | | enc-backup: handle bad code more nicely | Vincent Breitmoser | 2015-09-25 | 1 | -20/+44 |
* | | enc-backup: keep first generated code | Vincent Breitmoser | 2015-09-25 | 1 | -2/+8 |