From be432e7b4fa3ac20e4ef16569232ab92f51c530b Mon Sep 17 00:00:00 2001
From: Joshua Soberg <j15soberg@gmail.com>
Date: Fri, 29 Jan 2021 18:32:28 -0500
Subject: [PATCH] #635 - Show indeterminate unlock progress (in place of the
 unlock button) while authenticating

---
 .../Activities/AuthenticateActivity.java      | 28 ++++++++++++++-----
 .../main/res/layout/content_authenticate.xml  | 24 ++++++++++++----
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/AuthenticateActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/AuthenticateActivity.java
index 5a8c7031..1a459d38 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/AuthenticateActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/AuthenticateActivity.java
@@ -28,7 +28,6 @@ import android.os.Bundle;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import android.text.InputType;
 import android.text.method.PasswordTransformationMethod;
@@ -40,6 +39,7 @@ import android.view.WindowManager.LayoutParams;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -65,6 +65,7 @@ public class AuthenticateActivity extends ThemedActivity
 
     private TextInputEditText passwordInput;
     private Button unlockButton;
+    private ProgressBar unlockProgress;
 
     private AuthenticationTask activeTask;
 
@@ -116,7 +117,7 @@ public class AuthenticateActivity extends ThemedActivity
         initPasswordLabelView(v);
         initPasswordLayoutView(v);
         initPasswordInputView(v);
-        initUnlockButtonView(v);
+        initUnlockViews(v);
     }
 
     private void initPasswordLabelView(View v) {
@@ -148,9 +149,12 @@ public class AuthenticateActivity extends ThemedActivity
         passwordInput.setOnEditorActionListener(this);
     }
 
-    private void initUnlockButtonView(View v) {
+    private void initUnlockViews(View v) {
         unlockButton = v.findViewById(R.id.buttonUnlock);
         unlockButton.setOnClickListener(this);
+        unlockButton.setVisibility(View.VISIBLE);
+        unlockProgress = v.findViewById(R.id.unlockProgress);
+        unlockProgress.setVisibility(View.GONE);
     }
 
     @Override
@@ -168,11 +172,20 @@ public class AuthenticateActivity extends ThemedActivity
     }
 
     private void startAuthTask(String plainPassword) {
+        // Don't start another task if this was already started.
+        if (activeTask != null) {
+            return;
+        }
+        displayUnlockProgress();
+        activeTask = new AuthenticationTask(this, this::handleResult, isAuthUpgrade, existingAuthCredentials, plainPassword);
+        activeTask.execute();
+    }
+
+    private void displayUnlockProgress() {
         passwordInput.setEnabled(false);
         unlockButton.setEnabled(false);
-        Callback callback = this::handleResult;
-        activeTask = new AuthenticationTask(this, callback, isAuthUpgrade, existingAuthCredentials, plainPassword);
-        activeTask.execute();
+        unlockButton.setVisibility(View.INVISIBLE);
+        unlockProgress.setVisibility(View.VISIBLE);
     }
 
     private void handleResult(Result result) {
@@ -203,7 +216,8 @@ public class AuthenticateActivity extends ThemedActivity
     /** @return true if the task was active and was completed, false otherwise. */
     private boolean completeTaskIfActive() {
         try {
-            // This will cause the main thread to wait, but it'll ensure that the task completes.
+            // This will cause the main thread to lock, but ensures that our Activity result will be set.
+            // This task shouldn't take more than 1-2 seconds to complete from starting.
             if (activeTask != null) {
                 handleResult(activeTask.get());
                 return true;
diff --git a/app/src/main/res/layout/content_authenticate.xml b/app/src/main/res/layout/content_authenticate.xml
index 21f9006b..cf39682e 100644
--- a/app/src/main/res/layout/content_authenticate.xml
+++ b/app/src/main/res/layout/content_authenticate.xml
@@ -34,12 +34,26 @@
     <requestFocus/>
     </com.google.android.material.textfield.TextInputLayout>
 
-    <Button
-        android:id="@+id/buttonUnlock"
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        style="?android:attr/buttonBarButtonStyle"
-        android:text="@string/auth_button_unlock" />
+        android:layout_gravity="end">
+
+        <Button
+            android:id="@+id/buttonUnlock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:text="@string/auth_button_unlock" />
+
+        <ProgressBar
+            android:id="@+id/unlockProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyle"
+            android:layout_centerVertical="true"
+            android:layout_alignEnd="@id/buttonUnlock"/>
+
+    </RelativeLayout>
 
 </LinearLayout>