fixed QR code scan and serialKeyImport progress

1 files changed, 3 insertions, 1 deletions

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<ImportKeyringParcel> {
     public ImportKeyResult serialKeyRingImport(Iterator<ParcelableKeyRing> 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);