Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent database downgrade (OKC-01-012) | Dominik Schürmann | 2015-09-25 | 1 | -1/+10 |
| | |||||
* | Reject filenames with slashes completly | Dominik Schürmann | 2015-09-24 | 1 | -4/+5 |
| | |||||
* | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 4 | -20/+16 |
| | |||||
* | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 7 | -309/+29 |
| | |||||
* | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 2 | -5/+28 |
| | |||||
* | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -11/+16 |
| | |||||
* | phrase confirmation | Dominik Schürmann | 2015-09-24 | 4 | -6/+347 |
| | |||||
* | 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 | 6 | -18/+136 |
| |\ | |||||
| * \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 5 | -94/+101 |
| |\ \ | |||||
| * | | | 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 | 1 | -6/+1 |
| |_|/ |/| | | |||||
* | | | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 2 | -20/+31 |
| | | | |||||
* | | | 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 | 5 | -94/+101 |
|/ | | | | 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 | 2 | -20/+23 |
| | |||||
* | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 1 | -1/+1 |
| | |||||
* | mime: skip trailing unsigned parts, and ignore nested signed data | Vincent Breitmoser | 2015-09-17 | 2 | -3/+17 |
| | |||||
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 3 | -16/+141 |
| | |||||
* | 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 |
| | |||||
* | mime: add failure case if openpgp processing fails! | Vincent Breitmoser | 2015-09-16 | 2 | -0/+6 |
| | |||||
* | mime: add logging messages | Vincent Breitmoser | 2015-09-16 | 2 | -19/+18 |
| | |||||
* | actually use cleaned text if we read from clipboard | Vincent Breitmoser | 2015-09-16 | 1 | -2/+6 |
| | |||||
* | mime: handle non-mime data, just pass it through | Vincent Breitmoser | 2015-09-16 | 2 | -11/+41 |
| | |||||
* | 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 | 6 | -23/+19 |
| | |||||
* | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 3 | -9/+85 |
| | |||||
* | 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 | ||||
* | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 2 | -15/+43 |
| | |||||
* | multidecrypt: prepare viewholder for file list | Vincent Breitmoser | 2015-09-16 | 1 | -38/+58 |
| | |||||
* | multidecrypt: put drawable cache in map attribute | Vincent Breitmoser | 2015-09-16 | 1 | -41/+44 |
| | |||||
* | fix messed up imports | Vincent Breitmoser | 2015-09-16 | 1 | -2/+3 |
| | |||||
* | multidecrypt: change some method params, prepare for open/share of other outputs | Vincent Breitmoser | 2015-09-16 | 1 | -29/+16 |
| | |||||
* | mime: return one OpenPgpMetadata object per body part | Vincent Breitmoser | 2015-09-16 | 2 | -10/+32 |
| | |||||
* | multidecrypt: don't pass context to adapter | Vincent Breitmoser | 2015-09-16 | 2 | -25/+34 |
| | |||||
* | multidecrypt: inline setOnClickListener | Vincent Breitmoser | 2015-09-16 | 1 | -46/+26 |
| | |||||
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵ | Vincent Breitmoser | 2015-09-16 | 4 | -50/+66 |
| | | | | be dragons!) | ||||
* | mime: add logging to InputDataOperation | Vincent Breitmoser | 2015-09-15 | 2 | -49/+92 |
| | |||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 9 | -420/+261 |
| | | | | mime parsing | ||||
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 95 | -2010/+6888 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | fix up navigation in keyserver select (fixes #1482) | Vincent Breitmoser | 2015-09-11 | 2 | -3/+17 |
| | |