From f56ee50c602123c5c593db9295eb4b8a72934d0e Mon Sep 17 00:00:00 2001
From: Chan Jun Da <65345505+chan-j-d@users.noreply.github.com>
Date: Mon, 20 Feb 2023 14:27:57 +0800
Subject: [PATCH] Fix #5148: Use DialogUtil method in Uploadactivity (#5149)

* Replace showInfoAlert with available DialogUtil method

* Remove test case that is no longer relevant
---
 .../nrw/commons/upload/UploadActivity.java    | 22 ++++++-------------
 .../commons/upload/UploadActivityUnitTests.kt | 20 -----------------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index f09724547..7fd4ecce7 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -225,9 +225,13 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .filter(result -> result)
-                .subscribe(result -> showInfoAlert(R.string.block_notification_title,
-                        R.string.block_notification, UploadActivity.this::finish)
-                ));
+                .subscribe(result -> DialogUtil.showAlertDialog(
+                    this,
+                    getString(R.string.block_notification_title),
+                    getString(R.string.block_notification),
+                    getString(R.string.ok),
+                    this::finish,
+                    true)));
     }
 
     private void checkStoragePermissions() {
@@ -457,18 +461,6 @@ public class UploadActivity extends BaseActivity implements UploadContract.View,
         finish();
     }
 
-    private void showInfoAlert(int titleStringID, int messageStringId, Runnable positive, String... formatArgs) {
-        new AlertDialog.Builder(this)
-                .setTitle(titleStringID)
-                .setMessage(getString(messageStringId, (Object[]) formatArgs))
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, (dialog, id) -> {
-                    positive.run();
-                    dialog.cancel();
-                })
-                .create()
-                .show();
-    }
 
     @Override
     public void showAlertDialog(int messageResourceId, Runnable onPositiveClick) {
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
index eab2ae781..5e3eceda1 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
@@ -233,26 +233,6 @@ class UploadActivityUnitTests {
         method.invoke(activity)
     }
 
-    @Test
-    @Throws(Exception::class)
-    fun testShowInfoAlert() {
-        val method: Method = UploadActivity::class.java.getDeclaredMethod(
-            "showInfoAlert",
-            Int::class.java,
-            Int::class.java,
-            Runnable::class.java,
-            Array<String>::class.java
-        )
-        method.isAccessible = true
-        method.invoke(
-            activity,
-            R.string.block_notification_title,
-            R.string.block_notification,
-            mock(Runnable::class.java),
-            arrayOf("")
-        )
-    }
-
     @Test
     @Throws(Exception::class)
     fun testOnNextButtonClicked() {