Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 1 | -3/+5 |
| | |||||
* | 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 | 2 | -14/+20 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | reworked keyserversyncadapterservice flow | Adithya Abraham Philip | 2015-08-20 | 1 | -0/+2 |
| | | |||||
* | | Change license of NfcOperationActivity and fix copyright in BaseNfcActivity | Dominik Schürmann | 2015-08-12 | 1 | -0/+2 |
| | | |||||
* | | Fix theme bugs | Dominik Schürmann | 2015-08-12 | 1 | -2/+12 |
| | | |||||
* | | show result error in cachingcryptooperationfragment (related #1445) | Vincent Breitmoser | 2015-08-12 | 1 | -0/+1 |
| | | |||||
* | | Refactor theme changing to avoid code repetition | Thialfihar | 2015-07-21 | 1 | -33/+5 |
| | | |||||
* | | Refactor theme preference values into constants | Thialfihar | 2015-07-21 | 1 | -1/+2 |
| | | | | | | | | Also explicitly set a theme via preference updating to the default. | ||||
* | | Add forgotten docu to a new method | Thialfihar | 2015-07-21 | 1 | -0/+6 |
| | | |||||
* | | Automatically recreate activities on theme change | Thialfihar | 2015-07-21 | 1 | -4/+29 |
| | | |||||
* | | Add theme setting | Thialfihar | 2015-07-21 | 1 | -0/+12 |
| | | | | | | | | | | This prepares that different themes can be added. Currently light and dark will just use the default OK theme. | ||||
* | | 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 | 2 | -51/+28 |
| | | |||||
* | | run queued operations in onViewStateRestored, *after* onActivityCreated | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | | |||||
* | | cryptoophelper: requested code must be saved between instances! | Vincent Breitmoser | 2015-07-09 | 2 | -1/+27 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
|\ \ | |||||
| * | | fixed progress dialog not shown after enable orbot dialog | Adithya Abraham Philip | 2015-07-08 | 1 | -0/+1 |
| | | | |||||
* | | | hide keyboard on crypto error/success | Vincent Breitmoser | 2015-07-08 | 3 | -6/+21 |
|/ / | |||||
* | | some cleanup and fix for back button in ImportKeysActivity (fixes #1372) | Vincent Breitmoser | 2015-07-08 | 1 | -3/+12 |
| | | |||||
* | | use QueueingCryptoOperationFragment in all other places | Vincent Breitmoser | 2015-07-07 | 2 | -1/+21 |
| | | |||||
* | | introduce QueueingCryptoOperationFragment to queue result handling in ↵ | Vincent Breitmoser | 2015-07-07 | 2 | -4/+77 |
| | | | | | | | | detached state | ||||
* | | 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 | 3 | -25/+12 |
| | | | | | | | | #1407) | ||||
* | | Save mTagHandlingEnabled in saved instance | Dominik Schürmann | 2015-07-06 | 1 | -1/+16 |
| | | |||||
* | | Better YubiKey UX flow for error handling | Dominik Schürmann | 2015-07-06 | 1 | -2/+21 |
| | | |||||
* | | Poll if yubikey has been taken away | Dominik Schürmann | 2015-07-06 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-06 | 3 | -65/+106 |
|\ \ | |||||
| * | | forgot a couple lines to commit | Vincent Breitmoser | 2015-07-06 | 1 | -2/+6 |
| | | | |||||
| * | | 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 | 2 | -39/+46 |
| | | | |||||
| * | | reformatted code | Adithya Abraham Philip | 2015-07-03 | 2 | -6/+9 |
| | | | |||||
| * | | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -11/+41 |
| | | | |||||
* | | | In NfcOperationsActivity, show NFC errors inline, in others show as Notify | Dominik Schürmann | 2015-07-06 | 1 | -90/+105 |
|/ / | |||||
* | | New NFC dialog design with indeterminate progress, do NFC stuff in background | Dominik Schürmann | 2015-07-03 | 1 | -30/+70 |
| | | |||||
* | | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -14/+11 |
| | | |||||
* | | fix CryptoOperationFragment infinite recursion | Adithya Abraham Philip | 2015-07-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 2 | -4/+4 |
|\ \ | |||||
| * | | Connect YubiKey URL to OpenKeychain | Dominik Schürmann | 2015-06-29 | 1 | -2/+2 |
| | | | |||||
| * | | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 2 | -2/+2 |
| | | | |||||
* | | | made CryptoOperationFragment implement OperationHelper.Callback | Adithya Abraham Philip | 2015-06-30 | 3 | -41/+15 |
| | | | |||||
* | | | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 2 | -6/+34 |
| | | | |||||
* | | | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+5 |
| | | | |||||
* | | | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 2 | -7/+4 |
| | | |