Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 1 | -3/+3 |
| | |||||
* | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 1 | -3/+3 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -5/+5 |
| | | | | what tokens are supported | ||||
* | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 1 | -1/+6 |
| | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
* | Display backup code UI instead of passphrase on decrypt | Dominik Schürmann | 2015-10-15 | 1 | -1/+2 |
| | |||||
* | fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+3 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md | ||||
* | made PassphraseDialogActivity compatible with null CryptoInputParcel | Adithya Abraham Philip | 2015-07-13 | 1 | -2/+2 |
| | |||||
* | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 1 | -4/+4 |
| | |||||
* | added retry on upload failure | Adithya Abraham Philip | 2015-07-13 | 1 | -4/+21 |
| | |||||
* | allowed operations to modify CryptoInputParcel they receive | Adithya Abraham Philip | 2015-07-13 | 1 | -4/+3 |
| | |||||
* | prevented passphrase caching on revocation | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+2 |
| | |||||
* | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -7/+4 |
| | |||||
* | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -17/+17 |
| | |||||
* | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -37/+26 |
| | |||||
* | cryptoophelper: requested code must be saved between instances! | Vincent Breitmoser | 2015-07-09 | 1 | -1/+14 |
| | |||||
* | fixed progress dialog not shown after enable orbot dialog | Adithya Abraham Philip | 2015-07-08 | 1 | -0/+1 |
| | |||||
* | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 1 | -5/+2 |
| | |||||
* | fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵ | Vincent Breitmoser | 2015-07-07 | 1 | -19/+5 |
| | | | | #1407) | ||||
* | cleanup, NonNull annotation, never return null in PgpDecryptVerify | Vincent Breitmoser | 2015-07-06 | 1 | -10/+7 |
| | |||||
* | some cleanup and documentation | Vincent Breitmoser | 2015-07-06 | 1 | -10/+0 |
| | |||||
* | reformatted code | Adithya Abraham Philip | 2015-07-03 | 1 | -5/+8 |
| | |||||
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -11/+41 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 1 | -1/+1 |
| | |||||
* | made CryptoOperationFragment implement OperationHelper.Callback | Adithya Abraham Philip | 2015-06-30 | 1 | -1/+1 |
| | |||||
* | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+19 |
| | |||||
* | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+5 |
| | |||||
* | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 1 | -6/+3 |
| | |||||
* | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
| | |||||
* | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+6 |
| | |||||
* | allow progress message to be set later | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+9 |
| | |||||
* | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+307 |