| Commit message (Expand) | Author | Age | Files | Lines |
* | Use more generic 'Security Token' where possible, add sutitle to create key w... | Dominik Schürmann | 2016-01-10 | 1 | -3/+3 |
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 1 | -21/+0 |
* | api: add micalg result extra to detached signature api call | Vincent Breitmoser | 2015-12-17 | 1 | -0/+10 |
* | some work on benchmark operation (affects only debug build) | Vincent Breitmoser | 2015-12-13 | 1 | -1/+4 |
* | Merge pull request #1610 from open-keychain/facebook | Dominik Schürmann | 2015-12-10 | 2 | -0/+59 |
|\ |
|
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 2 | -0/+59 |
* | | Issue#1605 solved | TedaLIEz | 2015-12-09 | 1 | -1/+6 |
|/ |
|
* | Show notification when READ_CONTACTS permission is denied in sync service, hi... | Dominik Schürmann | 2015-11-23 | 4 | -10/+6 |
* | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 2 | -4/+2 |
* | inputdataop: leave content as-is if no header found (fixes #1592) | Vincent Breitmoser | 2015-11-14 | 1 | -0/+9 |
* | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 1 | -0/+2 |
* | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 2 | -3/+50 |
* | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 2 | -16/+29 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 1 | -1/+3 |
|\ |
|
| * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 1 | -1/+3 |
* | | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 5 | -4/+23 |
* | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 3 | -0/+142 |
|/ |
|
* | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 1 | -16/+28 |
* | import: reduce number of threads a little, and code cleanup | Vincent Breitmoser | 2015-10-29 | 1 | -39/+37 |
* | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 2 | -9/+9 |
* | editkey: always return EditKeyResult | Vincent Breitmoser | 2015-10-29 | 3 | -14/+16 |
* | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 2 | -10/+7 |
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 7 | -65/+109 |
* | inputdataoperation: guess filetype from filename for generic application/ mim... | Vincent Breitmoser | 2015-10-23 | 2 | -3/+18 |
* | 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 |