Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 71 | -745/+2100 |
|\ | |||||
| * | Harden parsing of keyserver results (OKC-01-003) | Dominik Schürmann | 2015-09-25 | 4 | -30/+48 |
| | | |||||
| * | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 3 | -2/+8 |
| | | |||||
| * | Check that the encrypt input uris are not linked to our own internal storage ↵ | Dominik Schürmann | 2015-09-25 | 1 | -3/+26 |
| | | | | | | | | (OKC-01-010) | ||||
| * | Prevent database downgrade (OKC-01-012) | Dominik Schürmann | 2015-09-25 | 1 | -1/+10 |
| | | |||||
| * | Reject filenames with slashes completly | Dominik Schürmann | 2015-09-24 | 1 | -4/+5 |
| | | |||||
| * | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 4 | -20/+16 |
| | | |||||
| * | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 10 | -319/+54 |
| | | |||||
| * | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 2 | -5/+28 |
| | | |||||
| * | Fix genitiv in strings | Dominik Schürmann | 2015-09-24 | 1 | -2/+2 |
| | | |||||
| * | Confirm design | Dominik Schürmann | 2015-09-24 | 10 | -146/+106 |
| | | |||||
| * | phrase confirmation | Dominik Schürmann | 2015-09-24 | 13 | -11/+1352 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-09-21 | 1 | -6/+10 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 9 | -33/+184 |
| | |\ | |||||
| | * \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 22 | -142/+200 |
| | |\ \ | |||||
| | * | | | mime: don't do mime parsing if the encrypted data has a filename | Vincent Breitmoser | 2015-09-21 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Use api.keybase.io | Dominik Schürmann | 2015-09-21 | 4 | -31/+39 |
| | |_|/ | |/| | | |||||
| * | | | Fix deps verification | Dominik Schürmann | 2015-09-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 4 | -20/+56 |
| | | | | |||||
| * | | | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 7 | -33/+148 |
| | |/ | |/| | |||||
| * | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 22 | -142/+200 |
| |/ | | | | | | | add (OKC-01-018) | ||||
| * | use intent icon as fallback if we get no thumbnail | Vincent Breitmoser | 2015-09-19 | 1 | -2/+4 |
| | | |||||
| * | inform storage provider of uri content-type for decrypted output | Vincent Breitmoser | 2015-09-19 | 1 | -0/+6 |
| | | |||||
| * | skip mime parsing if we already know the content type isn't suitable | Vincent Breitmoser | 2015-09-19 | 1 | -5/+18 |
| | | |||||
| * | fix fallback for non-mime data | Vincent Breitmoser | 2015-09-19 | 3 | -21/+24 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-09-18 | 1 | -1/+1 |
| |\ | |||||
| | * | Update README.md | Vincent | 2015-09-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 2 | -4/+2 |
| |/ | |||||
| * | Merge pull request #1538 from bashrc/bashrc/build | Vincent | 2015-09-18 | 1 | -1/+1 |
| |\ | | | | | | | Fix build instruction | ||||
| | * | Fix build instruction | Bob Mottram | 2015-09-18 | 1 | -1/+1 |
| |/ | |||||
* | | enc-export: easier mechanism to get backup code from edittexts | Vincent Breitmoser | 2015-09-28 | 1 | -7/+8 |
| | | |||||
* | | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 6 | -59/+83 |
| | | |||||
* | | enc-backup: working "save to file" | Vincent Breitmoser | 2015-09-28 | 1 | -8/+21 |
| | | |||||
* | | enc-backup: working first version | Vincent Breitmoser | 2015-09-28 | 2 | -50/+82 |
| | | |||||
* | | signencrypt: make sure we buffer the InputStream | Vincent Breitmoser | 2015-09-28 | 1 | -4/+5 |
| | | |||||
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 2 | -3/+28 |
| | | |||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 7 | -79/+295 |
| | | |||||
* | | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 5 | -34/+42 |
| | | |||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 4 | -58/+54 |
| | | |||||
* | | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 9 | -144/+317 |
| | | |||||
* | | export: clean up, fix possible infinite loop | Vincent Breitmoser | 2015-09-26 | 1 | -61/+54 |
| | | |||||
* | | export: move execute operation to top | Vincent Breitmoser | 2015-09-26 | 1 | -40/+41 |
| | | |||||
* | | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 4 | -74/+6 |
| | | |||||
* | | enc-backup: fix copyright notices | Vincent Breitmoser | 2015-09-25 | 2 | -4/+2 |
| | | |||||
* | | enc-backup: didn't like the check mark icon after all | Vincent Breitmoser | 2015-09-25 | 7 | -3/+0 |
| | | |||||
* | | enc-backup: use black check icon for button, and some cleanup | Vincent Breitmoser | 2015-09-25 | 8 | -5/+4 |
| | | |||||
* | | enc-backup: clean up backstack after restore | Vincent Breitmoser | 2015-09-25 | 1 | -6/+14 |
| | | |||||
* | | enc-backup: use ValueAnimator rather than ObjectAnimator for compatibility | Vincent Breitmoser | 2015-09-25 | 1 | -34/+30 |
| | | |||||
* | | enc-backup: use only one fragment after all | Vincent Breitmoser | 2015-09-25 | 6 | -292/+417 |
| | | |||||
* | | enc-backup: handle bad code more nicely | Vincent Breitmoser | 2015-09-25 | 4 | -22/+61 |
| | |