aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* Fix some illegal state exceptionsDominik Schürmann2015-09-242-5/+28
* Confirm designDominik Schürmann2015-09-241-11/+16
* phrase confirmationDominik Schürmann2015-09-244-6/+347
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-09-211-6/+10
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-216-18/+136
| |\
| * \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-215-94/+101
| |\ \
| * | | mime: don't do mime parsing if the encrypted data has a filenameVincent Breitmoser2015-09-211-6/+10
* | | | Use api.keybase.ioDominik Schürmann2015-09-211-6/+1
| |_|/ |/| |
* | | Pin keybase certificateDominik Schürmann2015-09-212-20/+31
* | | Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-215-18/+125
| |/ |/|
* | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-205-94/+101
|/
* use intent icon as fallback if we get no thumbnailVincent Breitmoser2015-09-191-2/+4
* inform storage provider of uri content-type for decrypted outputVincent Breitmoser2015-09-191-0/+6
* skip mime parsing if we already know the content type isn't suitableVincent Breitmoser2015-09-191-5/+18
* fix fallback for non-mime dataVincent Breitmoser2015-09-192-20/+23
* Fix DECRYPT_DATA intentDominik Schürmann2015-09-181-1/+1
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-172-3/+17
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-173-16/+141
* multidcrypt: display k9 download only after decryption failureVincent Breitmoser2015-09-172-4/+6
* Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4jVincent Breitmoser2015-09-171-0/+4
|\
| * Add K-9 Mail warning toastDominik Schürmann2015-09-171-0/+4
* | multidecrypt: use chooser intent on click for everything but text/plain ACTIO...Vincent Breitmoser2015-09-171-10/+37
|/
* fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-161-1/+11
* multidecrypt: attempt file deletion only once at mostVincent Breitmoser2015-09-161-0/+3
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-162-0/+6
* mime: add logging messagesVincent Breitmoser2015-09-162-19/+18
* actually use cleaned text if we read from clipboardVincent Breitmoser2015-09-161-2/+6
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-162-11/+41
* multidecrypt: disable delete if not from ACTION_VIEWVincent Breitmoser2015-09-162-24/+19
* mime: respect charset header (default to utf-8)Vincent Breitmoser2015-09-166-23/+19
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-163-9/+85
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-161-3/+6
* Add text icon in decrypt listDominik Schürmann2015-09-161-1/+3
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-162-15/+43
* multidecrypt: prepare viewholder for file listVincent Breitmoser2015-09-161-38/+58
* multidecrypt: put drawable cache in map attributeVincent Breitmoser2015-09-161-41/+44
* fix messed up importsVincent Breitmoser2015-09-161-2/+3
* multidecrypt: change some method params, prepare for open/share of other outputsVincent Breitmoser2015-09-161-29/+16
* mime: return one OpenPgpMetadata object per body partVincent Breitmoser2015-09-162-10/+32
* multidecrypt: don't pass context to adapterVincent Breitmoser2015-09-162-25/+34
* multidecrypt: inline setOnClickListenerVincent Breitmoser2015-09-161-46/+26
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here be...Vincent Breitmoser2015-09-164-50/+66
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-152-49/+92
* mime: create more general InputDataOperation, which for now and does basic mi...Vincent Breitmoser2015-09-159-420/+261
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-1495-2010/+6888
|\
| * fix up navigation in keyserver select (fixes #1482)Vincent Breitmoser2015-09-112-3/+17
| * no chooser before DisplayTextActivity, can select from there (#1524)Vincent Breitmoser2015-09-111-17/+4
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-35/+39
| * sort confirmed keys before unconfirmed primary ones (OKC-01-011)Vincent Breitmoser2015-09-111-0/+5
| * strip encrypted filenames to basenames (OKC-01-004)Vincent Breitmoser2015-09-111-0/+3