Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-09-18 | 1 | -1/+1 | |
|\ | ||||||
| * | Update README.md | Vincent | 2015-09-18 | 1 | -1/+1 | |
| | | ||||||
* | | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 2 | -4/+2 | |
|/ | ||||||
* | Merge pull request #1538 from bashrc/bashrc/build | Vincent | 2015-09-18 | 1 | -1/+1 | |
|\ | | | | | Fix build instruction | |||||
| * | Fix build instruction | Bob Mottram | 2015-09-18 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #1487 from open-keychain/mime4j | Vincent | 2015-09-18 | 53 | -331/+1312 | |
|\ | | | | | support multipart mime structure in decrypted data | |||||
| * | 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 | 10 | -3/+5 | |
| | | | | | | | | | | | | 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 | 7 | -1/+2 | |
| | | ||||||
| * | multidecrypt: black share icon in bottom sheet | Vincent Breitmoser | 2015-09-17 | 7 | -1/+2 | |
| | | ||||||
| * | 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 | |||||
| * | mime: don't decrypt in mime parsing only test | Vincent Breitmoser | 2015-09-17 | 1 | -2/+1 | |
| | | ||||||
| * | update openpgp-api-lib with OpenPgpMetadata changes | Vincent Breitmoser | 2015-09-16 | 1 | -0/+0 | |
| | | ||||||
| * | fail with warning if we get data from the AOSP mail client (see #290) | Vincent Breitmoser | 2015-09-16 | 2 | -1/+12 | |
| | | ||||||
| * | 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 | 3 | -0/+7 | |
| | | ||||||
| * | mime: add logging messages | Vincent Breitmoser | 2015-09-16 | 3 | -32/+31 | |
| | | ||||||
| * | 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 | 3 | -11/+42 | |
| | | ||||||
| * | 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 | 7 | -25/+21 | |
| | | ||||||
| * | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 6 | -10/+108 | |
| | | ||||||
| * | enable view intent with text/plain (related #290) | Vincent Breitmoser | 2015-09-16 | 1 | -1/+1 | |
| | | ||||||
| * | multidecrypt: context menu per card, not per file | Vincent Breitmoser | 2015-09-16 | 4 | -25/+18 | |
| | | ||||||
| * | Add text icon in decrypt list | Dominik Schürmann | 2015-09-16 | 7 | -1/+4 | |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | |||||
| * | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 4 | -77/+109 | |
| | | ||||||
| * | multidecrypt: prepare viewholder for file list | Vincent Breitmoser | 2015-09-16 | 2 | -89/+116 | |
| | | ||||||
| * | 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 | 4 | -52/+104 | |
| | | ||||||
| * | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 13 | -423/+431 | |
| | | | | | | | | mime parsing | |||||
| * | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 365 | -6323/+26155 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | WIP mime parsing | Dominik Schürmann | 2015-08-17 | 8 | -42/+610 | |
| | | | ||||||
* | | | Change mailinglist | Dominik Schürmann | 2015-09-15 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | fix up navigation in keyserver select (fixes #1482) | Vincent Breitmoser | 2015-09-11 | 2 | -3/+17 | |
| | | ||||||
* | | no chooser before DisplayTextActivity, can select from there (#1524) | Vincent Breitmoser | 2015-09-11 | 1 | -17/+4 | |
| | | ||||||
* | | add share item to decrypt file list (#1524) | Vincent Breitmoser | 2015-09-11 | 3 | -36/+46 | |
| | | ||||||
* | | sort confirmed keys before unconfirmed primary ones (OKC-01-011) | Vincent Breitmoser | 2015-09-11 | 1 | -0/+5 | |
| | | ||||||
* | | fix unit tests for new savePublicKeyRing method signature | Vincent Breitmoser | 2015-09-11 | 4 | -4/+4 | |
| | |