Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | fixed Certify op | Adithya Abraham Philip | 2015-06-27 | 2 | -2/+2 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 | 2 | -5/+14 |
| | | |||||
* | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 2 | -169/+335 |
|/ | |||||
* | 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 | 3 | -76/+123 |
|\ | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 1 | -13/+122 |
| |\ | | | | | | | Improved smart card error handling | ||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -42/+40 |
| | | | |||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 1 | -13/+124 |
| | | | |||||
| * | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 2 | -63/+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 | 2 | -61/+67 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | ||||
| * | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 2 | -57/+67 |
| | | | |||||
* | | | 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 | 2 | -35/+160 |
|/ | |||||
* | 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 |
| | |||||
* | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 1 | -0/+64 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -4/+19 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | respect cache in yubikey pin data flow | Vincent Breitmoser | 2015-05-28 | 1 | -4/+19 |
| | |