aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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-219-33/+184
| | |\
| | * \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-2122-142/+200
| | |\ \
| | * | | 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-214-31/+39
| | |_|/ | |/| |
| * | | 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
| | |/ | |/|
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-2022-142/+200
| |/
| * 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 instructionBob Mottram2015-09-181-1/+1
| |/
* | enc-export: easier mechanism to get backup code from edittextsVincent Breitmoser2015-09-281-7/+8
* | upload: re-add upload by bytesVincent Breitmoser2015-09-286-59/+83
* | enc-backup: working "save to file"Vincent Breitmoser2015-09-281-8/+21
* | enc-backup: working first versionVincent Breitmoser2015-09-282-50/+82
* | signencrypt: make sure we buffer the InputStreamVincent Breitmoser2015-09-281-4/+5
* | export: improve stream handling, performanceVincent Breitmoser2015-09-282-3/+28
* | export: support encrypted export, first versionVincent Breitmoser2015-09-287-79/+295
* | upload: identify key by masterKeyId onlyVincent Breitmoser2015-09-265-34/+42
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-264-58/+54
* | export: externalize upload into its own operationVincent Breitmoser2015-09-269-144/+317
* | export: clean up, fix possible infinite loopVincent Breitmoser2015-09-261-61/+54
* | export: move execute operation to topVincent Breitmoser2015-09-261-40/+41
* | remove "export to file" code path from export operationVincent Breitmoser2015-09-264-74/+6
* | enc-backup: fix copyright noticesVincent Breitmoser2015-09-252-4/+2
* | enc-backup: didn't like the check mark icon after allVincent Breitmoser2015-09-257-3/+0
* | enc-backup: use black check icon for button, and some cleanupVincent Breitmoser2015-09-258-5/+4
* | enc-backup: clean up backstack after restoreVincent Breitmoser2015-09-251-6/+14
* | enc-backup: use ValueAnimator rather than ObjectAnimator for compatibilityVincent Breitmoser2015-09-251-34/+30
* | enc-backup: use only one fragment after allVincent Breitmoser2015-09-256-292/+417
* | enc-backup: handle bad code more nicelyVincent Breitmoser2015-09-254-22/+61
* | enc-backup: keep first generated codeVincent Breitmoser2015-09-251-2/+8
* | enc-backup: some cleanup in code entry fragmentVincent Breitmoser2015-09-251-117/+2
* | enc-backup: ask for backup code againVincent Breitmoser2015-09-256-25/+418
* | encrypted export WIPVincent Breitmoser2015-09-1910-4/+397
|/
* Merge pull request #1487 from open-keychain/mime4jVincent2015-09-1853-331/+1312
|\
| * 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
| * 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
| |\