From 87e3f93a617387e826dc7fd01bb99ae333a67fab Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 9 Sep 2024 12:00:43 +1000
Subject: [PATCH] SES-2675 - Standardisingdenied mic permission

---
 .../MissingMicrophonePermissionDialog.kt      | 22 ++++++-------------
 .../conversation/v2/ConversationActivityV2.kt |  1 -
 .../main/res/drawable/ic_baseline_mic_48.xml  |  5 -----
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_baseline_mic_48.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MissingMicrophonePermissionDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/MissingMicrophonePermissionDialog.kt
index 7f0c1e61e4..eb7280f628 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MissingMicrophonePermissionDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MissingMicrophonePermissionDialog.kt
@@ -6,24 +6,16 @@ import android.net.Uri
 import com.squareup.phrase.Phrase
 import network.loki.messenger.R
 import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
+import org.thoughtcrime.securesms.permissions.SettingsDialog
 
 class MissingMicrophonePermissionDialog {
     companion object {
         @JvmStatic
-        fun show(context: Context) = context.showSessionDialog {
-            title(R.string.permissionsMicrophone)
-            text(
-                Phrase.from(context, R.string.permissionsMicrophoneAccessRequired)
-                    .put(APP_NAME_KEY, context.getString(R.string.app_name))
-                    .format().toString())
-            button(R.string.sessionSettings, R.string.AccessibilityId_sessionSettings) {
-                val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                val uri = Uri.fromParts("package", context.packageName, null)
-                intent.setData(uri)
-                context.startActivity(intent)
-            }
-            cancelButton()
-        }
+        fun show(context: Context) = SettingsDialog.show(
+            context,
+            Phrase.from(context, R.string.permissionsMicrophoneAccessRequired)
+                .put(APP_NAME_KEY, context.getString(R.string.app_name))
+                .format().toString()
+        )
     }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index b903583f12..e687a48752 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1936,7 +1936,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         } else {
             Permissions.with(this)
                 .request(Manifest.permission.RECORD_AUDIO)
-                .withRationaleDialog(getString(R.string.permissionsMicrophoneAccessRequired), R.drawable.ic_baseline_mic_48)
                 .withPermanentDenialDialog(Phrase.from(applicationContext, R.string.permissionsMicrophoneAccessRequired)
                     .put(APP_NAME_KEY, getString(R.string.app_name))
                     .format().toString())
diff --git a/app/src/main/res/drawable/ic_baseline_mic_48.xml b/app/src/main/res/drawable/ic_baseline_mic_48.xml
deleted file mode 100644
index 2ac4dd40a0..0000000000
--- a/app/src/main/res/drawable/ic_baseline_mic_48.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
-</vector>