Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix genitiv in strings | Dominik Schürmann | 2015-09-24 | 1 | -2/+2 | |
| | | ||||||
| * | Confirm design | Dominik Schürmann | 2015-09-24 | 9 | -146/+105 | |
| | | ||||||
| * | phrase confirmation | Dominik Schürmann | 2015-09-24 | 13 | -11/+1352 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-09-21 | 1 | -6/+10 | |
| |\ | ||||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 7 | -18/+161 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 22 | -142/+200 | |
| | |\ \ | ||||||
| | * | | | mime: don't do mime parsing if the encrypted data has a filename | Vincent Breitmoser | 2015-09-21 | 1 | -6/+10 | |
| | | | | | ||||||
| * | | | | Use api.keybase.io | Dominik Schürmann | 2015-09-21 | 3 | -31/+39 | |
| | |_|/ | |/| | | ||||||
| * | | | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 3 | -20/+56 | |
| | | | | ||||||
| * | | | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 5 | -18/+125 | |
| | |/ | |/| | ||||||
| * | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 22 | -142/+200 | |
| |/ | | | | | | | add (OKC-01-018) | |||||
| * | use intent icon as fallback if we get no thumbnail | Vincent Breitmoser | 2015-09-19 | 1 | -2/+4 | |
| | | ||||||
| * | inform storage provider of uri content-type for decrypted output | Vincent Breitmoser | 2015-09-19 | 1 | -0/+6 | |
| | | ||||||
| * | skip mime parsing if we already know the content type isn't suitable | Vincent Breitmoser | 2015-09-19 | 1 | -5/+18 | |
| | | ||||||
| * | fix fallback for non-mime data | Vincent Breitmoser | 2015-09-19 | 3 | -21/+24 | |
| | | ||||||
| * | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 2 | -4/+2 | |
| | | ||||||
* | | 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 | 6 | -59/+83 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | signencrypt: make sure we buffer the InputStream | Vincent Breitmoser | 2015-09-28 | 1 | -4/+5 | |
| | | ||||||
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 1 | -3/+12 | |
| | | ||||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 5 | -48/+93 | |
| | | ||||||
* | | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 5 | -34/+42 | |
| | | ||||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 3 | -54/+52 | |
| | | ||||||
* | | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 9 | -144/+317 | |
| | | ||||||
* | | export: clean up, fix possible infinite loop | Vincent Breitmoser | 2015-09-26 | 1 | -61/+54 | |
| | | ||||||
* | | export: move execute operation to top | Vincent Breitmoser | 2015-09-26 | 1 | -40/+41 | |
| | | ||||||
* | | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 4 | -74/+6 | |
| | | ||||||
* | | enc-backup: fix copyright notices | Vincent Breitmoser | 2015-09-25 | 2 | -4/+2 | |
| | | ||||||
* | | 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 | 7 | -5/+3 | |
| | | ||||||
* | | 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 | 6 | -292/+417 | |
| | | ||||||
* | | enc-backup: handle bad code more nicely | Vincent Breitmoser | 2015-09-25 | 4 | -22/+61 | |
| | | ||||||
* | | 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 | 6 | -25/+418 | |
| | | ||||||
* | | encrypted export WIP | Vincent Breitmoser | 2015-09-19 | 10 | -4/+397 | |
|/ | ||||||
* | mime: skip trailing unsigned parts, and ignore nested signed data | Vincent Breitmoser | 2015-09-17 | 3 | -3/+18 | |
| | ||||||
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 4 | -16/+147 | |
| | ||||||
* | multidcrypt: display k9 download only after decryption failure | Vincent Breitmoser | 2015-09-17 | 3 | -5/+7 | |
| | ||||||
* | 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 | 2 | -1/+6 | |
|\ | ||||||
| * | Add K-9 Mail warning toast | Dominik Schürmann | 2015-09-17 | 2 | -1/+6 | |
| | | ||||||
* | | multidecrypt: use chooser intent on click for everything but text/plain ↵ | Vincent Breitmoser | 2015-09-17 | 2 | -10/+38 | |
|/ | | | | ACTION_SHOW | |||||
* | fail with warning if we get data from the AOSP mail client (see #290) | Vincent Breitmoser | 2015-09-16 | 2 | -1/+12 | |
| |