Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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) | |||||
| * | | 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 | |
| | | | | | | | | | | | | add (OKC-01-018) | |||||
| * | | 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 | |
| | | ||||||
* | | enc-backup: some cleanup in code entry fragment | Vincent Breitmoser | 2015-09-25 | 1 | -117/+2 | |
| | | ||||||
* | | enc-backup: ask for backup code again | Vincent Breitmoser | 2015-09-25 | 3 | -9/+205 | |
| | | ||||||
* | | encrypted export WIP | Vincent Breitmoser | 2015-09-19 | 5 | -4/+318 | |
|/ | ||||||
* | multidcrypt: display k9 download only after decryption failure | Vincent Breitmoser | 2015-09-17 | 2 | -4/+6 | |
| | ||||||
* | Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j | Vincent Breitmoser | 2015-09-17 | 1 | -0/+4 | |
|\ | ||||||
| * | Add K-9 Mail warning toast | Dominik Schürmann | 2015-09-17 | 1 | -0/+4 | |
| | | ||||||
* | | multidecrypt: use chooser intent on click for everything but text/plain ↵ | Vincent Breitmoser | 2015-09-17 | 1 | -10/+37 | |
|/ | | | | ACTION_SHOW | |||||
* | fail with warning if we get data from the AOSP mail client (see #290) | Vincent Breitmoser | 2015-09-16 | 1 | -1/+11 | |
| | ||||||
* | multidecrypt: attempt file deletion only once at most | Vincent Breitmoser | 2015-09-16 | 1 | -0/+3 | |
| | ||||||
* | actually use cleaned text if we read from clipboard | Vincent Breitmoser | 2015-09-16 | 1 | -2/+6 | |
| | ||||||
* | multidecrypt: disable delete if not from ACTION_VIEW | Vincent Breitmoser | 2015-09-16 | 2 | -24/+19 | |
| | ||||||
* | mime: respect charset header (default to utf-8) | Vincent Breitmoser | 2015-09-16 | 2 | -4/+7 | |
| | ||||||
* | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 2 | -6/+80 | |
| | ||||||
* | multidecrypt: context menu per card, not per file | Vincent Breitmoser | 2015-09-16 | 1 | -3/+6 | |
| | ||||||
* | Add text icon in decrypt list | Dominik Schürmann | 2015-09-16 | 1 | -1/+3 | |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java |