diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 15:18:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 15:18:25 +0200 |
| commit | 17ba1751f13984cd7aabb377377e18e692d12d0d (patch) | |
| tree | ce795b5af3aa8bec167e2891b2a31a74e39ffaa8 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base | |
| parent | eab46df9a3d838b8c5f0542183f1872f2b77e751 (diff) | |
| parent | ce3777eafbbdc8fb94acf185ff9f351d8cfad89d (diff) | |
| download | open-keychain-17ba1751f13984cd7aabb377377e18e692d12d0d.tar.gz open-keychain-17ba1751f13984cd7aabb377377e18e692d12d0d.tar.bz2 open-keychain-17ba1751f13984cd7aabb377377e18e692d12d0d.zip | |
Merge pull request #1429 from open-keychain/qr-fix
Fixed QR code import and serialKeyImport progress
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java index f72e87ca7..4bf86af8f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java @@ -171,6 +171,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu // this wasn't meant for us to handle return false; } else { + // reset mRequestedCode because we have finished what we started mRequestedCode = -1; } if (resultCode == Activity.RESULT_CANCELED) { |