[Sync] Added Loading dialog

Author: OffRange

app/src/main/java/de/davis/passwordmanager/dialog/LoadingDialog.java

@@ -0,0 +1,31 @@
+package de.davis.passwordmanager.dialog;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import de.davis.passwordmanager.databinding.LoadingLayoutBinding;
+
+public class LoadingDialog extends BaseDialogBuilder<LoadingDialog> {
+
+    private LoadingLayoutBinding binding;
+
+    public LoadingDialog(@NonNull Context context) {
+        super(context);
+        setCancelable(false);
+    }
+
+    public void updateProgress(int current, int max){
+        double progress = (current * 100d / max);
+        binding.progress.setIndeterminate(false);
+        binding.progress.setProgressCompat((int) progress, true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater) {
+        binding = LoadingLayoutBinding.inflate(inflater);
+        return binding.getRoot();
+    }
+}

app/src/main/java/de/davis/passwordmanager/sync/DataTransfer.java

@@ -11,6 +11,7 @@
 
 import androidx.annotation.IntDef;
 import androidx.annotation.WorkerThread;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.os.HandlerCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -21,6 +22,7 @@
 import javax.crypto.AEADBadTagException;
 
 import de.davis.passwordmanager.R;
+import de.davis.passwordmanager.dialog.LoadingDialog;
 
 public abstract class DataTransfer {
 
@@ -32,6 +34,10 @@ public abstract class DataTransfer {
     @IntDef({TYPE_EXPORT, TYPE_IMPORT})
     public @interface Type{}
 
+    private LoadingDialog loadingDialog;
+
+    private final Handler handler = HandlerCompat.createAsync(Looper.getMainLooper());
+
     public DataTransfer(Context context) {
         this.context = context;
     }
@@ -40,7 +46,7 @@ public Context getContext() {
         return context;
     }
 
-    protected void error(Handler handler, Exception exception){
+    protected void error(Exception exception){
         handler.post(() -> {
             String msg = exception.getMessage();
             if(exception instanceof AEADBadTagException)
@@ -55,7 +61,7 @@ protected void error(Handler handler, Exception exception){
         });
     }
 
-    protected void handleResult(Handler handler, Result result){
+    protected void handleResult(Result result){
         handler.post(() -> {
             if(result instanceof Result.Error error)
                 new MaterialAlertDialogBuilder(getContext())
@@ -79,9 +85,18 @@ public void start(@Type int type, Uri uri){
         start(type, uri, null);
     }
 
+    protected void notifyUpdate(int current, int max){
+        handler.post(() -> loadingDialog.updateProgress(current, max));
+    }
+
     protected void start(@Type int type, Uri uri, String password) {
         ContentResolver resolver = getContext().getContentResolver();
-        Handler handler = HandlerCompat.createAsync(Looper.getMainLooper());
+
+        loadingDialog = new LoadingDialog(getContext())
+                .setTitle(type == TYPE_EXPORT ? R.string.export : R.string.import_str)
+                .setMessage(R.string.wait_text);
+        AlertDialog alertDialog = loadingDialog.show();
+
         doInBackground(() -> {
             Result result = null;
             try{
@@ -93,12 +108,14 @@ protected void start(@Type int type, Uri uri, String password) {
                 if(result == null)
                     return;
 
-                handleResult(handler, result);
+                handleResult(result);
             }catch (Exception e){
                 if(e instanceof NullPointerException)
                     return;
 
-                error(handler, e);
+                error(e);
+            }finally {
+                alertDialog.dismiss();
             }
         });
     }

app/src/main/java/de/davis/passwordmanager/sync/keygo/KeyGoTransfer.java

@@ -100,14 +100,19 @@ protected Result importElements(InputStream inputStream, String password) throws
                 .blockingGet();
 
         int existed = 0;
-        for (SecureElement element : list) {
+        int length = list.size();
+        for (int i = 0; i < length; i++) {
+            SecureElement element = list.get(i);
             if(elements.stream().anyMatch(e -> e.getTitle().equals(element.getTitle())
                     && e.getDetail().equals(element.getDetail()))) {
                 existed++;
+
+                notifyUpdate(i+1, length);
                 continue;
             }
 
             SecureElementManager.getInstance().createElement(element);
+            notifyUpdate(i+1, length);
         }
 
         if(existed != 0)

app/src/main/res/layout/loading_layout.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="24dp">
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:max="100" />
+</LinearLayout>

app/src/main/res/values-de/strings.xml

@@ -143,4 +143,6 @@
     </plurals>
     <string name="invalid_file_length">Ungültige Datei Länge</string>
     <string name="invalid_file">Ungültige Datei</string>
+
+    <string name="wait_text">Das könnte ein wenig Zeit in Anspruch nehmen. Bitte haben Sie Geduld</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -186,4 +186,6 @@
     </plurals>
     <string name="invalid_file_length">Invalid file length</string>
     <string name="invalid_file">Invalid file</string>
+
+    <string name="wait_text">This might take a little time. Please be patient</string>
 </resources>