Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | ||||||
* | mime: handle non-mime data, just pass it through | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 | |
| | ||||||
* | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 2 | -1/+22 | |
| | ||||||
* | multidecrypt: context menu per card, not per file | Vincent Breitmoser | 2015-09-16 | 3 | -22/+12 | |
| | ||||||
* | Add text icon in decrypt list | Dominik Schürmann | 2015-09-16 | 5 | -0/+0 | |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | |||||
* | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 2 | -62/+66 | |
| | ||||||
* | multidecrypt: prepare viewholder for file list | Vincent Breitmoser | 2015-09-16 | 1 | -51/+58 | |
| | ||||||
* | mime: add logging to InputDataOperation | Vincent Breitmoser | 2015-09-15 | 1 | -0/+12 | |
| | ||||||
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 242 | -4270/+5584 | |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | add share item to decrypt file list (#1524) | Vincent Breitmoser | 2015-09-11 | 2 | -1/+7 | |
| | | ||||||
| * | share rather than save log files (OKC-01-015) | Vincent Breitmoser | 2015-09-11 | 2 | -13/+4 | |
| | | ||||||
| * | never import secret keys from keyserver (OKC-01-001) | Vincent Breitmoser | 2015-09-11 | 8 | -8/+9 | |
| | | ||||||
| * | perform fingerprint check after canonicalization (OKC-01-009) | Vincent Breitmoser | 2015-09-11 | 1 | -2/+2 | |
| | | ||||||
| * | add support for signed-only data in the backend (#1507) | Vincent Breitmoser | 2015-09-10 | 1 | -0/+1 | |
| | | ||||||
| * | linked: ditch create dns fragment (for now) | Vincent Breitmoser | 2015-09-10 | 3 | -300/+0 | |
| | | ||||||
| * | linked: localization for github creation | Vincent Breitmoser | 2015-09-10 | 2 | -20/+31 | |
| | | ||||||
| * | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 6 | -2/+13 | |
| | | ||||||
| * | linked: fix button margins in select dialog | Vincent Breitmoser | 2015-09-08 | 1 | -3/+6 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 11 | -9/+9 | |
| |\ | ||||||
| | * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 11 | -9/+9 | |
| | | | | | | | | | | | | Move launcher icons to mipmap | |||||
| * | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 5 | -282/+5 | |
| | | | ||||||
| * | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 4 | -18/+26 | |
| |/ |