aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| |
| * Confirm designDominik Schürmann2015-09-249-146/+105
| |
| * phrase confirmationDominik Schürmann2015-09-2413-11/+1352
| |
| * 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-217-18/+161
| | |\
| | * \ 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-213-31/+39
| | |_|/ | |/| |
| * | | Pin keybase certificateDominik Schürmann2015-09-213-20/+56
| | | |
| * | | 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-2022-142/+200
| |/ | | | | | | add (OKC-01-018)
| * 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
| |
| * Fix DECRYPT_DATA intentDominik Schürmann2015-09-182-4/+2
| |
* | 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-281-3/+12
| |
* | export: support encrypted export, first versionVincent Breitmoser2015-09-285-48/+93
| |
* | upload: identify key by masterKeyId onlyVincent Breitmoser2015-09-265-34/+42
| |
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-263-54/+52
| |
* | 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-256-2/+0
| |
* | enc-backup: use black check icon for button, and some cleanupVincent Breitmoser2015-09-257-5/+3
| |
* | 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
|/
* 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-179-3/+4
| | | | | | 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-176-1/+1
|
* multidecrypt: black share icon in bottom sheetVincent Breitmoser2015-09-176-1/+1
|
* 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
* fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-162-1/+12
|