aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-219-33/+184
|\
| * Fix deps verificationDominik Schürmann2015-09-211-1/+1
| |
| * Pin keybase certificateDominik Schürmann2015-09-214-20/+56
| |
| * Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-217-33/+148
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-2122-142/+200
|\|
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵Dominik Schürmann2015-09-2022-142/+200
| | | | | | | | add (OKC-01-018)
* | mime: don't do mime parsing if the encrypted data has a filenameVincent Breitmoser2015-09-211-6/+10
|/
* 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-193-21/+24
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-09-181-1/+1
|\
| * Update README.mdVincent2015-09-181-1/+1
| |
* | Fix DECRYPT_DATA intentDominik Schürmann2015-09-182-4/+2
|/
* Merge pull request #1538 from bashrc/bashrc/buildVincent2015-09-181-1/+1
|\ | | | | Fix build instruction
| * Fix build instructionBob Mottram2015-09-181-1/+1
|/
* Merge pull request #1487 from open-keychain/mime4jVincent2015-09-1853-331/+1312
|\ | | | | support multipart mime structure in decrypted data
| * mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-173-3/+18
| |
| * mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-174-16/+147
| |
| * multidcrypt: display k9 download only after decryption failureVincent Breitmoser2015-09-173-5/+7
| |
| * Use material overflow icon in decrypt listDominik Schürmann2015-09-1710-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 activityVincent Breitmoser2015-09-177-1/+2
| |
| * multidecrypt: black share icon in bottom sheetVincent Breitmoser2015-09-177-1/+2
| |
| * Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4jVincent Breitmoser2015-09-172-1/+6
| |\
| | * Add K-9 Mail warning toastDominik Schürmann2015-09-172-1/+6
| | |
| * | multidecrypt: use chooser intent on click for everything but text/plain ↵Vincent Breitmoser2015-09-172-10/+38
| |/ | | | | | | ACTION_SHOW
| * mime: don't decrypt in mime parsing only testVincent Breitmoser2015-09-171-2/+1
| |
| * update openpgp-api-lib with OpenPgpMetadata changesVincent Breitmoser2015-09-161-0/+0
| |
| * fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-162-1/+12
| |
| * multidecrypt: attempt file deletion only once at mostVincent Breitmoser2015-09-161-0/+3
| |
| * mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-163-0/+7
| |
| * mime: add logging messagesVincent Breitmoser2015-09-163-32/+31
| |
| * 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-163-11/+42
| |
| * multidecrypt: disable delete if not from ACTION_VIEWVincent Breitmoser2015-09-162-24/+19
| |
| * mime: respect charset header (default to utf-8)Vincent Breitmoser2015-09-167-25/+21
| |
| * multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-166-10/+108
| |
| * enable view intent with text/plain (related #290)Vincent Breitmoser2015-09-161-1/+1
| |
| * multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-164-25/+18
| |
| * Add text icon in decrypt listDominik Schürmann2015-09-167-1/+4
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
| * multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-164-77/+109
| |
| * multidecrypt: prepare viewholder for file listVincent Breitmoser2015-09-162-89/+116
| |
| * 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 ↵Vincent Breitmoser2015-09-164-50/+66
| | | | | | | | be dragons!)
| * mime: add logging to InputDataOperationVincent Breitmoser2015-09-154-52/+104
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:10:24 +0000