diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 15:24:30 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-08 15:24:30 +0200 |
| commit | e0cb891a1f1eafa2d3e522b557169afcd1be9ed6 (patch) | |
| tree | 7dc5ac76205cb388b33c43ca94f17b41ebe0d897 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base | |
| parent | 6565adc5ccf713da73650b19d203831e25446f80 (diff) | |
| parent | 17ba1751f13984cd7aabb377377e18e692d12d0d (diff) | |
| download | open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.tar.gz open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.tar.bz2 open-keychain-e0cb891a1f1eafa2d3e522b557169afcd1be9ed6.zip | |
Merge remote-tracking branch 'origin/master'
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) { |