Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -4/+6 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 2 | -46/+90 |
|\ | |||||
| * | Use signature-level signature for TemporaryStorageProvider and describe the ↵ | Dominik Schürmann | 2015-06-29 | 1 | -15/+46 |
| | | | | | | | | security model | ||||
| * | Add brackets in KeychainProvider | Dominik Schürmann | 2015-06-29 | 1 | -30/+43 |
| | | |||||
| * | Use application/octet-stream as default type in TemporaryStorageProvider | Dominik Schürmann | 2015-06-29 | 1 | -1/+1 |
| | | |||||
* | | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -3/+3 |
| | | |||||
* | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -0/+3 |
|\ | |||||
| * | instrument: first couple of tests for OpenPGP API | Vincent Breitmoser | 2015-06-26 | 1 | -0/+3 |
| | | |||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 1 | -3/+6 |
| | | |||||
* | | fix decrypt view intents, save mimetype in storage provider, and thumbnail ↵ | Vincent Breitmoser | 2015-06-20 | 1 | -11/+14 |
| | | | | | | | | loading in decrypt list | ||||
* | | add mimetype and streamtype support in TemporaryStorageProvider | Vincent Breitmoser | 2015-06-20 | 1 | -4/+52 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -4/+9 |
|\| | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -4/+9 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | preliminary EditKeyTest | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 2 | -2/+3 |
|\| | |||||
| * | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 2 | -2/+3 |
| | | |||||
* | | multi-decrypt: implement save operation (missing actual copy) | Vincent Breitmoser | 2015-06-03 | 1 | -0/+5 |
|/ | |||||
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -2/+2 |
| | |||||
* | update database to trigger consolidate | Vincent Breitmoser | 2015-05-28 | 1 | -1/+3 |
| | |||||
* | improve robustness of SecretKeyType handling | Vincent Breitmoser | 2015-05-28 | 1 | -1/+1 |
| | |||||
* | set to stripped by default, rather than "unavailable" | Vincent Breitmoser | 2015-05-28 | 1 | -1/+1 |
| | |||||
* | allow user packets with only revocation packet | Vincent Breitmoser | 2015-05-28 | 1 | -4/+4 |
| | |||||
* | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 |
| | |||||
* | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 3 | -7/+6 |
| | |||||
* | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 1 | -3/+6 |
| | |||||
* | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 ↵ | Dominik Schürmann | 2015-05-04 | 1 | -8/+22 |
| | | | | with db upgrade | ||||
* | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 2 | -1/+10 |
| | |||||
* | change user_id primary key in database, use keyring rather than unified ↵ | Vincent Breitmoser | 2015-03-11 | 2 | -14/+17 |
| | | | | query in consolidate | ||||
* | API 7 | Dominik Schürmann | 2015-03-10 | 1 | -49/+59 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -2/+1 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | Debug options | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
| | |||||
* | save revocation instead of self-cert for revoked uids | Vincent Breitmoser | 2015-02-26 | 1 | -12/+19 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 3 | -14/+14 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 4 | -8/+127 |
|\ | |||||
| * | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 1 | -1/+0 |
| | | |||||
| * | Fix saving of allowed keys | Dominik Schürmann | 2015-01-30 | 1 | -11/+5 |
| | | |||||
| * | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵ | Dominik Schürmann | 2015-01-30 | 1 | -1/+1 |
| |\ | | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 | ||||
| | * | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 4 | -10/+70 |
| | | | |||||
| * | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 3 | -4/+70 |
| |/ | |||||
* / | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -4/+8 |
|/ | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 2 | -20/+20 |
| | |||||
* | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 |
| | |||||
* | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 2 | -12/+121 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 4 | -62/+94 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | minor stuff | Vincent Breitmoser | 2015-01-03 | 2 | -0/+2 |
| | |||||
* | throw exception if no data is found in getGenericData | Vincent Breitmoser | 2015-01-02 | 1 | -0/+3 |
| | |||||
* | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+5 |
| |