| Commit message (Expand) | Author | Age | Files | Lines |
* | re-add accidentally deleted string | Vincent Breitmoser | 2015-10-21 | 1 | -1/+2 |
* | Renaming export strings to backup | Dominik Schürmann | 2015-10-15 | 3 | -45/+45 |
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 2 | -0/+2 |
* | File ending consisitency for backups | Dominik Schürmann | 2015-10-15 | 1 | -4/+3 |
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -5/+5 |
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for d... | Dominik Schürmann | 2015-10-15 | 2 | -7/+7 |
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 1 | -11/+14 |
|\ |
|
| * | make openInputStreamSafe static and move to FileHelper | Vincent Breitmoser | 2015-10-09 | 1 | -78/+11 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-08 | 2 | -2/+2 |
| |\ |
|
| * | | Dont allow encryption of app files via Os methods (OKC-01-010) | Dominik Schürmann | 2015-10-08 | 1 | -3/+73 |
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 2 | -3/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | pgpdecryptverify: get rid of duplicate code path for binary signature verific... | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 |
| * | | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 |
| * | | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 1 | -0/+2 |
| |/ |
|
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 1 | -1/+1 |
* | | inputdata: don't attempt mime decode on application/* except octet-stream | Vincent Breitmoser | 2015-09-30 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 3 | -39/+73 |
|\| |
|
| * | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 1 | -0/+1 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 1 | -14/+21 |
| |\ |
|
| | * | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 1 | -14/+21 |
| * | | mime: don't do mime parsing if the encrypted data has a filename | Vincent Breitmoser | 2015-09-21 | 1 | -6/+10 |
| |/ |
|
| * | 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 | 2 | -20/+23 |
* | | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 3 | -37/+45 |
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 1 | -3/+12 |
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 2 | -32/+78 |
* | | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 2 | -21/+21 |
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 2 | -49/+52 |
* | | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 4 | -106/+230 |
* | | 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 | 2 | -65/+5 |
|/ |
|
* | mime: skip trailing unsigned parts, and ignore nested signed data | Vincent Breitmoser | 2015-09-17 | 2 | -3/+17 |
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 2 | -16/+140 |
* | mime: add failure case if openpgp processing fails! | Vincent Breitmoser | 2015-09-16 | 2 | -0/+6 |
* | mime: add logging messages | Vincent Breitmoser | 2015-09-16 | 2 | -19/+18 |
* | mime: handle non-mime data, just pass it through | Vincent Breitmoser | 2015-09-16 | 2 | -11/+41 |
* | mime: respect charset header (default to utf-8) | Vincent Breitmoser | 2015-09-16 | 2 | -12/+7 |
* | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 1 | -3/+5 |
* | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 1 | -1/+1 |
* | mime: return one OpenPgpMetadata object per body part | Vincent Breitmoser | 2015-09-16 | 2 | -10/+32 |
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here be... | Vincent Breitmoser | 2015-09-16 | 2 | -11/+23 |
* | mime: add logging to InputDataOperation | Vincent Breitmoser | 2015-09-15 | 2 | -49/+92 |
* | mime: create more general InputDataOperation, which for now and does basic mi... | Vincent Breitmoser | 2015-09-15 | 4 | -374/+202 |
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 6 | -158/+219 |
|\ |
|
| * | share rather than save log files (OKC-01-015) | Vincent Breitmoser | 2015-09-11 | 1 | -17/+63 |
| * | never import secret keys from keyserver (OKC-01-001) | Vincent Breitmoser | 2015-09-11 | 2 | -4/+12 |
| * | perform fingerprint check after canonicalization (OKC-01-009) | Vincent Breitmoser | 2015-09-11 | 2 | -14/+3 |
| * | add support for signed-only data in the backend (#1507) | Vincent Breitmoser | 2015-09-10 | 1 | -0/+1 |