From 9ec94a472f596515eca11297c524e1ccc6a35dd0 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 11 Dec 2019 17:03:22 +0100
Subject: [PATCH] Fix exception when importing an old export

---
 .../aegis/ui/tasks/ProgressDialogTask.java               | 9 ++++++++-
 .../com/beemdevelopment/aegis/ui/tasks/SlotListTask.java | 4 +---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
index deb9a5a5..c7af2a33 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/ProgressDialogTask.java
@@ -9,7 +9,7 @@ import com.beemdevelopment.aegis.ui.Dialogs;
 
 import androidx.annotation.CallSuper;
 
-public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Params, Void, Result> {
+public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Params, String, Result> {
     private ProgressDialog _dialog;
 
     public ProgressDialogTask(Context context, String message) {
@@ -33,6 +33,13 @@ public abstract class ProgressDialogTask<Params, Result> extends AsyncTask<Param
         }
     }
 
+    @Override
+    protected void onProgressUpdate(String... values) {
+        if (values.length == 1) {
+            _dialog.setMessage(values[0]);
+        }
+    }
+
     protected void setPriority() {
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE);
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/SlotListTask.java b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/SlotListTask.java
index fad63bd3..5ef24ba0 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/SlotListTask.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/tasks/SlotListTask.java
@@ -1,6 +1,5 @@
 package com.beemdevelopment.aegis.ui.tasks;
 
-import android.app.ProgressDialog;
 import android.content.Context;
 
 import com.beemdevelopment.aegis.R;
@@ -72,8 +71,7 @@ public class SlotListTask<T extends Slot> extends ProgressDialogTask<SlotListTas
                 throw e;
             }
 
-            ProgressDialog dialog = getDialog();
-            dialog.setMessage(dialog.getContext().getString(R.string.unlocking_vault_repair));
+            publishProgress(getDialog().getContext().getString(R.string.unlocking_vault_repair));
 
             // try to decrypt the password slot with the old key
             SecretKey oldKey = slot.deriveKey(oldPasswordBytes);