aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* enc-export: localize snackbar stringsVincent Breitmoser2015-09-293-7/+11
|
* enc-export: transifex compatVincent Breitmoser2015-09-291-7/+7
|
* enc-export: localization, and layout compatibilityVincent Breitmoser2015-09-294-72/+394
|
* enc-export: rename fragment to match classVincent Breitmoser2015-09-292-1/+1
|
* enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ↵Vincent Breitmoser2015-09-293-16/+76
| | | | pre-kitkat
* enc-export: mv BackupCodeEntryFragment BackupCodeFragmentVincent Breitmoser2015-09-292-4/+4
|
* use annotations for android sdk constraintsVincent Breitmoser2015-09-284-41/+35
|
* Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-2871-745/+2100
|\
| * Harden parsing of keyserver results (OKC-01-003)Dominik Schürmann2015-09-254-30/+48
| |
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-253-2/+8
| |
| * Check that the encrypt input uris are not linked to our own internal storage ↵Dominik Schürmann2015-09-251-3/+26
| | | | | | | | (OKC-01-010)
| * Prevent database downgrade (OKC-01-012)Dominik Schürmann2015-09-251-1/+10
| |
| * Reject filenames with slashes completlyDominik Schürmann2015-09-241-4/+5
| |
| * Cleanup FileHelperDominik Schürmann2015-09-244-20/+16
| |
| * Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-2410-319/+54
| |
| * Fix some illegal state exceptionsDominik Schürmann2015-09-242-5/+28
| |
| * Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| |
| * Confirm designDominik Schürmann2015-09-2410-146/+106
| |
| * 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-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
| |/ | | | | | | 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
| |
| * 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
| |/
* | 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
| |