Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 2 | -19/+2 | |
| | | ||||||
* | | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 3 | -0/+23 | |
| | | ||||||
* | | Layout consistency for backup fragment | Dominik Schürmann | 2015-10-15 | 4 | -435/+373 | |
| | | ||||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 23 | -46/+45 | |
|\ \ | ||||||
| * | | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 | |
| | | | ||||||
| * | | pgpdecryptverify: refactor signature verification state into ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 | |
| | | | | | | | | | | | | SignatureChecker subclass | |||||
| * | | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 1 | -2/+4 | |
| | | | ||||||
| * | | center wizard buttons for other languages | Dominik Schürmann | 2015-10-04 | 10 | -21/+21 | |
| | | | ||||||
| * | | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 13 | -21/+15 | |
| | | | ||||||
| * | | Show dialog before sharing log | Dominik Schürmann | 2015-10-04 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 1 | -0/+2 | |
|\| | | ||||||
| * | | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 1 | -0/+2 | |
| | | | ||||||
* | | | decrypt: revise card layout margins | Vincent Breitmoser | 2015-09-30 | 1 | -16/+18 | |
| | | | ||||||
* | | | import: special treatment for application/pgp-keys | Vincent Breitmoser | 2015-09-30 | 1 | -0/+1 | |
| | | | ||||||
* | | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 1 | -9/+20 | |
| | | | ||||||
* | | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 2 | -2/+2 | |
| | | | ||||||
* | | | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 1 | -6/+6 | |
| | | | ||||||
* | | | enc-export: add "back" button to fail state | Vincent Breitmoser | 2015-09-29 | 4 | -14/+423 | |
| | | | ||||||
* | | | enc-export: localize snackbar strings | Vincent Breitmoser | 2015-09-29 | 1 | -0/+4 | |
| | | | ||||||
* | | | enc-export: transifex compat | Vincent Breitmoser | 2015-09-29 | 1 | -7/+7 | |
| | | | ||||||
* | | | enc-export: localization, and layout compatibility | Vincent Breitmoser | 2015-09-29 | 4 | -72/+394 | |
| | | | ||||||
* | | | enc-export: rename fragment to match class | Vincent Breitmoser | 2015-09-29 | 1 | -0/+0 | |
| | | | ||||||
* | | | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ↵ | Vincent Breitmoser | 2015-09-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | pre-kitkat | |||||
* | | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 32 | -197/+13217 | |
|\| | | ||||||
| * | | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 1 | -0/+1 | |
| | | | ||||||
| * | | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 3 | -10/+25 | |
| | | | ||||||
| * | | Fix genitiv in strings | Dominik Schürmann | 2015-09-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | Confirm design | Dominik Schürmann | 2015-09-24 | 8 | -135/+89 | |
| | | | ||||||
| * | | phrase confirmation | Dominik Schürmann | 2015-09-24 | 9 | -5/+13037 | |
| | | | ||||||
| * | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 15 | -48/+66 | |
| |/ | | | | | | | add (OKC-01-018) | |||||
| * | fix fallback for non-mime data | Vincent Breitmoser | 2015-09-19 | 1 | -1/+1 | |
| | | ||||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 1 | -5/+0 | |
| | | ||||||
* | | enc-backup: didn't like the check mark icon after all | Vincent Breitmoser | 2015-09-25 | 6 | -2/+0 | |
| | | ||||||
* | | enc-backup: use black check icon for button, and some cleanup | Vincent Breitmoser | 2015-09-25 | 6 | -1/+1 | |
| | | ||||||
* | | enc-backup: use only one fragment after all | Vincent Breitmoser | 2015-09-25 | 2 | -126/+217 | |
| | | ||||||
* | | enc-backup: handle bad code more nicely | Vincent Breitmoser | 2015-09-25 | 3 | -2/+17 | |
| | | ||||||
* | | enc-backup: ask for backup code again | Vincent Breitmoser | 2015-09-25 | 3 | -16/+213 | |
| | | ||||||
* | | encrypted export WIP | Vincent Breitmoser | 2015-09-19 | 4 | -0/+71 | |
|/ | ||||||
* | mime: skip trailing unsigned parts, and ignore nested signed data | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 | |
| | ||||||
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 1 | -0/+6 | |
| | ||||||
* | multidcrypt: display k9 download only after decryption failure | Vincent Breitmoser | 2015-09-17 | 1 | -1/+1 | |
| | ||||||
* | Use material overflow icon in decrypt list | Dominik Schürmann | 2015-09-17 | 9 | -3/+4 | |
| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | |||||
* | white share icon in log display activity | Vincent Breitmoser | 2015-09-17 | 6 | -1/+1 | |
| | ||||||
* | multidecrypt: black share icon in bottom sheet | Vincent Breitmoser | 2015-09-17 | 6 | -1/+1 | |
| | ||||||
* | Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j | Vincent Breitmoser | 2015-09-17 | 1 | -1/+2 | |
|\ | ||||||
| * | Add K-9 Mail warning toast | Dominik Schürmann | 2015-09-17 | 1 | -1/+2 | |
| | | ||||||
* | | multidecrypt: use chooser intent on click for everything but text/plain ↵ | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 | |
|/ | | | | ACTION_SHOW | |||||
* | fail with warning if we get data from the AOSP mail client (see #290) | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 | |
| | ||||||
* | mime: add failure case if openpgp processing fails! | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 | |
| | ||||||
* | mime: add logging messages | Vincent Breitmoser | 2015-09-16 | 1 | -13/+13 | |
| |