Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity | Adithya Abraham Philip | 2015-07-15 | 2 | -2/+5 |
| | |||||
* | upload only public key in revocation | Adithya Abraham Philip | 2015-07-13 | 2 | -1/+15 |
| | |||||
* | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 8 | -25/+47 |
| | |||||
* | added retry on upload failure | Adithya Abraham Philip | 2015-07-13 | 3 | -2/+16 |
| | |||||
* | allowed operations to modify CryptoInputParcel they receive | Adithya Abraham Philip | 2015-07-13 | 17 | -43/+55 |
| | |||||
* | prevented passphrase caching on revocation | Adithya Abraham Philip | 2015-07-13 | 2 | -1/+4 |
| | |||||
* | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+1 |
| | |||||
* | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 9 | -11/+326 |
| | |||||
* | fixed QR code scan and serialKeyImport progress | Adithya Abraham Philip | 2015-07-08 | 1 | -1/+3 |
| | |||||
* | Merge pull request #1424 from open-keychain/import-proxy | Dominik Schürmann | 2015-07-08 | 1 | -1/+7 |
|\ | | | | | Shifted proxy logic to ImportKeysListCloudLoader | ||||
| * | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -1/+7 |
| | | |||||
* | | fix symmetric passphrase caching (fixes #1401) | Vincent Breitmoser | 2015-07-08 | 2 | -2/+7 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-08 | 2 | -3/+14 |
|\ | |||||
| * | addition of subkeys for divert-to-card primary keys is not supported | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
| | | |||||
| * | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
| | | |||||
| * | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 1 | -3/+12 |
| | | |||||
* | | Temporary fix for multi export | Dominik Schürmann | 2015-07-08 | 1 | -10/+12 |
|/ | |||||
* | don't cache exporthelper, keep type for KeyItem in KeySpinner | Vincent Breitmoser | 2015-07-06 | 1 | -11/+11 |
| | |||||
* | nicer error msg if input data cannot be read | Vincent Breitmoser | 2015-07-06 | 1 | -0/+1 |
| | |||||
* | cleanup, NonNull annotation, never return null in PgpDecryptVerify | Vincent Breitmoser | 2015-07-06 | 10 | -50/+60 |
| | |||||
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 7 | -44/+161 |
| | |||||
* | removed e.printStackTrace from several places | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+2 |
| | |||||
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 2 | -13/+11 |
| | |||||
* | added keyserver/proxy support to certify operation | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+3 |
| | |||||
* | added OperationResult support to upload to keyserver | Adithya Abraham Philip | 2015-07-03 | 2 | -9/+19 |
| | |||||
* | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 2 | -1/+2 |
| | |||||
* | Fix caching of empty passphrase before moving keys to card | Dominik Schürmann | 2015-07-03 | 1 | -7/+16 |
| | |||||
* | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -0/+2 |
| | |||||
* | Add create key fragments for YubiKey PINs | Dominik Schürmann | 2015-07-01 | 2 | -3/+0 |
| | |||||
* | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 3 | -344/+379 |
| | |||||
* | fixed package import | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
| | |||||
* | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 3 | -3/+58 |
| | |||||
* | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 4 | -4/+219 |
| | |||||
* | migrated consolidation | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+27 |
| | |||||
* | fixed promote key tests | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | |||||
* | migrated promote op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+10 |
| | |||||
* | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+10 |
| | |||||
* | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+41 |
| | |||||
* | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -15/+259 |
| | |||||
* | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 4 | -4/+4 |
| | |||||
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
|\ | |||||
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -6/+10 |
|\| | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -6/+10 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 2 | -2/+6 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 |
| | | |||||
| * | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | | |||||
* | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 4 | -7/+13 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | ||||
| * | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 4 | -7/+13 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 3 | -18/+25 |
|\| | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml |