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/ImportKeysProxyActivity.java | |
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/ImportKeysProxyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java index 00425d8ad..36d728d35 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -110,7 +110,16 @@ public class ImportKeysProxyActivity extends FragmentActivity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (mImportOpHelper != null) { - mImportOpHelper.cryptoOperation(); + if (!mImportOpHelper.handleActivityResult(requestCode, resultCode, data)) { + // if a result has been returned, and it does not belong to mImportOpHelper, + // return it down to other activity + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + returnResult(data); + } else { + super.onActivityResult(requestCode, resultCode, data); + finish(); + } + } } if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) { @@ -128,13 +137,6 @@ public class ImportKeysProxyActivity extends FragmentActivity return; } - // if a result has been returned, return it down to other activity - if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { - returnResult(data); - } else { - super.onActivityResult(requestCode, resultCode, data); - finish(); - } } private void processScannedContent(String content) { |