From a038a038c3807da59809c8898300ab51e372c762 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Wed, 8 Jul 2015 18:11:10 +0530 Subject: fixed QR code scan and serialKeyImport progress --- .../org/sufficientlysecure/keychain/operations/ImportOperation.java | 4 +++- .../org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java index a89b46cca..256f1bb82 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportOperation.java @@ -155,7 +155,9 @@ public class ImportOperation extends BaseOperation { public ImportKeyResult serialKeyRingImport(Iterator entries, int num, String keyServerUri, Progressable progressable, Proxy proxy) { - updateProgress(R.string.progress_importing, 0, 100); + if (progressable != null) { + progressable.setProgress(R.string.progress_importing, 0, 100); + } OperationLog log = new OperationLog(); log.add(LogType.MSG_IMPORT, 0, num); 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..a2976b437 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,7 @@ public class ImportKeysProxyActivity extends FragmentActivity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (mImportOpHelper != null) { - mImportOpHelper.cryptoOperation(); + mImportOpHelper.handleActivityResult(requestCode, resultCode, data); } if (requestCode == IntentIntegratorSupportV4.REQUEST_CODE) { -- cgit v1.2.3