| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 1 | -3/+5 |
| | | |||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -4/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -14/+2 |
| | | | |||||
| * | | cryptoophelper: requested code must be saved between instances! | Vincent Breitmoser | 2015-07-09 | 1 | -0/+13 |
| | | | |||||
| * | | hide keyboard on crypto error/success | Vincent Breitmoser | 2015-07-08 | 1 | -3/+19 |
| | | | |||||
| * | | use QueueingCryptoOperationFragment in all other places | Vincent Breitmoser | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | fix handling of progress dialog creation in CryptoOperationFragment (fixes ↵ | Vincent Breitmoser | 2015-07-07 | 1 | -6/+6 |
| | | | | | | | | | #1407) | ||||
| * | | some cleanup and documentation | Vincent Breitmoser | 2015-07-06 | 1 | -29/+46 |
| | | | |||||
| * | | reformatted code | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | | | |||||
| * | | fix CryptoOperationFragment infinite recursion | Adithya Abraham Philip | 2015-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | made CryptoOperationFragment implement OperationHelper.Callback | Adithya Abraham Philip | 2015-06-30 | 1 | -38/+12 |
| | | | |||||
| * | | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+15 |
| | | | |||||
| * | | fixed Certify op | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+0 |
| | | | |||||
| * | | migrated key creation to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+12 |
| | | | |||||
| * | | allow progress message to be set later | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | | | |||||
| * | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -169/+28 |
| | | | |||||
| * | | handle multiple input URIs and Intent.SEND_MULTIPLE | Vincent Breitmoser | 2015-06-18 | 1 | -7/+13 |
| | | | |||||
| * | | 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 | ||||
| | * | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 1 | -0/+12 |
| | | | | |||||
| * | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 1 | -56/+35 |
| |\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | ||||
| | * | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -52/+35 |
| | | | | |||||
| * | | | multi-decrypt: fix progress with new CryptoFragment interfaces | Vincent Breitmoser | 2015-06-07 | 1 | -10/+13 |
| |/ / | |||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 1 | -19/+120 |
| | | | |||||
| * | | revert some accidentally committed cruft | Vincent Breitmoser | 2015-05-31 | 1 | -8/+0 |
| | | | |||||
| * | | handle empty passphrases in PassphraseDialogActivity | Vincent Breitmoser | 2015-05-31 | 1 | -0/+9 |
| | | | |||||
| * | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+1 |
| |/ | |||||
| * | More cleanup | Dominik Schürmann | 2015-04-15 | 1 | -0/+131 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java