From 643206b946005d3fb7a5ca3760703f269b2d64cb Mon Sep 17 00:00:00 2001
From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com>
Date: Mon, 5 Dec 2022 18:41:31 +0100
Subject: [PATCH] SubmitDebugLogActivity progress dialog make-over.

Fixes #12656
---
 .../logsubmit/SubmitDebugLogActivity.java     | 24 +++++++++----------
 .../res/layout/submit_debug_log_activity.xml  | 12 ++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
index 7e201f3972..4ce796bf2c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.DocumentsContract;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.URLSpan;
@@ -27,13 +26,13 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.BaseActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.ProgressCard;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
-import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.util.List;
 
@@ -48,17 +47,15 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
   private View                           warningBanner;
   private View                           editBanner;
   private CircularProgressMaterialButton submitButton;
-  private AlertDialog                    loadingDialog;
   private View                           scrollToBottomButton;
   private View                           scrollToTopButton;
+  private ProgressCard                   progressCard;
 
   private MenuItem editMenuItem;
   private MenuItem doneMenuItem;
   private MenuItem searchMenuItem;
   private MenuItem saveMenuItem;
 
-  private AlertDialog fileProgressDialog;
-
   private final DynamicTheme dynamicTheme = new DynamicTheme();
 
   @Override
@@ -160,7 +157,9 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
     if (requestCode == CODE_SAVE && resultCode == Activity.RESULT_OK) {
       Uri uri = data != null ? data.getData() : null;
       viewModel.onDiskSaveLocationReady(uri);
-      fileProgressDialog = SimpleProgressDialog.show(this);
+      if (progressCard != null) {
+        progressCard.setVisibility(View.VISIBLE);
+      }
     }
   }
 
@@ -176,6 +175,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
     this.submitButton         = findViewById(R.id.debug_log_submit_button);
     this.scrollToBottomButton = findViewById(R.id.debug_log_scroll_to_bottom);
     this.scrollToTopButton    = findViewById(R.id.debug_log_scroll_to_top);
+    this.progressCard         = findViewById(R.id.debug_log_progress_card);
 
     this.adapter = new SubmitDebugLogAdapter(this, viewModel.getPagingController());
 
@@ -204,8 +204,8 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
         }
       }
     });
+    this.progressCard.setVisibility(View.VISIBLE);
 
-    this.loadingDialog = SimpleProgressDialog.show(this);
   }
 
   private void initViewModel() {
@@ -215,9 +215,8 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
   }
 
   private void presentLines(@NonNull List<LogLine> lines) {
-    if (loadingDialog != null && lines.size() > 0) {
-      loadingDialog.dismiss();
-      loadingDialog = null;
+    if (progressCard != null && lines.size() > 0) {
+      progressCard.setVisibility(View.GONE);
 
       warningBanner.setVisibility(View.VISIBLE);
       submitButton.setVisibility(View.VISIBLE);
@@ -260,9 +259,8 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
     switch (event) {
       case FILE_SAVE_SUCCESS:
         Toast.makeText(this, R.string.SubmitDebugLogActivity_save_complete, Toast.LENGTH_SHORT).show();
-        if (fileProgressDialog != null) {
-          fileProgressDialog.dismiss();
-          fileProgressDialog = null;
+        if (progressCard != null) {
+          progressCard.setVisibility(View.GONE);
         }
         break;
       case FILE_SAVE_ERROR:
diff --git a/app/src/main/res/layout/submit_debug_log_activity.xml b/app/src/main/res/layout/submit_debug_log_activity.xml
index ddc01547a1..12ad52e758 100644
--- a/app/src/main/res/layout/submit_debug_log_activity.xml
+++ b/app/src/main/res/layout/submit_debug_log_activity.xml
@@ -95,4 +95,16 @@
       app:layout_constraintBottom_toBottomOf="parent"
       tools:visibility="visible"/>
 
+  <org.thoughtcrime.securesms.components.ProgressCard
+      android:id="@+id/debug_log_progress_card"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:visibility="gone"
+      app:cardCornerRadius="18dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file