From 03aa19aae4df53e3dbf935fbc671310193ec3766 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 29 May 2023 18:02:20 +0930
Subject: [PATCH 01/19] .

---
 .../securesms/SessionDialogBuilder.kt         | 86 +++++++++++++++++++
 .../conversation/v2/ConversationActivityV2.kt | 49 +++++------
 app/src/main/res/values/styles.xml            |  2 +
 3 files changed, 113 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
new file mode 100644
index 0000000000..71b48c6bb6
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -0,0 +1,86 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.LinearLayout.VERTICAL
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.setMargins
+import androidx.core.view.updateMargins
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.util.toPx
+
+class SessionDialogBuilder(val context: Context) {
+
+    private val dialog: AlertDialog = AlertDialog.Builder(context).create()
+
+    private val root = LinearLayout(context).apply { orientation = VERTICAL }
+        .also(dialog::setView)
+
+    fun title(@StringRes id: Int) {
+        TextView(context, null, 0, R.style.TextAppearance_AppCompat_Title)
+            .apply { textAlignment = View.TEXT_ALIGNMENT_CENTER }
+            .apply { setText(id) }
+            .apply { layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+                .apply { setMargins(toPx(20, resources)) }
+            }.let(root::addView)
+    }
+
+    fun text(@StringRes id: Int, style: Int = 0) {
+        TextView(context, null, 0, style)
+            .apply { textAlignment = View.TEXT_ALIGNMENT_CENTER }
+            .apply { setText(id) }
+            .apply { layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+                .apply { toPx(40, resources).let { updateMargins(it, 0, it, 0) } }
+            }.let(root::addView)
+    }
+
+    fun buttons(build: ButtonsBuilder.() -> Unit) {
+        ButtonsBuilder(context, dialog).build(build).let(root::addView)
+    }
+
+    fun show(): AlertDialog = dialog.apply { show() }
+}
+
+class ButtonsBuilder(val context: Context, val dialog: AlertDialog) {
+    val root = LinearLayout(context)
+
+    fun destructiveButton(@StringRes text: Int, @StringRes contentDescription: Int, listener: () -> Unit = {}) {
+        button(text, contentDescription, R.style.Widget_Session_Button_Dialog_DestructiveText, listener)
+    }
+
+    fun cancelButton() = button(android.R.string.cancel)
+
+    fun button(
+        @StringRes text: Int,
+        @StringRes contentDescriptionRes: Int = 0,
+        @StyleRes style: Int = R.style.Widget_Session_Button_Dialog_UnimportantText,
+        listener: (() -> Unit) = {}) {
+        Button(context, null, 0, style)
+            .apply { setText(text) }
+            .apply { setOnClickListener {
+                listener.invoke()
+                dialog.dismiss()
+                contentDescription = resources.getString(contentDescriptionRes)
+            } }
+            .apply {
+                layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
+                    .apply { setMargins(toPx(20, resources)) }
+            }
+            .let(root::addView)
+    }
+
+    internal fun build(build: ButtonsBuilder.() -> Unit): LinearLayout {
+        build()
+        return root
+    }
+}
+
+fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
+    SessionDialogBuilder(this).apply { build() }.show()
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 f9385d14bc..0ad0542eaf 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
@@ -21,7 +21,6 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -113,6 +112,7 @@ import org.thoughtcrime.securesms.mms.*
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.reactions.ReactionsDialogFragment
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiDialogFragment
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -962,21 +962,20 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun block(deleteThread: Boolean) {
-        val title = R.string.RecipientPreferenceActivity_block_this_contact_question
-        val message = R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact
-        val dialog = AlertDialog.Builder(this)
-            .setTitle(title)
-            .setMessage(message)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.RecipientPreferenceActivity_block) { _, _ ->
-                viewModel.block()
-                if (deleteThread) {
-                    viewModel.deleteThread()
-                    finish()
+        sessionDialog {
+            title(R.string.RecipientPreferenceActivity_block_this_contact_question)
+            text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
+            buttons {
+                destructiveButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
+                    viewModel.block()
+                    if (deleteThread) {
+                        viewModel.deleteThread()
+                        finish()
+                    }
                 }
-            }.show()
-        val button = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
-        button.setContentDescription("Confirm block")
+                cancelButton()
+            }
+        }
     }
 
     override fun copySessionID(sessionId: String) {
@@ -1016,15 +1015,17 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun unblock() {
-        val title = R.string.ConversationActivity_unblock_this_contact_question
-        val message = R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact
-        AlertDialog.Builder(this)
-            .setTitle(title)
-            .setMessage(message)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.ConversationActivity_unblock) { _, _ ->
-                viewModel.unblock()
-            }.show()
+        sessionDialog {
+            title(R.string.ConversationActivity_unblock_this_contact_question)
+            text(R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
+            buttons {
+                destructiveButton(
+                    R.string.ConversationActivity_unblock,
+                    R.string.AccessibilityId_block_confirm
+                ) { viewModel.unblock() }
+                cancelButton()
+            }
+        }
     }
 
     // `position` is the adapter position; not the visual position
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8c79423d55..5da603275b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -71,6 +71,7 @@
 
     <!--  TODO These button styles require proper background selectors for up/down visual state.  -->
     <style name="Widget.Session.Button.Common" parent="">
+        <item name="android:gravity">center</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/medium_font_size</item>
         <item name="android:fontFamily">sans-serif-medium</item>
@@ -117,6 +118,7 @@
     </style>
 
     <style name="Widget.Session.Button.Dialog" parent="">
+        <item name="android:gravity">center</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:textColor">?android:textColorPrimary</item>

From 1b88d4f95099bbb73b10faa0b6b2c605902f511b Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Tue, 30 May 2023 16:49:01 +0930
Subject: [PATCH 02/19] Utilise dialog dsl

---
 .../preferences/ChangeUiModeDialog.kt         | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt
deleted file mode 100644
index 3d5b9e2e99..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.thoughtcrime.securesms.preferences
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-
-class ChangeUiModeDialog : DialogFragment() {
-
-    companion object {
-        const val TAG = "ChangeUiModeDialog"
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val context = requireContext()
-        return android.app.AlertDialog.Builder(context)
-            .setTitle("TODO: remove this")
-            .show()
-    }
-}
\ No newline at end of file

From 4ee68cbbb1652980dd986add29895c18f0ca959e Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Tue, 30 May 2023 16:49:07 +0930
Subject: [PATCH 03/19] Utilise dialog dsl

---
 .../securesms/MediaOverviewActivity.java      |   8 +-
 .../securesms/MediaPreviewActivity.java       |   4 +-
 .../securesms/SessionDialogBuilder.kt         | 116 +++++++++---
 .../conversation/v2/ConversationActivityV2.kt | 115 +++++-------
 .../conversation/v2/ConversationAdapter.kt    |  21 +--
 .../v2/menus/ConversationMenuHelper.kt        |  75 ++++----
 .../v2/utilities/NotificationUtils.kt         |  21 +--
 .../securesms/home/HomeActivity.kt            | 168 ++++++++++--------
 .../MessageRequestsActivity.kt                |  67 +++----
 .../securesms/onboarding/PNModeActivity.kt    |  12 +-
 .../preferences/BlockedContactsActivity.kt    |  18 +-
 .../preferences/ListPreferenceDialog.kt       |  41 ++---
 .../securesms/preferences/SettingsActivity.kt |  23 ++-
 .../securesms/util/SaveAttachmentTask.kt      |  20 ++-
 14 files changed, 375 insertions(+), 334 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
index b36fdb3ca1..e8af4e5a8e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -76,6 +76,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
+import kotlin.Unit;
 import network.loki.messenger.R;
 
 /**
@@ -318,9 +319,9 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     @SuppressWarnings("CodeBlock2Expr")
     @SuppressLint({"InlinedApi", "StaticFieldLeak"})
     private void handleSaveMedia(@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords) {
-      final Context context = getContext();
+      final Context context = requireContext();
 
-      SaveAttachmentTask.showWarningDialog(context, (dialogInterface, which) -> {
+      SaveAttachmentTask.showWarningDialog(context, mediaRecords.size(), () -> {
         Permissions.with(this)
                 .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 .maxSdkVersion(Build.VERSION_CODES.P)
@@ -362,7 +363,8 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
                   }.execute();
                 })
                 .execute();
-      }, mediaRecords.size());
+        return Unit.INSTANCE;
+      });
     }
 
     private void sendMediaSavedNotificationIfNeeded() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 6544c2ab89..a370478aeb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -85,6 +85,7 @@ import java.io.IOException;
 import java.util.Locale;
 import java.util.WeakHashMap;
 
+import kotlin.Unit;
 import network.loki.messenger.R;
 
 /**
@@ -416,7 +417,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
     MediaItem mediaItem = getCurrentMediaItem();
     if (mediaItem == null) return;
 
-    SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
+    SaveAttachmentTask.showWarningDialog(this, () -> {
       Permissions.with(this)
               .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
               .maxSdkVersion(Build.VERSION_CODES.P)
@@ -433,6 +434,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
                 }
               })
               .execute();
+      return Unit.INSTANCE;
     });
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 71b48c6bb6..c9e752229f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -8,70 +8,128 @@ import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.LinearLayout.VERTICAL
 import android.widget.TextView
+import androidx.annotation.AttrRes
+import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.setMargins
+import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
+import java.lang.ref.Reference
 
+
+@DslMarker
+@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
+annotation class DialogDsl
+
+@DialogDsl
 class SessionDialogBuilder(val context: Context) {
 
-    private val dialog: AlertDialog = AlertDialog.Builder(context).create()
+    private val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(context)
+
+    private var dialog: AlertDialog? = null
+    private fun dismiss() = dialog?.dismiss()
+
+    private val topView = LinearLayout(context).apply { orientation = VERTICAL }
+        .also(dialogBuilder::setCustomTitle)
 
     private val root = LinearLayout(context).apply { orientation = VERTICAL }
-        .also(dialog::setView)
+        .also(dialogBuilder::setView)
 
-    fun title(@StringRes id: Int) {
-        TextView(context, null, 0, R.style.TextAppearance_AppCompat_Title)
-            .apply { textAlignment = View.TEXT_ALIGNMENT_CENTER }
-            .apply { setText(id) }
-            .apply { layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
-                .apply { setMargins(toPx(20, resources)) }
-            }.let(root::addView)
+    fun title(@StringRes id: Int) = title(context.getString(id))
+
+    fun title(text: CharSequence?) = title(text?.toString())
+    fun title(text: String?) {
+        text(text, R.style.TextAppearance_AppCompat_Title) { setPadding(toPx(20, resources)) }
     }
 
-    fun text(@StringRes id: Int, style: Int = 0) {
-        TextView(context, null, 0, style)
-            .apply { textAlignment = View.TEXT_ALIGNMENT_CENTER }
-            .apply { setText(id) }
-            .apply { layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
+    fun text(@StringRes id: Int, style: Int = 0) = text(context.getString(id), style)
+    fun text(text: CharSequence?) = text(text?.toString())
+    fun text(text: String?, @StyleRes style: Int = 0) {
+        text(text, style) {
+            layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
                 .apply { toPx(40, resources).let { updateMargins(it, 0, it, 0) } }
-            }.let(root::addView)
+        }
     }
 
-    fun buttons(build: ButtonsBuilder.() -> Unit) {
-        ButtonsBuilder(context, dialog).build(build).let(root::addView)
+    private fun text(text: String?, @StyleRes style: Int, modify: TextView.() -> Unit) {
+        text ?: return
+        TextView(context, null, 0, style)
+            .apply {
+                setText(text)
+                textAlignment = View.TEXT_ALIGNMENT_CENTER
+                modify()
+            }.let(topView::addView)
     }
 
-    fun show(): AlertDialog = dialog.apply { show() }
+    fun view(view: View) {
+        dialogBuilder.setView(view)
+    }
+
+    fun view(@LayoutRes layout: Int) {
+        dialogBuilder.setView(layout)
+    }
+
+    fun setIconAttribute(@AttrRes icon: Int) {
+        dialogBuilder.setIconAttribute(icon)
+    }
+
+    fun singleChoiceItems(
+        options: Array<String>,
+        currentSelected: Int,
+        onSelect: (Int) -> Unit
+    ) {
+        dialogBuilder.setSingleChoiceItems(
+            options,
+            currentSelected
+        ) { dialog, it -> onSelect(it); dialog.dismiss() }
+    }
+
+    fun buttons(build: (@DialogDsl ButtonsBuilder).() -> Unit) {
+        ButtonsBuilder(context, ::dismiss).build(build).let(root::addView)
+    }
+
+    fun show(): AlertDialog = dialogBuilder.show()
 }
 
-class ButtonsBuilder(val context: Context, val dialog: AlertDialog) {
+@DialogDsl
+class ButtonsBuilder(val context: Context, val dismiss: () -> Unit) {
     val root = LinearLayout(context)
 
-    fun destructiveButton(@StringRes text: Int, @StringRes contentDescription: Int, listener: () -> Unit = {}) {
-        button(text, contentDescription, R.style.Widget_Session_Button_Dialog_DestructiveText, listener)
+    fun destructiveButton(
+        @StringRes text: Int,
+        @StringRes contentDescription: Int,
+        listener: () -> Unit = {}
+    ) {
+        button(
+            text,
+            contentDescription,
+            R.style.Widget_Session_Button_Dialog_DestructiveText,
+            listener
+        )
     }
 
-    fun cancelButton() = button(android.R.string.cancel)
+    fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel_button, listener = listener)
 
     fun button(
         @StringRes text: Int,
         @StringRes contentDescriptionRes: Int = 0,
         @StyleRes style: Int = R.style.Widget_Session_Button_Dialog_UnimportantText,
-        listener: (() -> Unit) = {}) {
+        listener: (() -> Unit) = {}
+    ) {
         Button(context, null, 0, style)
-            .apply { setText(text) }
-            .apply { setOnClickListener {
-                listener.invoke()
-                dialog.dismiss()
-                contentDescription = resources.getString(contentDescriptionRes)
-            } }
             .apply {
+                setText(text)
+                contentDescription = resources.getString(contentDescriptionRes)
                 layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
                     .apply { setMargins(toPx(20, resources)) }
+                setOnClickListener {
+                    listener.invoke()
+                    dismiss()
+                }
             }
             .let(root::addView)
     }
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 0ad0542eaf..1db4f98f78 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
@@ -1461,23 +1461,24 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     private fun showGIFPicker() {
         val hasSeenGIFMetaDataWarning: Boolean = textSecurePreferences.hasSeenGIFMetaDataWarning()
         if (!hasSeenGIFMetaDataWarning) {
-            val builder = AlertDialog.Builder(this)
-            builder.setTitle(R.string.giphy_permission_title)
-            builder.setMessage(R.string.giphy_permission_message)
-            builder.setPositiveButton(R.string.continue_2) { dialog: DialogInterface, _: Int ->
-                textSecurePreferences.setHasSeenGIFMetaDataWarning()
-                AttachmentManager.selectGif(this, PICK_GIF)
-                dialog.dismiss()
+            sessionDialog {
+                title(R.string.giphy_permission_title)
+                text(R.string.giphy_permission_message)
+                buttons {
+                    button(R.string.continue_2) {
+                        textSecurePreferences.setHasSeenGIFMetaDataWarning()
+                        selectGif()
+                    }
+                    cancelButton()
+                }
             }
-            builder.setNegativeButton(R.string.cancel) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-            }
-            builder.create().show()
         } else {
-            AttachmentManager.selectGif(this, PICK_GIF)
+            selectGif()
         }
     }
 
+    private fun selectGif() = AttachmentManager.selectGif(this, PICK_GIF)
+
     private fun showDocumentPicker() {
         AttachmentManager.selectDocument(this, PICK_DOCUMENT)
     }
@@ -1624,35 +1625,25 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         val allHasHash = messages.all { lokiMessageDb.getMessageServerHash(it.id) != null }
         if (recipient.isOpenGroupRecipient) {
             val messageCount = 1
-            val builder = AlertDialog.Builder(this)
-            builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
-            builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
-            builder.setCancelable(true)
-            builder.setPositiveButton(R.string.delete) { _, _ ->
-                for (message in messages) {
-                    viewModel.deleteForEveryone(message)
+
+            sessionDialog {
+                title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
+                text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
+                buttons {
+                    button(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
+                    cancelButton { endActionMode() }
                 }
-                endActionMode()
             }
-            builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
-                dialog.dismiss()
-                endActionMode()
-            }
-            builder.show()
         } else if (allSentByCurrentUser && allHasHash) {
             val bottomSheet = DeleteOptionsBottomSheet()
             bottomSheet.recipient = recipient
             bottomSheet.onDeleteForMeTapped = {
-                for (message in messages) {
-                    viewModel.deleteLocally(message)
-                }
+                messages.forEach(viewModel::deleteLocally)
                 bottomSheet.dismiss()
                 endActionMode()
             }
             bottomSheet.onDeleteForEveryoneTapped = {
-                for (message in messages) {
-                    viewModel.deleteForEveryone(message)
-                }
+                messages.forEach(viewModel::deleteForEveryone)
                 bottomSheet.dismiss()
                 endActionMode()
             }
@@ -1663,54 +1654,38 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             bottomSheet.show(supportFragmentManager, bottomSheet.tag)
         } else {
             val messageCount = 1
-            val builder = AlertDialog.Builder(this)
-            builder.setTitle(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
-            builder.setMessage(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
-            builder.setCancelable(true)
-            builder.setPositiveButton(R.string.delete) { _, _ ->
-                for (message in messages) {
-                    viewModel.deleteLocally(message)
+
+            sessionDialog {
+                title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
+                text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
+                buttons {
+                    button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
+                    cancelButton(::endActionMode)
                 }
-                endActionMode()
             }
-            builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
-                dialog.dismiss()
-                endActionMode()
-            }
-            builder.show()
         }
     }
 
     override fun banUser(messages: Set<MessageRecord>) {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.ConversationFragment_ban_selected_user)
-        builder.setMessage("This will ban the selected user from this room. It won't ban them from other rooms.")
-        builder.setCancelable(true)
-        builder.setPositiveButton(R.string.ban) { _, _ ->
-            viewModel.banUser(messages.first().individualRecipient)
-            endActionMode()
+        sessionDialog {
+            title(R.string.ConversationFragment_ban_selected_user)
+            text("This will ban the selected user from this room. It won't ban them from other rooms.")
+            buttons {
+                button(R.string.ban) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
+                cancelButton(::endActionMode)
+            }
         }
-        builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-            endActionMode()
-        }
-        builder.show()
     }
 
     override fun banAndDeleteAll(messages: Set<MessageRecord>) {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.ConversationFragment_ban_selected_user)
-        builder.setMessage("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there.")
-        builder.setCancelable(true)
-        builder.setPositiveButton(R.string.ban) { _, _ ->
-            viewModel.banAndDeleteAll(messages.first().individualRecipient)
-            endActionMode()
+        sessionDialog {
+            title(R.string.ConversationFragment_ban_selected_user)
+            text("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there.")
+            buttons {
+                button(R.string.ban) { viewModel.banAndDeleteAll(messages.first().individualRecipient); endActionMode() }
+                cancelButton(::endActionMode)
+            }
         }
-        builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->
-            dialog.dismiss()
-            endActionMode()
-        }
-        builder.show()
     }
 
     override fun copyMessages(messages: Set<MessageRecord>) {
@@ -1774,7 +1749,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     override fun saveAttachment(messages: Set<MessageRecord>) {
         val message = messages.first() as MmsMessageRecord
-        SaveAttachmentTask.showWarningDialog(this, { _, _ ->
+        SaveAttachmentTask.showWarningDialog(this) {
             Permissions.with(this)
                 .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 .maxSdkVersion(Build.VERSION_CODES.P)
@@ -1802,7 +1777,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                         Toast.LENGTH_LONG).show()
                 }
                 .execute()
-        })
+        }
     }
 
     override fun reply(messages: Set<MessageRecord>) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 85d3c8e6de..69c54003b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
+import org.thoughtcrime.securesms.sessionDialog
 
 class ConversationAdapter(
     context: Context,
@@ -146,17 +147,17 @@ class ConversationAdapter(
                 viewHolder.view.bind(message, messageBefore)
                 if (message.isCallLog && message.isFirstMissedCall) {
                     viewHolder.view.setOnClickListener {
-                        AlertDialog.Builder(context)
-                            .setTitle(R.string.CallNotificationBuilder_first_call_title)
-                            .setMessage(R.string.CallNotificationBuilder_first_call_message)
-                            .setPositiveButton(R.string.activity_settings_title) { _, _ ->
-                                val intent = Intent(context, PrivacySettingsActivity::class.java)
-                                context.startActivity(intent)
+                        context.sessionDialog {
+                            title(R.string.CallNotificationBuilder_first_call_title)
+                            text(R.string.CallNotificationBuilder_first_call_message)
+                            buttons {
+                                button(R.string.activity_settings_title) {
+                                    Intent(context, PrivacySettingsActivity::class.java)
+                                        .let(context::startActivity)
+                                }
+                                cancelButton()
                             }
-                            .setNeutralButton(R.string.cancel) { d, _ ->
-                                d.dismiss()
-                            }
-                            .show()
+                        }
                     }
                 } else {
                     viewHolder.view.setOnClickListener(null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index ce29efa3a0..22fb12e163 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -45,6 +45,7 @@ import org.thoughtcrime.securesms.groups.EditClosedGroupActivity
 import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.groupIDKey
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.service.WebRtcCallService
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.BitmapUtil
 import java.io.IOException
 
@@ -186,29 +187,25 @@ object ConversationMenuHelper {
     private fun call(context: Context, thread: Recipient) {
 
         if (!TextSecurePreferences.isCallNotificationsEnabled(context)) {
-            val dialog = AlertDialog.Builder(context)
-                .setTitle(R.string.ConversationActivity_call_title)
-                .setMessage(R.string.ConversationActivity_call_prompt)
-                .setPositiveButton(R.string.activity_settings_title) { _, _ ->
-                    val intent = Intent(context, PrivacySettingsActivity::class.java)
-                    context.startActivity(intent)
+            context.sessionDialog {
+                title(R.string.ConversationActivity_call_title)
+                text(R.string.ConversationActivity_call_prompt)
+                buttons {
+                    button(R.string.activity_settings_title, R.string.AccessibilityId_settings) {
+                        Intent(context, PrivacySettingsActivity::class.java).let(context::startActivity)
+                    }
+                    cancelButton()
                 }
-                .setNeutralButton(R.string.cancel) { d, _ ->
-                    d.dismiss()
-                }.create()
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE)?.contentDescription = context.getString(R.string.AccessibilityId_settings)
-            dialog.getButton(DialogInterface.BUTTON_NEGATIVE)?.contentDescription = context.getString(R.string.AccessibilityId_cancel_button)
-            dialog.show()
+            }
             return
         }
 
-        val service = WebRtcCallService.createCall(context, thread)
-        context.startService(service)
+        WebRtcCallService.createCall(context, thread)
+            .let(context::startService)
 
-        val activity = Intent(context, WebRtcCallActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
-        context.startActivity(activity)
+        Intent(context, WebRtcCallActivity::class.java)
+            .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
+            .let(context::startActivity)
 
     }
 
@@ -295,9 +292,7 @@ object ConversationMenuHelper {
 
     private fun leaveClosedGroup(context: Context, thread: Recipient) {
         if (!thread.isClosedGroupRecipient) { return }
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(context.resources.getString(R.string.ConversationActivity_leave_group))
-        builder.setCancelable(true)
+
         val group = DatabaseComponent.get(context).groupDatabase().getGroup(thread.address.toGroupString()).orNull()
         val admins = group.admins
         val sessionID = TextSecurePreferences.getLocalNumber(context)
@@ -307,29 +302,27 @@ object ConversationMenuHelper {
         } else {
             context.resources.getString(R.string.ConversationActivity_are_you_sure_you_want_to_leave_this_group)
         }
-        builder.setMessage(message)
-        builder.setPositiveButton(R.string.yes) { _, _ ->
-            var groupPublicKey: String?
-            var isClosedGroup: Boolean
-            try {
-                groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
-                isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase().isClosedGroup(groupPublicKey)
-            } catch (e: IOException) {
-                groupPublicKey = null
-                isClosedGroup = false
-            }
-            try {
-                if (isClosedGroup) {
-                    MessageSender.leave(groupPublicKey!!, true)
-                } else {
-                    Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
+
+        fun onLeaveFailed() = Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
+
+        context.sessionDialog {
+            title(R.string.ConversationActivity_leave_group)
+            text(message)
+            buttons {
+                button(R.string.yes) {
+                    try {
+                        val groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
+                        val isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase().isClosedGroup(groupPublicKey)
+
+                        if (isClosedGroup) MessageSender.leave(groupPublicKey, true)
+                        else onLeaveFailed()
+                    } catch (e: Exception) {
+                        onLeaveFailed()
+                    }
                 }
-            } catch (e: Exception) {
-                Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
+                button(R.string.no)
             }
         }
-        builder.setNegativeButton(R.string.no, null)
-        builder.show()
     }
 
     private fun inviteContacts(context: Context, thread: Recipient) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
index dbbcfb51ef..0a6f839405 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
@@ -1,21 +1,18 @@
 package org.thoughtcrime.securesms.conversation.v2.utilities
 
 import android.content.Context
-import androidx.appcompat.app.AlertDialog
 import network.loki.messenger.R
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.sessionDialog
 
 object NotificationUtils {
     fun showNotifyDialog(context: Context, thread: Recipient, notifyTypeHandler: (Int)->Unit) {
-        val notifyTypes = context.resources.getStringArray(R.array.notify_types)
-        val currentSelected = thread.notifyType
-
-        AlertDialog.Builder(context)
-            .setSingleChoiceItems(notifyTypes,currentSelected) { d, newSelection ->
-                notifyTypeHandler(newSelection)
-                d.dismiss()
-            }
-            .setTitle(R.string.RecipientPreferenceActivity_notification_settings)
-            .show()
+        context.sessionDialog {
+            title(R.string.RecipientPreferenceActivity_notification_settings)
+            singleChoiceItems(
+                context.resources.getStringArray(R.array.notify_types),
+                thread.notifyType
+            ) { notifyTypeHandler(it) }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 9b1e01a54a..1964756a3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -63,6 +63,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.onboarding.SeedActivity
 import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.preferences.SettingsActivity
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.IP2Country
@@ -488,46 +489,43 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun blockConversation(thread: ThreadRecord) {
-        AlertDialog.Builder(this)
-                .setTitle(R.string.RecipientPreferenceActivity_block_this_contact_question)
-                .setMessage(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(R.string.RecipientPreferenceActivity_block) { dialog, _ ->
+        sessionDialog {
+            title(R.string.RecipientPreferenceActivity_block_this_contact_question)
+            text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
+            buttons {
+                button(R.string.RecipientPreferenceActivity_block) {
                     lifecycleScope.launch(Dispatchers.IO) {
                         recipientDatabase.setBlocked(thread.recipient, true)
                         withContext(Dispatchers.Main) {
-                            binding.recyclerView.adapter!!.notifyDataSetChanged()
-                            dialog.dismiss()
+                            binding.recyclerView.adapter?.notifyDataSetChanged()
                         }
                     }
-                }.show()
+                }
+                cancelButton()
+            }
+        }
     }
 
     private fun unblockConversation(thread: ThreadRecord) {
-        AlertDialog.Builder(this)
-                .setTitle(R.string.RecipientPreferenceActivity_unblock_this_contact_question)
-                .setMessage(R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(R.string.RecipientPreferenceActivity_unblock) { dialog, _ ->
+        sessionDialog {
+            title(R.string.RecipientPreferenceActivity_unblock_this_contact_question)
+            text(R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
+            buttons {
+                button(R.string.RecipientPreferenceActivity_unblock) {
                     lifecycleScope.launch(Dispatchers.IO) {
                         recipientDatabase.setBlocked(thread.recipient, false)
                         withContext(Dispatchers.Main) {
-                            binding.recyclerView.adapter!!.notifyDataSetChanged()
-                            dialog.dismiss()
+                            binding.recyclerView.adapter?.notifyDataSetChanged()
                         }
                     }
-                }.show()
+                }
+                cancelButton()
+            }
+        }
     }
 
     private fun setConversationMuted(thread: ThreadRecord, isMuted: Boolean) {
-        if (!isMuted) {
-            lifecycleScope.launch(Dispatchers.IO) {
-                recipientDatabase.setMuted(thread.recipient, 0)
-                withContext(Dispatchers.Main) {
-                    binding.recyclerView.adapter!!.notifyDataSetChanged()
-                }
-            }
-        } else {
+        if (isMuted) {
             MuteDialog.show(this) { until: Long ->
                 lifecycleScope.launch(Dispatchers.IO) {
                     recipientDatabase.setMuted(thread.recipient, until)
@@ -536,6 +534,13 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
                     }
                 }
             }
+        } else {
+            lifecycleScope.launch(Dispatchers.IO) {
+                recipientDatabase.setMuted(thread.recipient, 0)
+                withContext(Dispatchers.Main) {
+                    binding.recyclerView.adapter!!.notifyDataSetChanged()
+                }
+            }
         }
     }
 
@@ -574,48 +579,64 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         } else {
             resources.getString(R.string.activity_home_delete_conversation_dialog_message)
         }
-        val dialog = AlertDialog.Builder(this)
-        dialog.setMessage(message)
-        dialog.setPositiveButton(R.string.yes) { _, _ ->
-            lifecycleScope.launch(Dispatchers.Main) {
-                val context = this@HomeActivity as Context
-                // Cancel any outstanding jobs
-                DatabaseComponent.get(context).sessionJobDatabase().cancelPendingMessageSendJobs(threadID)
-                // Send a leave group message if this is an active closed group
-                if (recipient.address.isClosedGroup && DatabaseComponent.get(context).groupDatabase().isActive(recipient.address.toGroupString())) {
-                    var isClosedGroup: Boolean
-                    var groupPublicKey: String?
-                    try {
-                        groupPublicKey = GroupUtil.doubleDecodeGroupID(recipient.address.toString()).toHexString()
-                        isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase().isClosedGroup(groupPublicKey)
-                    } catch (e: IOException) {
-                        groupPublicKey = null
-                        isClosedGroup = false
-                    }
-                    if (isClosedGroup) {
-                        MessageSender.explicitLeave(groupPublicKey!!, false)
+
+        sessionDialog {
+            text(message)
+            buttons {
+                button(R.string.yes) {
+                    lifecycleScope.launch(Dispatchers.Main) {
+                        val context = this@HomeActivity as Context
+                        // Cancel any outstanding jobs
+                        DatabaseComponent.get(context).sessionJobDatabase()
+                            .cancelPendingMessageSendJobs(threadID)
+                        // Send a leave group message if this is an active closed group
+                        if (recipient.address.isClosedGroup && DatabaseComponent.get(context)
+                                .groupDatabase().isActive(recipient.address.toGroupString())
+                        ) {
+                            var isClosedGroup: Boolean
+                            var groupPublicKey: String?
+                            try {
+                                groupPublicKey =
+                                    GroupUtil.doubleDecodeGroupID(recipient.address.toString())
+                                        .toHexString()
+                                isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase()
+                                    .isClosedGroup(groupPublicKey)
+                            } catch (e: IOException) {
+                                groupPublicKey = null
+                                isClosedGroup = false
+                            }
+                            if (isClosedGroup) {
+                                MessageSender.explicitLeave(groupPublicKey!!, false)
+                            }
+                        }
+                        // Delete the conversation
+                        val v2OpenGroup =
+                            DatabaseComponent.get(this@HomeActivity).lokiThreadDatabase()
+                                .getOpenGroupChat(threadID)
+                        if (v2OpenGroup != null) {
+                            OpenGroupManager.delete(
+                                v2OpenGroup.server,
+                                v2OpenGroup.room,
+                                this@HomeActivity
+                            )
+                        } else {
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                threadDb.deleteConversation(threadID)
+                            }
+                        }
+                        // Update the badge count
+                        ApplicationContext.getInstance(context).messageNotifier.updateNotification(
+                            context
+                        )
+                        // Notify the user
+                        val toastMessage =
+                            if (recipient.isGroupRecipient) R.string.MessageRecord_left_group else R.string.activity_home_conversation_deleted_message
+                        Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show()
                     }
                 }
-                // Delete the conversation
-                val v2OpenGroup = DatabaseComponent.get(this@HomeActivity).lokiThreadDatabase().getOpenGroupChat(threadID)
-                if (v2OpenGroup != null) {
-                    OpenGroupManager.delete(v2OpenGroup.server, v2OpenGroup.room, this@HomeActivity)
-                } else {
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        threadDb.deleteConversation(threadID)
-                    }
-                }
-                // Update the badge count
-                ApplicationContext.getInstance(context).messageNotifier.updateNotification(context)
-                // Notify the user
-                val toastMessage = if (recipient.isGroupRecipient) R.string.MessageRecord_left_group else R.string.activity_home_conversation_deleted_message
-                Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show()
+                button(R.string.no)
             }
         }
-        dialog.setNegativeButton(R.string.no) { _, _ ->
-            // Do nothing
-        }
-        dialog.create().show()
     }
 
     private fun openSettings() {
@@ -624,22 +645,21 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun showMessageRequests() {
-        val intent = Intent(this, MessageRequestsActivity::class.java)
-        push(intent)
+        Intent(this, MessageRequestsActivity::class.java).let(::push)
     }
 
     private fun hideMessageRequests() {
-        AlertDialog.Builder(this)
-            .setMessage("Hide message requests?")
-            .setPositiveButton(R.string.yes) { _, _ ->
-                textSecurePreferences.setHasHiddenMessageRequests()
-                setupMessageRequestsBanner()
-                homeViewModel.tryUpdateChannel()
+        sessionDialog {
+            text("Hide message requests?")
+            buttons {
+                button(R.string.yes) {
+                    textSecurePreferences.setHasHiddenMessageRequests()
+                    setupMessageRequestsBanner()
+                    homeViewModel.tryUpdateChannel()
+                }
+                button(R.string.no)
             }
-            .setNegativeButton(R.string.no) { _, _ ->
-                // Do nothing
-            }
-            .create().show()
+        }
     }
 
     private fun showNewConversation() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
index 50ed4628ea..2591cb4716 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.util.push
 import javax.inject.Inject
@@ -77,34 +78,38 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
     }
 
     override fun onBlockConversationClick(thread: ThreadRecord) {
-        val dialog = AlertDialog.Builder(this)
-        dialog.setTitle(R.string.RecipientPreferenceActivity_block_this_contact_question)
-            .setMessage(R.string.message_requests_block_message)
-            .setPositiveButton(R.string.recipient_preferences__block) { _, _ ->
-                viewModel.blockMessageRequest(thread)
-                LoaderManager.getInstance(this).restartLoader(0, null, this)
-            }
-            .setNegativeButton(R.string.no) { _, _ ->
-                // Do nothing
-            }
-        dialog.create().show()
+        fun doBlock() {
+            viewModel.blockMessageRequest(thread)
+            LoaderManager.getInstance(this).restartLoader(0, null, this)
+        }
+
+        sessionDialog {
+            title(R.string.RecipientPreferenceActivity_block_this_contact_question)
+                text(R.string.message_requests_block_message)
+                buttons {
+                    button(R.string.recipient_preferences__block) { doBlock() }
+                    button(R.string.no)
+                }
+        }
     }
 
     override fun onDeleteConversationClick(thread: ThreadRecord) {
-        val dialog = AlertDialog.Builder(this)
-        dialog.setTitle(R.string.decline)
-            .setMessage(resources.getString(R.string.message_requests_decline_message))
-            .setPositiveButton(R.string.decline) { _,_ ->
-                viewModel.deleteMessageRequest(thread)
-                LoaderManager.getInstance(this).restartLoader(0, null, this)
-                lifecycleScope.launch(Dispatchers.IO) {
-                    ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@MessageRequestsActivity)
-                }
+        fun doDecline() {
+            viewModel.deleteMessageRequest(thread)
+            LoaderManager.getInstance(this).restartLoader(0, null, this)
+            lifecycleScope.launch(Dispatchers.IO) {
+                ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@MessageRequestsActivity)
             }
-            .setNegativeButton(R.string.no) { _, _ ->
-                // Do nothing
+        }
+
+        sessionDialog {
+            title(R.string.decline)
+            text(resources.getString(R.string.message_requests_decline_message))
+            buttons {
+                button(R.string.decline) { doDecline() }
+                button(R.string.no)
             }
-        dialog.create().show()
+        }
     }
 
     private fun updateEmptyState() {
@@ -114,18 +119,20 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
     }
 
     private fun deleteAllAndBlock() {
-        val dialog = AlertDialog.Builder(this)
-        dialog.setMessage(resources.getString(R.string.message_requests_clear_all_message))
-        dialog.setPositiveButton(R.string.yes) { _, _ ->
+        fun doDeleteAllAndBlock() {
             viewModel.clearAllMessageRequests()
             LoaderManager.getInstance(this).restartLoader(0, null, this)
             lifecycleScope.launch(Dispatchers.IO) {
                 ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@MessageRequestsActivity)
             }
         }
-        dialog.setNegativeButton(R.string.no) { _, _ ->
-            // Do nothing
+
+        sessionDialog {
+            text(resources.getString(R.string.message_requests_clear_all_message))
+            buttons {
+                button(R.string.yes) { doDeleteAllAndBlock() }
+                button(R.string.no)
+            }
         }
-        dialog.create().show()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
index 9cf9c3d049..eb0f4719b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
@@ -20,6 +20,7 @@ import org.session.libsession.utilities.ThemeUtil
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.home.HomeActivity
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.GlowViewUtilities
 import org.thoughtcrime.securesms.util.PNModeView
 import org.thoughtcrime.securesms.util.disableClipping
@@ -151,12 +152,15 @@ class PNModeActivity : BaseActionBarActivity() {
 
     private fun register() {
         if (selectedOptionView == null) {
-            val dialog = AlertDialog.Builder(this)
-            dialog.setTitle(R.string.activity_pn_mode_no_option_picked_dialog_title)
-            dialog.setPositiveButton(R.string.ok) { _, _ -> }
-            dialog.create().show()
+            sessionDialog {
+                title(R.string.activity_pn_mode_no_option_picked_dialog_title)
+                buttons {
+                    button(R.string.ok)
+                }
+            }
             return
         }
+
         TextSecurePreferences.setIsUsingFCM(this, (selectedOptionView == binding.fcmOptionView))
         val application = ApplicationContext.getInstance(this)
         application.startPollingIfNeeded()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
index 504194d3a4..3c62ccd709 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
@@ -9,6 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ActivityBlockedContactsBinding
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.sessionDialog
 
 @AndroidEntryPoint
 class BlockedContactsActivity: PassphraseRequiredActionBarActivity(), View.OnClickListener {
@@ -51,17 +52,14 @@ class BlockedContactsActivity: PassphraseRequiredActionBarActivity(), View.OnCli
                 getString(R.string.Unblock_dialog__message, stringBuilder.toString())
             }
 
-            AlertDialog.Builder(this)
-                .setTitle(title)
-                .setMessage(message)
-                .setPositiveButton(R.string.continue_2) { d, _ ->
-                    viewModel.unblock(contactsToUnblock)
-                    d.dismiss()
+            sessionDialog {
+                title(title)
+                text(message)
+                buttons {
+                    button(R.string.continue_2) { viewModel.unblock(contactsToUnblock) }
+                    cancelButton()
                 }
-                .setNegativeButton(R.string.cancel) { d, _ ->
-                    d.dismiss()
-                }
-                .show()
+            }
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
index 2ba48f6e41..f49cfc39d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
@@ -1,41 +1,24 @@
 package org.thoughtcrime.securesms.preferences
 
 import android.content.Context
-import android.view.LayoutInflater
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.ListPreference
-import network.loki.messenger.databinding.DialogListPreferenceBinding
+import org.thoughtcrime.securesms.sessionDialog
 
 fun listPreferenceDialog(
     context: Context,
     listPreference: ListPreference,
-    dialogListener: () -> Unit
-) : AlertDialog {
+    onChange: () -> Unit
+) : AlertDialog = listPreference.run {
+    context.sessionDialog {
+        val index = entryValues.indexOf(value)
+        val options = entries.map(CharSequence::toString).toTypedArray()
 
-    val builder = AlertDialog.Builder(context)
-
-    val binding = DialogListPreferenceBinding.inflate(LayoutInflater.from(context))
-    binding.titleTextView.text = listPreference.dialogTitle
-    binding.messageTextView.text = listPreference.dialogMessage
-
-    builder.setView(binding.root)
-
-    val dialog = builder.show()
-
-    val valueIndex = listPreference.findIndexOfValue(listPreference.value)
-    RadioOptionAdapter(valueIndex) {
-        listPreference.value = it.value
-        dialog.dismiss()
-        dialogListener()
-    }
-        .apply {
-            listPreference.entryValues.zip(listPreference.entries) { value, title ->
-                RadioOption(value.toString(), title.toString())
-            }.let(this::submitList)
+        title(dialogTitle)
+        text(dialogMessage)
+        singleChoiceItems(options, index) {
+            listPreference.setValueIndex(it)
+            onChange()
         }
-        .let { binding.recyclerView.adapter = it }
-
-    binding.closeButton.setOnClickListener { dialog.dismiss() }
-
-    return dialog
+    }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 6b6497982d..93a1af4595 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity
 import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.BitmapDecodingException
 import org.thoughtcrime.securesms.util.BitmapUtil
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
@@ -260,21 +261,19 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     }
 
     private fun showEditProfilePictureUI() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.activity_settings_set_display_picture)
-            .setView(R.layout.dialog_change_avatar)
-            .setPositiveButton(R.string.activity_settings_upload) { _, _ ->
-                startAvatarSelection()
-            }
-            .setNegativeButton(R.string.cancel) { _, _ -> }
-            .apply {
+        sessionDialog {
+            title(R.string.activity_settings_set_display_picture)
+            view(R.layout.dialog_change_avatar)
+            buttons {
+                button(R.string.activity_settings_upload) { startAvatarSelection() }
                 if (TextSecurePreferences.getProfileAvatarId(context) != 0) {
-                    setNeutralButton(R.string.activity_settings_remove) { _, _ -> removeAvatar() }
+                    button(R.string.activity_settings_remove) { removeAvatar() }
                 }
+                cancelButton()
             }
-            .show().apply {
-                findViewById<ProfilePictureView>(R.id.profile_picture_view)?.let(::setupProfilePictureView)
-            }
+        }.apply {
+            findViewById<ProfilePictureView>(R.id.profile_picture_view)?.let(::setupProfilePictureView)
+        }
     }
 
     private fun removeAvatar() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
index 59658f12a0..e32488bbee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
@@ -18,6 +18,7 @@ import org.session.libsession.utilities.task.ProgressDialogAsyncTask
 import org.session.libsignal.utilities.ExternalStorageUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.sessionDialog
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -41,18 +42,19 @@ class SaveAttachmentTask : ProgressDialogAsyncTask<SaveAttachmentTask.Attachment
 
         @JvmStatic
         @JvmOverloads
-        fun showWarningDialog(context: Context, onAcceptListener: OnClickListener, count: Int = 1) {
-            val builder = AlertDialog.Builder(context)
-            builder.setTitle(R.string.ConversationFragment_save_to_sd_card)
-            builder.setIconAttribute(R.attr.dialog_alert_icon)
-            builder.setCancelable(true)
-            builder.setMessage(context.resources.getQuantityString(
+        fun showWarningDialog(context: Context, count: Int = 1, onAcceptListener: () -> Unit) {
+            context.sessionDialog {
+                title(R.string.ConversationFragment_save_to_sd_card)
+                setIconAttribute(R.attr.dialog_alert_icon)
+                text(context.resources.getQuantityString(
                     R.plurals.ConversationFragment_saving_n_media_to_storage_warning,
                     count,
                     count))
-            builder.setPositiveButton(R.string.yes, onAcceptListener)
-            builder.setNegativeButton(R.string.no, null)
-            builder.show()
+                buttons {
+                    button(R.string.yes) { onAcceptListener() }
+                    button(R.string.no)
+                }
+            }
         }
     }
 

From 1d8d67804709157600199df39c799b0daf39be89 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Tue, 30 May 2023 21:39:03 +0930
Subject: [PATCH 04/19] Make kotlin code use dialog dsl

---
 .../securesms/MediaPreviewActivity.java       |   2 +-
 .../securesms/SessionDialogBuilder.kt         |  82 ++++-------
 .../conversation/v2/ConversationActivityV2.kt |  60 +++-----
 .../conversation/v2/ConversationAdapter.kt    |  10 +-
 .../v2/menus/ConversationMenuHelper.kt        |  28 ++--
 .../conversation/v2/utilities/BaseDialog.kt   |   2 +-
 .../securesms/home/HomeActivity.kt            | 136 +++++++++---------
 .../MessageRequestsActivity.kt                |  18 +--
 .../securesms/onboarding/PNModeActivity.kt    |   4 +-
 .../preferences/BlockedContactsActivity.kt    |   6 +-
 .../securesms/preferences/SettingsActivity.kt |  10 +-
 .../securesms/util/SaveAttachmentTask.kt      |  27 ++--
 12 files changed, 160 insertions(+), 225 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index a370478aeb..e3cb839bc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -417,7 +417,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
     MediaItem mediaItem = getCurrentMediaItem();
     if (mediaItem == null) return;
 
-    SaveAttachmentTask.showWarningDialog(this, () -> {
+    SaveAttachmentTask.showWarningDialog(this, 1, () -> {
       Permissions.with(this)
               .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
               .maxSdkVersion(Build.VERSION_CODES.P)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index c9e752229f..195c45441d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms
 
 import android.content.Context
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
@@ -18,7 +19,6 @@ import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
-import java.lang.ref.Reference
 
 
 @DslMarker
@@ -35,9 +35,15 @@ class SessionDialogBuilder(val context: Context) {
 
     private val topView = LinearLayout(context).apply { orientation = VERTICAL }
         .also(dialogBuilder::setCustomTitle)
+    private val contentView = LinearLayout(context).apply { orientation = VERTICAL }
+    private val buttonLayout = LinearLayout(context)
 
     private val root = LinearLayout(context).apply { orientation = VERTICAL }
         .also(dialogBuilder::setView)
+        .apply {
+            addView(contentView)
+            addView(buttonLayout)
+        }
 
     fun title(@StringRes id: Int) = title(context.getString(id))
 
@@ -65,52 +71,31 @@ class SessionDialogBuilder(val context: Context) {
             }.let(topView::addView)
     }
 
-    fun view(view: View) {
-        dialogBuilder.setView(view)
-    }
+    fun view(view: View) = contentView.addView(view)
 
-    fun view(@LayoutRes layout: Int) {
-        dialogBuilder.setView(layout)
-    }
+    fun view(@LayoutRes layout: Int) = contentView.addView(LayoutInflater.from(context).inflate(layout, contentView))
 
-    fun setIconAttribute(@AttrRes icon: Int) {
-        dialogBuilder.setIconAttribute(icon)
-    }
+    fun iconAttribute(@AttrRes icon: Int): AlertDialog.Builder = dialogBuilder.setIconAttribute(icon)
 
     fun singleChoiceItems(
         options: Array<String>,
         currentSelected: Int,
         onSelect: (Int) -> Unit
-    ) {
-        dialogBuilder.setSingleChoiceItems(
-            options,
-            currentSelected
-        ) { dialog, it -> onSelect(it); dialog.dismiss() }
-    }
-
-    fun buttons(build: (@DialogDsl ButtonsBuilder).() -> Unit) {
-        ButtonsBuilder(context, ::dismiss).build(build).let(root::addView)
-    }
-
-    fun show(): AlertDialog = dialogBuilder.show()
-}
-
-@DialogDsl
-class ButtonsBuilder(val context: Context, val dismiss: () -> Unit) {
-    val root = LinearLayout(context)
+    ): AlertDialog.Builder = dialogBuilder.setSingleChoiceItems(
+        options,
+        currentSelected
+    ) { dialog, it -> onSelect(it); dialog.dismiss() }
 
     fun destructiveButton(
         @StringRes text: Int,
         @StringRes contentDescription: Int,
         listener: () -> Unit = {}
-    ) {
-        button(
-            text,
-            contentDescription,
-            R.style.Widget_Session_Button_Dialog_DestructiveText,
-            listener
-        )
-    }
+    ) = button(
+        text,
+        contentDescription,
+        R.style.Widget_Session_Button_Dialog_DestructiveText,
+        listener
+    )
 
     fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel_button, listener = listener)
 
@@ -119,25 +104,18 @@ class ButtonsBuilder(val context: Context, val dismiss: () -> Unit) {
         @StringRes contentDescriptionRes: Int = 0,
         @StyleRes style: Int = R.style.Widget_Session_Button_Dialog_UnimportantText,
         listener: (() -> Unit) = {}
-    ) {
-        Button(context, null, 0, style)
-            .apply {
-                setText(text)
-                contentDescription = resources.getString(contentDescriptionRes)
-                layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
-                    .apply { setMargins(toPx(20, resources)) }
-                setOnClickListener {
-                    listener.invoke()
-                    dismiss()
-                }
+    ) = Button(context, null, 0, style).apply {
+            setText(text)
+            contentDescription = resources.getString(contentDescriptionRes)
+            layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
+                .apply { setMargins(toPx(20, resources)) }
+            setOnClickListener {
+                listener.invoke()
+                dismiss()
             }
-            .let(root::addView)
-    }
+        }.let(buttonLayout::addView)
 
-    internal fun build(build: ButtonsBuilder.() -> Unit): LinearLayout {
-        build()
-        return root
-    }
+    fun show(): AlertDialog = dialogBuilder.show()
 }
 
 fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
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 1db4f98f78..1b126919a9 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
@@ -965,16 +965,14 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         sessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
-            buttons {
-                destructiveButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
-                    viewModel.block()
-                    if (deleteThread) {
-                        viewModel.deleteThread()
-                        finish()
-                    }
+            destructiveButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
+                viewModel.block()
+                if (deleteThread) {
+                    viewModel.deleteThread()
+                    finish()
                 }
-                cancelButton()
             }
+            cancelButton()
         }
     }
 
@@ -1018,13 +1016,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         sessionDialog {
             title(R.string.ConversationActivity_unblock_this_contact_question)
             text(R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
-            buttons {
-                destructiveButton(
-                    R.string.ConversationActivity_unblock,
-                    R.string.AccessibilityId_block_confirm
-                ) { viewModel.unblock() }
-                cancelButton()
-            }
+            destructiveButton(
+                R.string.ConversationActivity_unblock,
+                R.string.AccessibilityId_block_confirm
+            ) { viewModel.unblock() }
+            cancelButton()
         }
     }
 
@@ -1464,13 +1460,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             sessionDialog {
                 title(R.string.giphy_permission_title)
                 text(R.string.giphy_permission_message)
-                buttons {
-                    button(R.string.continue_2) {
-                        textSecurePreferences.setHasSeenGIFMetaDataWarning()
-                        selectGif()
-                    }
-                    cancelButton()
+                button(R.string.continue_2) {
+                    textSecurePreferences.setHasSeenGIFMetaDataWarning()
+                    selectGif()
                 }
+                cancelButton()
             }
         } else {
             selectGif()
@@ -1629,10 +1623,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             sessionDialog {
                 title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
                 text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
-                buttons {
-                    button(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
-                    cancelButton { endActionMode() }
-                }
+                button(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
+                cancelButton { endActionMode() }
             }
         } else if (allSentByCurrentUser && allHasHash) {
             val bottomSheet = DeleteOptionsBottomSheet()
@@ -1658,10 +1650,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             sessionDialog {
                 title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
                 text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
-                buttons {
-                    button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
-                    cancelButton(::endActionMode)
-                }
+                button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
+                cancelButton(::endActionMode)
             }
         }
     }
@@ -1670,10 +1660,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         sessionDialog {
             title(R.string.ConversationFragment_ban_selected_user)
             text("This will ban the selected user from this room. It won't ban them from other rooms.")
-            buttons {
-                button(R.string.ban) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
-                cancelButton(::endActionMode)
-            }
+            button(R.string.ban) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
+            cancelButton(::endActionMode)
         }
     }
 
@@ -1681,10 +1669,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         sessionDialog {
             title(R.string.ConversationFragment_ban_selected_user)
             text("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there.")
-            buttons {
-                button(R.string.ban) { viewModel.banAndDeleteAll(messages.first().individualRecipient); endActionMode() }
-                cancelButton(::endActionMode)
-            }
+            button(R.string.ban) { viewModel.banAndDeleteAll(messages.first().individualRecipient); endActionMode() }
+            cancelButton(::endActionMode)
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 69c54003b5..325b411290 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -150,13 +150,11 @@ class ConversationAdapter(
                         context.sessionDialog {
                             title(R.string.CallNotificationBuilder_first_call_title)
                             text(R.string.CallNotificationBuilder_first_call_message)
-                            buttons {
-                                button(R.string.activity_settings_title) {
-                                    Intent(context, PrivacySettingsActivity::class.java)
-                                        .let(context::startActivity)
-                                }
-                                cancelButton()
+                            button(R.string.activity_settings_title) {
+                                Intent(context, PrivacySettingsActivity::class.java)
+                                    .let(context::startActivity)
                             }
+                            cancelButton()
                         }
                     }
                 } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 22fb12e163..365d11c152 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -190,12 +190,10 @@ object ConversationMenuHelper {
             context.sessionDialog {
                 title(R.string.ConversationActivity_call_title)
                 text(R.string.ConversationActivity_call_prompt)
-                buttons {
-                    button(R.string.activity_settings_title, R.string.AccessibilityId_settings) {
-                        Intent(context, PrivacySettingsActivity::class.java).let(context::startActivity)
-                    }
-                    cancelButton()
+                button(R.string.activity_settings_title, R.string.AccessibilityId_settings) {
+                    Intent(context, PrivacySettingsActivity::class.java).let(context::startActivity)
                 }
+                cancelButton()
             }
             return
         }
@@ -308,20 +306,18 @@ object ConversationMenuHelper {
         context.sessionDialog {
             title(R.string.ConversationActivity_leave_group)
             text(message)
-            buttons {
-                button(R.string.yes) {
-                    try {
-                        val groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
-                        val isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase().isClosedGroup(groupPublicKey)
+            button(R.string.yes) {
+                try {
+                    val groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
+                    val isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase().isClosedGroup(groupPublicKey)
 
-                        if (isClosedGroup) MessageSender.leave(groupPublicKey, true)
-                        else onLeaveFailed()
-                    } catch (e: Exception) {
-                        onLeaveFailed()
-                    }
+                    if (isClosedGroup) MessageSender.leave(groupPublicKey, true)
+                    else onLeaveFailed()
+                } catch (e: Exception) {
+                    onLeaveFailed()
                 }
-                button(R.string.no)
             }
+            button(R.string.no)
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
index e1456a7f94..b38a627683 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
@@ -23,4 +23,4 @@ open class BaseDialog : DialogFragment() {
     open fun setContentView(builder: AlertDialog.Builder) {
         // To be overridden by subclasses
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 1964756a3a..a29dfc69c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -492,17 +492,15 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         sessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
-            buttons {
-                button(R.string.RecipientPreferenceActivity_block) {
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        recipientDatabase.setBlocked(thread.recipient, true)
-                        withContext(Dispatchers.Main) {
-                            binding.recyclerView.adapter?.notifyDataSetChanged()
-                        }
+            button(R.string.RecipientPreferenceActivity_block) {
+                lifecycleScope.launch(Dispatchers.IO) {
+                    recipientDatabase.setBlocked(thread.recipient, true)
+                    withContext(Dispatchers.Main) {
+                        binding.recyclerView.adapter?.notifyDataSetChanged()
                     }
                 }
-                cancelButton()
             }
+            cancelButton()
         }
     }
 
@@ -510,17 +508,15 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         sessionDialog {
             title(R.string.RecipientPreferenceActivity_unblock_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
-            buttons {
-                button(R.string.RecipientPreferenceActivity_unblock) {
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        recipientDatabase.setBlocked(thread.recipient, false)
-                        withContext(Dispatchers.Main) {
-                            binding.recyclerView.adapter?.notifyDataSetChanged()
-                        }
+            button(R.string.RecipientPreferenceActivity_unblock) {
+                lifecycleScope.launch(Dispatchers.IO) {
+                    recipientDatabase.setBlocked(thread.recipient, false)
+                    withContext(Dispatchers.Main) {
+                        binding.recyclerView.adapter?.notifyDataSetChanged()
                     }
                 }
-                cancelButton()
             }
+            cancelButton()
         }
     }
 
@@ -582,60 +578,58 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
 
         sessionDialog {
             text(message)
-            buttons {
-                button(R.string.yes) {
-                    lifecycleScope.launch(Dispatchers.Main) {
-                        val context = this@HomeActivity as Context
-                        // Cancel any outstanding jobs
-                        DatabaseComponent.get(context).sessionJobDatabase()
-                            .cancelPendingMessageSendJobs(threadID)
-                        // Send a leave group message if this is an active closed group
-                        if (recipient.address.isClosedGroup && DatabaseComponent.get(context)
-                                .groupDatabase().isActive(recipient.address.toGroupString())
-                        ) {
-                            var isClosedGroup: Boolean
-                            var groupPublicKey: String?
-                            try {
-                                groupPublicKey =
-                                    GroupUtil.doubleDecodeGroupID(recipient.address.toString())
-                                        .toHexString()
-                                isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase()
-                                    .isClosedGroup(groupPublicKey)
-                            } catch (e: IOException) {
-                                groupPublicKey = null
-                                isClosedGroup = false
-                            }
-                            if (isClosedGroup) {
-                                MessageSender.explicitLeave(groupPublicKey!!, false)
-                            }
+            button(R.string.yes) {
+                lifecycleScope.launch(Dispatchers.Main) {
+                    val context = this@HomeActivity as Context
+                    // Cancel any outstanding jobs
+                    DatabaseComponent.get(context).sessionJobDatabase()
+                        .cancelPendingMessageSendJobs(threadID)
+                    // Send a leave group message if this is an active closed group
+                    if (recipient.address.isClosedGroup && DatabaseComponent.get(context)
+                            .groupDatabase().isActive(recipient.address.toGroupString())
+                    ) {
+                        var isClosedGroup: Boolean
+                        var groupPublicKey: String?
+                        try {
+                            groupPublicKey =
+                                GroupUtil.doubleDecodeGroupID(recipient.address.toString())
+                                    .toHexString()
+                            isClosedGroup = DatabaseComponent.get(context).lokiAPIDatabase()
+                                .isClosedGroup(groupPublicKey)
+                        } catch (e: IOException) {
+                            groupPublicKey = null
+                            isClosedGroup = false
                         }
-                        // Delete the conversation
-                        val v2OpenGroup =
-                            DatabaseComponent.get(this@HomeActivity).lokiThreadDatabase()
-                                .getOpenGroupChat(threadID)
-                        if (v2OpenGroup != null) {
-                            OpenGroupManager.delete(
-                                v2OpenGroup.server,
-                                v2OpenGroup.room,
-                                this@HomeActivity
-                            )
-                        } else {
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                threadDb.deleteConversation(threadID)
-                            }
+                        if (isClosedGroup) {
+                            MessageSender.explicitLeave(groupPublicKey!!, false)
                         }
-                        // Update the badge count
-                        ApplicationContext.getInstance(context).messageNotifier.updateNotification(
-                            context
-                        )
-                        // Notify the user
-                        val toastMessage =
-                            if (recipient.isGroupRecipient) R.string.MessageRecord_left_group else R.string.activity_home_conversation_deleted_message
-                        Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show()
                     }
+                    // Delete the conversation
+                    val v2OpenGroup =
+                        DatabaseComponent.get(this@HomeActivity).lokiThreadDatabase()
+                            .getOpenGroupChat(threadID)
+                    if (v2OpenGroup != null) {
+                        OpenGroupManager.delete(
+                            v2OpenGroup.server,
+                            v2OpenGroup.room,
+                            this@HomeActivity
+                        )
+                    } else {
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            threadDb.deleteConversation(threadID)
+                        }
+                    }
+                    // Update the badge count
+                    ApplicationContext.getInstance(context).messageNotifier.updateNotification(
+                        context
+                    )
+                    // Notify the user
+                    val toastMessage =
+                        if (recipient.isGroupRecipient) R.string.MessageRecord_left_group else R.string.activity_home_conversation_deleted_message
+                    Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show()
                 }
-                button(R.string.no)
             }
+            button(R.string.no)
         }
     }
 
@@ -651,14 +645,12 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     private fun hideMessageRequests() {
         sessionDialog {
             text("Hide message requests?")
-            buttons {
-                button(R.string.yes) {
-                    textSecurePreferences.setHasHiddenMessageRequests()
-                    setupMessageRequestsBanner()
-                    homeViewModel.tryUpdateChannel()
-                }
-                button(R.string.no)
+            button(R.string.yes) {
+                textSecurePreferences.setHasHiddenMessageRequests()
+                setupMessageRequestsBanner()
+                homeViewModel.tryUpdateChannel()
             }
+            button(R.string.no)
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
index 2591cb4716..4618ed0bda 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
@@ -86,10 +86,8 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
         sessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
                 text(R.string.message_requests_block_message)
-                buttons {
-                    button(R.string.recipient_preferences__block) { doBlock() }
-                    button(R.string.no)
-                }
+                button(R.string.recipient_preferences__block) { doBlock() }
+                button(R.string.no)
         }
     }
 
@@ -105,10 +103,8 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
         sessionDialog {
             title(R.string.decline)
             text(resources.getString(R.string.message_requests_decline_message))
-            buttons {
-                button(R.string.decline) { doDecline() }
-                button(R.string.no)
-            }
+            button(R.string.decline) { doDecline() }
+            button(R.string.no)
         }
     }
 
@@ -129,10 +125,8 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
 
         sessionDialog {
             text(resources.getString(R.string.message_requests_clear_all_message))
-            buttons {
-                button(R.string.yes) { doDeleteAllAndBlock() }
-                button(R.string.no)
-            }
+            button(R.string.yes) { doDeleteAllAndBlock() }
+            button(R.string.no)
         }
     }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
index eb0f4719b0..fe1139d031 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
@@ -154,9 +154,7 @@ class PNModeActivity : BaseActionBarActivity() {
         if (selectedOptionView == null) {
             sessionDialog {
                 title(R.string.activity_pn_mode_no_option_picked_dialog_title)
-                buttons {
-                    button(R.string.ok)
-                }
+                button(R.string.ok)
             }
             return
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
index 3c62ccd709..122e1b533c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
@@ -55,10 +55,8 @@ class BlockedContactsActivity: PassphraseRequiredActionBarActivity(), View.OnCli
             sessionDialog {
                 title(title)
                 text(message)
-                buttons {
-                    button(R.string.continue_2) { viewModel.unblock(contactsToUnblock) }
-                    cancelButton()
-                }
+                button(R.string.continue_2) { viewModel.unblock(contactsToUnblock) }
+                cancelButton()
             }
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 93a1af4595..a78038c3eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -264,13 +264,11 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         sessionDialog {
             title(R.string.activity_settings_set_display_picture)
             view(R.layout.dialog_change_avatar)
-            buttons {
-                button(R.string.activity_settings_upload) { startAvatarSelection() }
-                if (TextSecurePreferences.getProfileAvatarId(context) != 0) {
-                    button(R.string.activity_settings_remove) { removeAvatar() }
-                }
-                cancelButton()
+            button(R.string.activity_settings_upload) { startAvatarSelection() }
+            if (TextSecurePreferences.getProfileAvatarId(context) != 0) {
+                button(R.string.activity_settings_remove) { removeAvatar() }
             }
+            cancelButton()
         }.apply {
             findViewById<ProfilePictureView>(R.id.profile_picture_view)?.let(::setupProfilePictureView)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
index e32488bbee..66dc414c4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.util
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Context
-import android.content.DialogInterface.OnClickListener
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
@@ -12,7 +11,6 @@ import android.provider.MediaStore
 import android.text.TextUtils
 import android.webkit.MimeTypeMap
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import network.loki.messenger.R
 import org.session.libsession.utilities.task.ProgressDialogAsyncTask
 import org.session.libsignal.utilities.ExternalStorageUtil
@@ -31,7 +29,12 @@ import java.util.concurrent.TimeUnit
  * Saves attachment files to an external storage using [MediaStore] API.
  * Requires [android.Manifest.permission.WRITE_EXTERNAL_STORAGE] on API 28 and below.
  */
-class SaveAttachmentTask : ProgressDialogAsyncTask<SaveAttachmentTask.Attachment, Void, Pair<Int, String?>> {
+class SaveAttachmentTask @JvmOverloads constructor(context: Context, count: Int = 1) :
+    ProgressDialogAsyncTask<SaveAttachmentTask.Attachment, Void, Pair<Int, String?>>(
+        context,
+        context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments, count, count),
+        context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments_to_sd_card, count, count)
+    ) {
 
     companion object {
         @JvmStatic
@@ -42,31 +45,25 @@ class SaveAttachmentTask : ProgressDialogAsyncTask<SaveAttachmentTask.Attachment
 
         @JvmStatic
         @JvmOverloads
-        fun showWarningDialog(context: Context, count: Int = 1, onAcceptListener: () -> Unit) {
+        fun showWarningDialog(context: Context, count: Int = 1, onAcceptListener: () -> Unit = {}) {
             context.sessionDialog {
                 title(R.string.ConversationFragment_save_to_sd_card)
-                setIconAttribute(R.attr.dialog_alert_icon)
+                iconAttribute(R.attr.dialog_alert_icon)
                 text(context.resources.getQuantityString(
                     R.plurals.ConversationFragment_saving_n_media_to_storage_warning,
                     count,
                     count))
-                buttons {
-                    button(R.string.yes) { onAcceptListener() }
-                    button(R.string.no)
-                }
+                button(R.string.yes) { onAcceptListener() }
+                button(R.string.no)
             }
         }
     }
 
     private val contextReference: WeakReference<Context>
-    private val attachmentCount: Int
+    private val attachmentCount: Int = count
 
-    @JvmOverloads
-    constructor(context: Context, count: Int = 1): super(context,
-            context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments, count, count),
-            context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments_to_sd_card, count, count)) {
+    init {
         this.contextReference = WeakReference(context)
-        this.attachmentCount = count
     }
 
     override fun doInBackground(vararg attachments: Attachment?): Pair<Int, String?> {

From 4e92c402101581f4a46c38b05afc97f73dbbadbf Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 12:15:41 +0930
Subject: [PATCH 05/19] Remove BaseDialog and utilise dialog DSL

---
 .../securesms/SessionDialogBuilder.kt         | 28 ++++++--
 .../conversation/v2/ConversationActivityV2.kt |  5 +-
 .../conversation/v2/dialogs/BlockedDialog.kt  | 27 ++++----
 .../conversation/v2/dialogs/DownloadDialog.kt | 27 ++++----
 .../v2/dialogs/JoinOpenGroupDialog.kt         | 30 ++++----
 .../v2/dialogs/LinkPreviewDialog.kt           | 23 ++++---
 .../conversation/v2/dialogs/SendSeedDialog.kt | 23 ++++---
 .../conversation/v2/utilities/BaseDialog.kt   | 26 -------
 .../preferences/ClearAllDataDialog.kt         | 18 +++--
 .../securesms/preferences/SeedDialog.kt       | 38 +++++-----
 .../securesms/preferences/ShareLogsDialog.kt  | 26 +++----
 .../securesms/util/ActivityUtilities.kt       |  4 +-
 app/src/main/res/layout/dialog_blocked.xml    | 57 ---------------
 app/src/main/res/layout/dialog_download.xml   | 58 ----------------
 .../res/layout/dialog_join_open_group.xml     | 56 ---------------
 .../main/res/layout/dialog_link_preview.xml   | 60 ----------------
 app/src/main/res/layout/dialog_open_url.xml   | 56 ---------------
 app/src/main/res/layout/dialog_seed.xml       | 69 -------------------
 app/src/main/res/layout/dialog_share_logs.xml | 63 -----------------
 19 files changed, 128 insertions(+), 566 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
 delete mode 100644 app/src/main/res/layout/dialog_blocked.xml
 delete mode 100644 app/src/main/res/layout/dialog_download.xml
 delete mode 100644 app/src/main/res/layout/dialog_join_open_group.xml
 delete mode 100644 app/src/main/res/layout/dialog_link_preview.xml
 delete mode 100644 app/src/main/res/layout/dialog_open_url.xml
 delete mode 100644 app/src/main/res/layout/dialog_seed.xml
 delete mode 100644 app/src/main/res/layout/dialog_share_logs.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 195c45441d..8ed60cce1e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -17,6 +17,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.setMargins
 import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
+import androidx.fragment.app.Fragment
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
 
@@ -28,6 +29,9 @@ annotation class DialogDsl
 @DialogDsl
 class SessionDialogBuilder(val context: Context) {
 
+    val dp20 = toPx(20, context.resources)
+    val dp40 = toPx(40, context.resources)
+
     private val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(context)
 
     private var dialog: AlertDialog? = null
@@ -49,19 +53,19 @@ class SessionDialogBuilder(val context: Context) {
 
     fun title(text: CharSequence?) = title(text?.toString())
     fun title(text: String?) {
-        text(text, R.style.TextAppearance_AppCompat_Title) { setPadding(toPx(20, resources)) }
+        text(text, R.style.TextAppearance_AppCompat_Title) { setPadding(dp20) }
     }
 
     fun text(@StringRes id: Int, style: Int = 0) = text(context.getString(id), style)
-    fun text(text: CharSequence?) = text(text?.toString())
-    fun text(text: String?, @StyleRes style: Int = 0) {
+    fun text(text: CharSequence?, @StyleRes style: Int = 0) {
         text(text, style) {
             layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
-                .apply { toPx(40, resources).let { updateMargins(it, 0, it, 0) } }
+                .apply { updateMargins(dp40, 0, dp40, dp20) }
         }
     }
 
-    private fun text(text: String?, @StyleRes style: Int, modify: TextView.() -> Unit) {
+
+    private fun text(text: CharSequence?, @StyleRes style: Int, modify: TextView.() -> Unit) {
         text ?: return
         TextView(context, null, 0, style)
             .apply {
@@ -77,9 +81,15 @@ class SessionDialogBuilder(val context: Context) {
 
     fun iconAttribute(@AttrRes icon: Int): AlertDialog.Builder = dialogBuilder.setIconAttribute(icon)
 
+    fun singleChoiceItems(
+        options: Collection<String>,
+        currentSelected: Int = 0,
+        onSelect: (Int) -> Unit
+    ) = singleChoiceItems(options.toTypedArray(), currentSelected, onSelect)
+
     fun singleChoiceItems(
         options: Array<String>,
-        currentSelected: Int,
+        currentSelected: Int = 0,
         onSelect: (Int) -> Unit
     ): AlertDialog.Builder = dialogBuilder.setSingleChoiceItems(
         options,
@@ -101,7 +111,7 @@ class SessionDialogBuilder(val context: Context) {
 
     fun button(
         @StringRes text: Int,
-        @StringRes contentDescriptionRes: Int = 0,
+        @StringRes contentDescriptionRes: Int = text,
         @StyleRes style: Int = R.style.Widget_Session_Button_Dialog_UnimportantText,
         listener: (() -> Unit) = {}
     ) = Button(context, null, 0, style).apply {
@@ -115,8 +125,12 @@ class SessionDialogBuilder(val context: Context) {
             }
         }.let(buttonLayout::addView)
 
+    fun create(): AlertDialog = dialogBuilder.create()
     fun show(): AlertDialog = dialogBuilder.show()
 }
 
 fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
     SessionDialogBuilder(this).apply { build() }.show()
+
+fun Fragment.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
+    SessionDialogBuilder(requireContext()).apply { build() }.create()
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 1b126919a9..166c8f8267 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
@@ -22,6 +22,7 @@ import androidx.activity.viewModels
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -405,8 +406,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         push(intent, false)
     }
 
-    override fun showDialog(baseDialog: BaseDialog, tag: String?) {
-        baseDialog.show(supportFragmentManager, tag)
+    override fun showDialog(dialogFragment: DialogFragment, tag: String?) {
+        dialogFragment.show(supportFragmentManager, tag)
     }
 
     override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<Cursor> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
index 39ca7c6913..e4a1c5fd9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
@@ -1,41 +1,40 @@
 package org.thoughtcrime.securesms.conversation.v2.dialogs
 
+import android.app.Dialog
 import android.graphics.Typeface
+import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.StyleSpan
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
-import network.loki.messenger.databinding.DialogBlockedBinding
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.recipients.Recipient
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
+import org.thoughtcrime.securesms.sessionDialog
 
 /** Shown upon sending a message to a user that's blocked. */
-class BlockedDialog(private val recipient: Recipient) : BaseDialog() {
+class BlockedDialog(private val recipient: Recipient) : DialogFragment() {
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogBlockedBinding.inflate(LayoutInflater.from(requireContext()))
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
         val contactDB = DatabaseComponent.get(requireContext()).sessionContactDatabase()
         val sessionID = recipient.address.toString()
         val contact = contactDB.getContactWithSessionID(sessionID)
         val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
-        val title = resources.getString(R.string.dialog_blocked_title, name)
-        binding.blockedTitleTextView.text = title
+
         val explanation = resources.getString(R.string.dialog_blocked_explanation, name)
         val spannable = SpannableStringBuilder(explanation)
         val startIndex = explanation.indexOf(name)
         spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-        binding.blockedExplanationTextView.text = spannable
-        binding.cancelButton.setOnClickListener { dismiss() }
-        binding.unblockButton.setOnClickListener { unblock() }
-        builder.setView(binding.root)
+
+        title(resources.getString(R.string.dialog_blocked_title, name))
+        text(spannable)
+        button(R.string.ConversationActivity_unblock) { unblock() }
+        cancelButton { dismiss() }
     }
 
     private fun unblock() {
         DatabaseComponent.get(requireContext()).recipientDatabase().setBlocked(recipient, false)
         dismiss()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
index 42cca1ad3e..ee1ef01f2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
@@ -1,45 +1,44 @@
 package org.thoughtcrime.securesms.conversation.v2.dialogs
 
+import android.app.Dialog
 import android.graphics.Typeface
+import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.StyleSpan
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
-import network.loki.messenger.databinding.DialogDownloadBinding
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.jobs.AttachmentDownloadJob
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.utilities.recipients.Recipient
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 import org.thoughtcrime.securesms.database.SessionContactDatabase
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
+import org.thoughtcrime.securesms.sessionDialog
 import javax.inject.Inject
 
 /** Shown when receiving media from a contact for the first time, to confirm that
  * they are to be trusted and files sent by them are to be downloaded. */
 @AndroidEntryPoint
-class DownloadDialog(private val recipient: Recipient) : BaseDialog() {
+class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
 
     @Inject lateinit var contactDB: SessionContactDatabase
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogDownloadBinding.inflate(LayoutInflater.from(requireContext()))
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
         val sessionID = recipient.address.toString()
         val contact = contactDB.getContactWithSessionID(sessionID)
         val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
-        val title = resources.getString(R.string.dialog_download_title, name)
-        binding.downloadTitleTextView.text = title
+        title(resources.getString(R.string.dialog_download_title, name))
+
         val explanation = resources.getString(R.string.dialog_download_explanation, name)
         val spannable = SpannableStringBuilder(explanation)
         val startIndex = explanation.indexOf(name)
         spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-        binding.downloadExplanationTextView.text = spannable
-        binding.cancelButton.setOnClickListener { dismiss() }
-        binding.downloadButton.setOnClickListener { trust() }
-        builder.setView(binding.root)
+        text(spannable)
+
+        button(R.string.dialog_download_button_title, R.string.AccessibilityId_download_media) { trust() }
+        cancelButton { dismiss() }
     }
 
     private fun trust() {
@@ -50,4 +49,4 @@ class DownloadDialog(private val recipient: Recipient) : BaseDialog() {
         JobQueue.shared.resumePendingJobs(AttachmentDownloadJob.KEY)
         dismiss()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
index 444c389e04..3d33f4fe87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
@@ -1,45 +1,41 @@
 package org.thoughtcrime.securesms.conversation.v2.dialogs
 
+import android.app.Dialog
 import android.graphics.Typeface
+import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.style.StyleSpan
-import android.view.LayoutInflater
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
-import network.loki.messenger.databinding.DialogJoinOpenGroupBinding
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.utilities.OpenGroupUrlParser
 import org.session.libsignal.utilities.ThreadUtils
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 import org.thoughtcrime.securesms.groups.OpenGroupManager
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 /** Shown upon tapping an open group invitation. */
-class JoinOpenGroupDialog(private val name: String, private val url: String) : BaseDialog() {
+class JoinOpenGroupDialog(private val name: String, private val url: String) : DialogFragment() {
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogJoinOpenGroupBinding.inflate(LayoutInflater.from(requireContext()))
-        val title = resources.getString(R.string.dialog_join_open_group_title, name)
-        binding.joinOpenGroupTitleTextView.text = title
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        title(resources.getString(R.string.dialog_join_open_group_title, name))
         val explanation = resources.getString(R.string.dialog_join_open_group_explanation, name)
         val spannable = SpannableStringBuilder(explanation)
         val startIndex = explanation.indexOf(name)
         spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-        binding.joinOpenGroupExplanationTextView.text = spannable
-        binding.cancelButton.setOnClickListener { dismiss() }
-        binding.joinButton.setOnClickListener { join() }
-        builder.setView(binding.root)
+        text(spannable)
+        cancelButton { dismiss() }
+        button(R.string.open_group_invitation_view__join_accessibility_description) { join() }
     }
 
     private fun join() {
         val openGroup = OpenGroupUrlParser.parseUrl(url)
-        val activity = requireContext() as AppCompatActivity
+        val activity = requireActivity()
         ThreadUtils.queue {
             try {
-                OpenGroupManager.add(openGroup.server, openGroup.room, openGroup.serverPublicKey, activity)
+                openGroup.apply { OpenGroupManager.add(server, room, serverPublicKey, activity) }
                 MessagingModuleConfiguration.shared.storage.onOpenGroupAdded(openGroup.server)
                 ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(activity)
             } catch (e: Exception) {
@@ -48,4 +44,4 @@ class JoinOpenGroupDialog(private val name: String, private val url: String) : B
         }
         dismiss()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
index a16ca86f79..f8eb7e4415 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
@@ -1,20 +1,21 @@
 package org.thoughtcrime.securesms.conversation.v2.dialogs
 
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
-import network.loki.messenger.databinding.DialogLinkPreviewBinding
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
+import org.thoughtcrime.securesms.sessionDialog
 
 /** Shown the first time the user inputs a URL that could generate a link preview, to
  * let them know that Session offers the ability to send and receive link previews. */
-class LinkPreviewDialog(private val onEnabled: () -> Unit) : BaseDialog() {
+class LinkPreviewDialog(private val onEnabled: () -> Unit) : DialogFragment() {
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogLinkPreviewBinding.inflate(LayoutInflater.from(requireContext()))
-        binding.cancelButton.setOnClickListener { dismiss() }
-        binding.enableLinkPreviewsButton.setOnClickListener { enable() }
-        builder.setView(binding.root)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        title(R.string.dialog_link_preview_title)
+        text(R.string.dialog_link_preview_explanation)
+        button(R.string.dialog_link_preview_enable_button_title) { enable() }
+        cancelButton { dismiss() }
     }
 
     private fun enable() {
@@ -22,4 +23,4 @@ class LinkPreviewDialog(private val onEnabled: () -> Unit) : BaseDialog() {
         dismiss()
         onEnabled()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
index f51261d499..b030da29f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
@@ -1,22 +1,23 @@
 package org.thoughtcrime.securesms.conversation.v2.dialogs
 
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
-import network.loki.messenger.databinding.DialogSendSeedBinding
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.sessionDialog
 
 /** Shown if the user is about to send their recovery phrase to someone. */
-class SendSeedDialog(private val proceed: (() -> Unit)? = null) : BaseDialog() {
+class SendSeedDialog(private val proceed: (() -> Unit)? = null) : DialogFragment() {
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogSendSeedBinding.inflate(LayoutInflater.from(requireContext()))
-        binding.cancelButton.setOnClickListener { dismiss() }
-        binding.sendSeedButton.setOnClickListener { send() }
-        builder.setView(binding.root)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        title(R.string.dialog_send_seed_title)
+        text(R.string.dialog_send_seed_explanation)
+        button(R.string.dialog_send_seed_send_button_title) { send() }
+        cancelButton()
     }
 
     private fun send() {
         proceed?.invoke()
         dismiss()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
deleted file mode 100644
index b38a627683..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.thoughtcrime.securesms.conversation.v2.utilities
-
-import android.app.Dialog
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import org.thoughtcrime.securesms.util.UiModeUtilities
-
-open class BaseDialog : DialogFragment() {
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireContext())
-        setContentView(builder)
-        val result = builder.create()
-        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
-        result.window?.setDimAmount(if (isLightMode) 0.1f else 0.75f)
-        return result
-    }
-
-    open fun setContentView(builder: AlertDialog.Builder) {
-        // To be overridden by subclasses
-    }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
index fa3be71307..17543f87d5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
@@ -1,9 +1,12 @@
 package org.thoughtcrime.securesms.preferences
 
+import android.app.Dialog
+import android.os.Bundle
 import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
+import android.view.View
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import kotlinx.coroutines.Dispatchers
@@ -15,10 +18,10 @@ import network.loki.messenger.databinding.DialogClearAllDataBinding
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
-class ClearAllDataDialog : BaseDialog() {
+class ClearAllDataDialog : DialogFragment() {
     private lateinit var binding: DialogClearAllDataBinding
 
     enum class Steps {
@@ -35,7 +38,11 @@ class ClearAllDataDialog : BaseDialog() {
             updateUI()
         }
 
-    override fun setContentView(builder: AlertDialog.Builder) {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        view(createView())
+    }
+
+    private fun createView(): View {
         binding = DialogClearAllDataBinding.inflate(LayoutInflater.from(requireContext()))
         val device = RadioOption("deviceOnly", requireContext().getString(R.string.dialog_clear_all_data_clear_device_only))
         val network = RadioOption("deviceAndNetwork", requireContext().getString(R.string.dialog_clear_all_data_clear_device_and_network))
@@ -62,8 +69,7 @@ class ClearAllDataDialog : BaseDialog() {
                 Steps.DELETING -> { /* do nothing intentionally */ }
             }
         }
-        builder.setView(binding.root)
-        builder.setCancelable(false)
+        return binding.root
     }
 
     private fun updateUI() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
index e7bfd60d3f..d28027d72e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
@@ -1,38 +1,34 @@
 package org.thoughtcrime.securesms.preferences
 
+import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import android.view.LayoutInflater
+import android.os.Bundle
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
-import network.loki.messenger.databinding.DialogSeedBinding
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.hexEncodedPrivateKey
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MnemonicUtilities
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
-
-class SeedDialog : BaseDialog() {
+import org.thoughtcrime.securesms.sessionDialog
 
+class SeedDialog: DialogFragment() {
     private val seed by lazy {
-        var hexEncodedSeed = IdentityKeyUtil.retrieve(requireContext(), IdentityKeyUtil.LOKI_SEED)
-        if (hexEncodedSeed == null) {
-            hexEncodedSeed = IdentityKeyUtil.getIdentityKeyPair(requireContext()).hexEncodedPrivateKey // Legacy account
-        }
-        val loadFileContents: (String) -> String = { fileName ->
-            MnemonicUtilities.loadFileContents(requireContext(), fileName)
-        }
-        MnemonicCodec(loadFileContents).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english)
+        val hexEncodedSeed = IdentityKeyUtil.retrieve(requireContext(), IdentityKeyUtil.LOKI_SEED)
+            ?: IdentityKeyUtil.getIdentityKeyPair(requireContext()).hexEncodedPrivateKey // Legacy account
+
+        MnemonicCodec { fileName -> MnemonicUtilities.loadFileContents(requireContext(), fileName) }
+            .encode(hexEncodedSeed, MnemonicCodec.Language.Configuration.english)
     }
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogSeedBinding.inflate(LayoutInflater.from(requireContext()))
-        binding.seedTextView.text = seed
-        binding.closeButton.setOnClickListener { dismiss() }
-        binding.copyButton.setOnClickListener { copySeed() }
-        builder.setView(binding.root)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        title(R.string.dialog_seed_title)
+        text(R.string.dialog_seed_explanation)
+        text(seed, R.style.SessionIDTextView)
+        button(R.string.copy, R.string.AccessibilityId_copy_recovery_phrase) { copySeed() }
+        button(R.string.close) { dismiss() }
     }
 
     private fun copySeed() {
@@ -42,4 +38,4 @@ class SeedDialog : BaseDialog() {
         Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
         dismiss()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
index 1bd8373247..71855bd1ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
@@ -1,17 +1,18 @@
 package org.thoughtcrime.securesms.preferences
 
+import android.app.Dialog
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Intent
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
+import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
-import android.view.LayoutInflater
 import android.webkit.MimeTypeMap
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.Main
@@ -20,11 +21,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
-import network.loki.messenger.databinding.DialogShareLogsBinding
 import org.session.libsignal.utilities.ExternalStorageUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
+import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.FileProviderUtil
 import org.thoughtcrime.securesms.util.StreamUtil
 import java.io.File
@@ -33,21 +33,15 @@ import java.io.IOException
 import java.util.Objects
 import java.util.concurrent.TimeUnit
 
-class ShareLogsDialog : BaseDialog() {
+class ShareLogsDialog : DialogFragment() {
 
     private var shareJob: Job? = null
 
-    override fun setContentView(builder: AlertDialog.Builder) {
-        val binding = DialogShareLogsBinding.inflate(LayoutInflater.from(requireContext()))
-        binding.cancelButton.setOnClickListener {
-            dismiss()
-        }
-        binding.shareButton.setOnClickListener {
-            // start the export and share
-            shareLogs()
-        }
-        builder.setView(binding.root)
-        builder.setCancelable(false)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+        title(R.string.dialog_share_logs_title)
+        text(R.string.dialog_share_logs_explanation)
+        button(R.string.share) { shareLogs() }
+        cancelButton { dismiss() }
     }
 
     private fun shareLogs() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
index d5b361ecd6..5ff823a15c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt
@@ -7,10 +7,10 @@ import android.view.View
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 
 fun BaseActionBarActivity.setUpActionBarSessionLogo(hideBackButton: Boolean = false) {
     val actionbar = supportActionBar!!
@@ -66,7 +66,7 @@ interface ActivityDispatcher {
         fun get(context: Context) = context.getSystemService(SERVICE) as? ActivityDispatcher
     }
     fun dispatchIntent(body: (Context)->Intent?)
-    fun showDialog(baseDialog: BaseDialog, tag: String? = null)
+    fun showDialog(dialogFragment: DialogFragment, tag: String? = null)
 }
 
 fun TextSecurePreferences.themeState(): ThemeState {
diff --git a/app/src/main/res/layout/dialog_blocked.xml b/app/src/main/res/layout/dialog_blocked.xml
deleted file mode 100644
index 4ad01ec8ee..0000000000
--- a/app/src/main/res/layout/dialog_blocked.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:id="@+id/blockedTitleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_blocked_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:id="@+id/blockedExplanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_blocked_explanation"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/unblockButton"
-            android:contentDescription="@string/AccessibilityId_block_confirm"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/ConversationActivity_unblock" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
deleted file mode 100644
index a54a0357c2..0000000000
--- a/app/src/main/res/layout/dialog_download.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:id="@+id/downloadTitleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_download_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:id="@+id/downloadExplanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_download_explanation"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:contentDescription="@string/AccessibilityId_dont_download_media"
-            android:text="@string/cancel" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/downloadButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:contentDescription="@string/AccessibilityId_download_media"
-            android:text="@string/dialog_download_button_title" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_join_open_group.xml b/app/src/main/res/layout/dialog_join_open_group.xml
deleted file mode 100644
index 7c422a1e33..0000000000
--- a/app/src/main/res/layout/dialog_join_open_group.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:id="@+id/joinOpenGroupTitleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_join_open_group_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:id="@+id/joinOpenGroupExplanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_join_open_group_explanation"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/joinButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/open_group_invitation_view__join_accessibility_description" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
deleted file mode 100644
index 0344439f55..0000000000
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:id="@+id/linkPreviewDialogTitleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_link_preview_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:id="@+id/linkPreviewDialogExplanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_link_preview_explanation"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:contentDescription="@string/AccessibilityId_cancel_link_preview_button"/>
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/enableLinkPreviewsButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/dialog_link_preview_enable_button_title"
-            android:contentDescription="@string/AccessibilityId_enable_link_preview_button"
-            />
-
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_open_url.xml b/app/src/main/res/layout/dialog_open_url.xml
deleted file mode 100644
index ec0befef21..0000000000
--- a/app/src/main/res/layout/dialog_open_url.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:id="@+id/openURLTitleTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_open_url_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/large_font_size" />
-
-    <TextView
-        android:id="@+id/openURLExplanationTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_open_url_explanation"
-        android:paddingHorizontal="@dimen/medium_spacing"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/openURLButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/open" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_seed.xml b/app/src/main/res/layout/dialog_seed.xml
deleted file mode 100644
index fac8ffb62f..0000000000
--- a/app/src/main/res/layout/dialog_seed.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_seed_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textAlignment="center"
-        android:textSize="@dimen/medium_font_size" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_seed_explanation"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/medium_font_size"
-        android:textAlignment="center"
-        android:alpha="0.6" />
-
-    <TextView
-        style="@style/SessionIDTextView"
-        android:contentDescription="@string/AccessibilityId_recovery_phrase"
-        android:id="@+id/seedTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:padding="@dimen/small_spacing"
-        tools:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:contentDescription="@string/AccessibilityId_cancel_button"
-            android:id="@+id/copyButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/copy" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:contentDescription="@string/AccessibilityId_copy_recovery_phrase"
-            android:id="@+id/closeButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/close" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_share_logs.xml b/app/src/main/res/layout/dialog_share_logs.xml
deleted file mode 100644
index adb3a9e2d8..0000000000
--- a/app/src/main/res/layout/dialog_share_logs.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/dialog_share_logs_title"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        android:textSize="@dimen/medium_font_size" />
-
-    <TextView
-        android:id="@+id/dialogDescriptionText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:text="@string/dialog_share_logs_explanation"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/small_font_size"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:orientation="horizontal">
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/cancelButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
-
-        <Button
-            style="@style/Widget.Session.Button.Dialog.UnimportantText"
-            android:id="@+id/shareButton"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
-            android:text="@string/share" />
-
-        <com.github.ybq.android.spinkit.SpinKitView
-            style="@style/SpinKitView.Small.ThreeBounce"
-            android:id="@+id/progressBar"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
-            android:layout_weight="1"
-            app:SpinKit_Color="?colorAccent"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file

From 391735dc28a398312ecc201455efdb895970193c Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 13:02:33 +0930
Subject: [PATCH 06/19] Convert CallToggleListener to Kotlin

---
 .../preferences/CallToggleListener.kt         | 52 +++++++++++++++++++
 .../PrivacySettingsPreferenceFragment.java    | 50 ------------------
 2 files changed, 52 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
new file mode 100644
index 0000000000..de5f812fd0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.preferences
+
+import android.Manifest
+import android.app.AlertDialog
+import android.content.DialogInterface
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.fragment.app.Fragment
+import androidx.preference.Preference
+import network.loki.messenger.R
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.TextSecurePreferences.Companion.setBooleanPreference
+import org.thoughtcrime.securesms.permissions.Permissions
+
+internal class CallToggleListener(
+    private val context: Fragment,
+    private val setCallback: Function1<Boolean?, Void>
+) : Preference.OnPreferenceChangeListener {
+
+    private fun requestMicrophonePermission() {
+        Permissions.with(context)
+            .request(Manifest.permission.RECORD_AUDIO)
+            .onAllGranted {
+                setBooleanPreference(
+                    context.requireContext(),
+                    TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED,
+                    true
+                )
+                setCallback(true)
+            }
+            .onAnyDenied { setCallback(false) }
+            .execute()
+    }
+
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        if (!(newValue as Boolean)) return true
+
+        // check if we've shown the info dialog and check for microphone permissions
+        val dialog = AlertDialog.Builder(
+            ContextThemeWrapper(
+                context.requireContext(), R.style.ThemeOverlay_Session_AlertDialog
+            )
+        )
+            .setTitle(R.string.dialog_voice_video_title)
+            .setMessage(R.string.dialog_voice_video_message)
+            .setPositiveButton(R.string.dialog_link_preview_enable_button_title) { d: DialogInterface?, w: Int -> requestMicrophonePermission() }
+            .setNegativeButton(R.string.cancel) { d: DialogInterface?, w: Int -> }
+            .show()
+        val positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
+        positiveButton.contentDescription = "Enable"
+        return false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
index ac03efa362..e7fbd14f95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
@@ -1,21 +1,17 @@
 package org.thoughtcrime.securesms.preferences;
 
-import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 
 import org.session.libsession.utilities.TextSecurePreferences;
@@ -26,7 +22,6 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.CallNotificationBuilder;
 import org.thoughtcrime.securesms.util.IntentUtils;
 
-import kotlin.jvm.functions.Function1;
 import network.loki.messenger.BuildConfig;
 import network.loki.messenger.R;
 
@@ -155,49 +150,4 @@ public class PrivacySettingsPreferenceFragment extends ListSummaryPreferenceFrag
     }
   }
 
-  private class CallToggleListener implements Preference.OnPreferenceChangeListener {
-
-    private final Fragment context;
-    private final Function1<Boolean, Void> setCallback;
-
-    private CallToggleListener(Fragment context, Function1<Boolean,Void> setCallback) {
-      this.context = context;
-      this.setCallback = setCallback;
-    }
-
-    private void requestMicrophonePermission() {
-      Permissions.with(context)
-              .request(Manifest.permission.RECORD_AUDIO)
-              .onAllGranted(() -> {
-                TextSecurePreferences.setBooleanPreference(context.requireContext(), TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED, true);
-                setCallback.invoke(true);
-              })
-              .onAnyDenied(() -> setCallback.invoke(false))
-              .execute();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-      boolean val = (boolean) newValue;
-      if (val) {
-        // check if we've shown the info dialog and check for microphone permissions
-        AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(context.requireContext(), R.style.ThemeOverlay_Session_AlertDialog))
-                .setTitle(R.string.dialog_voice_video_title)
-                .setMessage(R.string.dialog_voice_video_message)
-                .setPositiveButton(R.string.dialog_link_preview_enable_button_title, (d, w) -> {
-                  requestMicrophonePermission();
-                })
-                .setNegativeButton(R.string.cancel, (d, w) -> {
-
-                })
-                .show();
-          Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-          positiveButton.setContentDescription("Enable");
-      return false;
-      } else {
-        return true;
-      }
-    }
-  }
-
 }

From 623cfde8b17630c730d30ce6af8b4ccca6f58905 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 13:07:28 +0930
Subject: [PATCH 07/19] Utilise dialog dsl in CallToggleListener

---
 .../preferences/CallToggleListener.kt         | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
index de5f812fd0..a8042ad3b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
@@ -1,21 +1,33 @@
 package org.thoughtcrime.securesms.preferences
 
 import android.Manifest
-import android.app.AlertDialog
-import android.content.DialogInterface
-import androidx.appcompat.view.ContextThemeWrapper
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.TextSecurePreferences.Companion.setBooleanPreference
 import org.thoughtcrime.securesms.permissions.Permissions
+import org.thoughtcrime.securesms.sessionDialog
 
 internal class CallToggleListener(
     private val context: Fragment,
     private val setCallback: Function1<Boolean?, Void>
 ) : Preference.OnPreferenceChangeListener {
 
+    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+        if (newValue == false) return true
+
+        // check if we've shown the info dialog and check for microphone permissions
+        context.sessionDialog {
+            title(R.string.dialog_voice_video_title)
+            text(R.string.dialog_voice_video_message)
+            button(R.string.dialog_link_preview_enable_button_title, R.string.AccessibilityId_enable) { requestMicrophonePermission() }
+            cancelButton()
+        }
+
+        return false
+    }
+
     private fun requestMicrophonePermission() {
         Permissions.with(context)
             .request(Manifest.permission.RECORD_AUDIO)
@@ -30,23 +42,4 @@ internal class CallToggleListener(
             .onAnyDenied { setCallback(false) }
             .execute()
     }
-
-    override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
-        if (!(newValue as Boolean)) return true
-
-        // check if we've shown the info dialog and check for microphone permissions
-        val dialog = AlertDialog.Builder(
-            ContextThemeWrapper(
-                context.requireContext(), R.style.ThemeOverlay_Session_AlertDialog
-            )
-        )
-            .setTitle(R.string.dialog_voice_video_title)
-            .setMessage(R.string.dialog_voice_video_message)
-            .setPositiveButton(R.string.dialog_link_preview_enable_button_title) { d: DialogInterface?, w: Int -> requestMicrophonePermission() }
-            .setNegativeButton(R.string.cancel) { d: DialogInterface?, w: Int -> }
-            .show()
-        val positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
-        positiveButton.contentDescription = "Enable"
-        return false
-    }
-}
\ No newline at end of file
+}

From 50271685af8e478733cab2428366ee8077ddd94d Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 18:05:23 +0930
Subject: [PATCH 08/19] Utilise dialog dsl in MuteDialog

---
 .../thoughtcrime/securesms/MuteDialog.java    | 56 -------------------
 .../org/thoughtcrime/securesms/MuteDialog.kt  | 31 ++++++++++
 .../securesms/SessionDialogBuilder.kt         |  7 +++
 .../v2/menus/ConversationMenuHelper.kt        |  4 +-
 .../securesms/home/HomeActivity.kt            |  4 +-
 app/src/main/res/values/arrays.xml            |  8 ---
 6 files changed, 42 insertions(+), 68 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
deleted file mode 100644
index acca9f8375..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.content.DialogInterface;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
-import java.util.concurrent.TimeUnit;
-
-import network.loki.messenger.R;
-
-public class MuteDialog extends AlertDialog {
-
-
-  protected MuteDialog(Context context) {
-    super(context);
-  }
-
-  protected MuteDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
-    super(context, cancelable, cancelListener);
-  }
-
-  protected MuteDialog(Context context, int theme) {
-    super(context, theme);
-  }
-
-  public static void show(final Context context, final @NonNull MuteSelectionListener listener) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(R.string.MuteDialog_mute_notifications);
-    builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, final int which) {
-        final long muteUntil;
-
-        switch (which) {
-          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2);  break;
-          case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
-          case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
-          case 4:  muteUntil = Long.MAX_VALUE; break;
-          default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
-        }
-
-        listener.onMuted(muteUntil);
-      }
-    });
-
-    builder.show();
-
-  }
-
-  public interface MuteSelectionListener {
-    public void onMuted(long until);
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
new file mode 100644
index 0000000000..96523d2e7d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import android.content.DialogInterface
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import network.loki.messenger.R
+import java.math.BigInteger
+import java.time.Instant
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+fun showMuteDialog(
+    context: Context,
+    onMuteDuration: (Long) -> Unit
+): AlertDialog = context.sessionDialog {
+    title(R.string.MuteDialog_mute_notifications)
+    items(Option.values().map { it.stringRes }.map(context::getString).toTypedArray()) {
+        onMuteDuration(Option.values()[it].getTime())
+    }
+}
+
+private enum class Option(@StringRes val stringRes: Int, val getTime: () -> Long) {
+    ONE_HOUR(R.string.arrays__mute_for_one_hour, duration = TimeUnit.HOURS.toMillis(1)),
+    TWO_HOURS(R.string.arrays__mute_for_two_hours, duration = TimeUnit.DAYS.toMillis(2)),
+    ONE_DAY(R.string.arrays__mute_for_one_day, duration = TimeUnit.DAYS.toMillis(1)),
+    SEVEN_DAYS(R.string.arrays__mute_for_seven_days, duration = TimeUnit.DAYS.toMillis(7)),
+    FOREVER(R.string.arrays__mute_forever, getTime = { Long.MAX_VALUE });
+
+    constructor(@StringRes stringRes: Int, duration: Long): this(stringRes, { System.currentTimeMillis() + duration })
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 8ed60cce1e..10d86e4a9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -96,6 +96,13 @@ class SessionDialogBuilder(val context: Context) {
         currentSelected
     ) { dialog, it -> onSelect(it); dialog.dismiss() }
 
+    fun items(
+        options: Array<String>,
+        onSelect: (Int) -> Unit
+    ): AlertDialog.Builder = dialogBuilder.setItems(
+        options,
+    ) { dialog, it -> onSelect(it); dialog.dismiss() }
+
     fun destructiveButton(
         @StringRes text: Int,
         @StringRes contentDescription: Int,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 365d11c152..20335aec59 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -34,7 +34,6 @@ import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.MediaOverviewActivity
-import org.thoughtcrime.securesms.MuteDialog
 import org.thoughtcrime.securesms.ShortcutLauncherActivity
 import org.thoughtcrime.securesms.calls.WebRtcCallActivity
 import org.thoughtcrime.securesms.contacts.SelectContactsActivity
@@ -46,6 +45,7 @@ import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.group
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.service.WebRtcCallService
 import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.util.BitmapUtil
 import java.io.IOException
 
@@ -333,7 +333,7 @@ object ConversationMenuHelper {
     }
 
     private fun mute(context: Context, thread: Recipient) {
-        MuteDialog.show(ContextThemeWrapper(context, context.theme)) { until: Long ->
+        showMuteDialog(ContextThemeWrapper(context, context.theme)) { until ->
             DatabaseComponent.get(context).recipientDatabase().setMuted(thread, until)
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index a29dfc69c4..adcae62f58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -41,7 +41,6 @@ import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.MuteDialog
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.start.NewConversationFragment
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
@@ -64,6 +63,7 @@ import org.thoughtcrime.securesms.onboarding.SeedActivity
 import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.preferences.SettingsActivity
 import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.IP2Country
@@ -522,7 +522,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
 
     private fun setConversationMuted(thread: ThreadRecord, isMuted: Boolean) {
         if (isMuted) {
-            MuteDialog.show(this) { until: Long ->
+            showMuteDialog(this) { until ->
                 lifecycleScope.launch(Dispatchers.IO) {
                     recipientDatabase.setMuted(thread.recipient, until)
                     withContext(Dispatchers.Main) {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 566ee7e36c..8d0d714e49 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -169,14 +169,6 @@
       <item>@string/arrays__use_custom</item>
   </string-array>
 
-  <string-array name="mute_durations">
-      <item>@string/arrays__mute_for_one_hour</item>
-      <item>@string/arrays__mute_for_two_hours</item>
-      <item>@string/arrays__mute_for_one_day</item>
-      <item>@string/arrays__mute_for_seven_days</item>
-      <item>@string/arrays__mute_forever</item>
-  </string-array>
-
     <string-array name="pref_notification_privacy_entries">
       <item>@string/arrays__name_and_message</item>
       <item>@string/arrays__name_only</item>

From c5f821add0585bfdd5ac4a76bb5723c8ffa56f16 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 21:58:38 +0930
Subject: [PATCH 09/19] Utilise dialog dsl in ExpirationDialog

---
 .../securesms/ExpirationDialog.java           | 88 -------------------
 .../securesms/ExpirationDialog.kt             | 53 +++++++++++
 .../securesms/SessionDialogBuilder.kt         |  9 +-
 .../conversation/v2/ConversationActivityV2.kt | 11 +--
 4 files changed, 62 insertions(+), 99 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
deleted file mode 100644
index 469629ed3f..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import org.session.libsession.utilities.ExpirationUtil;
-
-import cn.carbswang.android.numberpickerview.library.NumberPickerView;
-import network.loki.messenger.R;
-
-public class ExpirationDialog extends AlertDialog {
-
-  protected ExpirationDialog(Context context) {
-    super(context);
-  }
-
-  protected ExpirationDialog(Context context, int theme) {
-    super(context, theme);
-  }
-
-  protected ExpirationDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
-    super(context, cancelable, cancelListener);
-  }
-
-  public static void show(final Context context,
-                          final int currentExpiration,
-                          final @NonNull OnClickListener listener)
-  {
-    final View view = createNumberPickerView(context, currentExpiration);
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(context.getString(R.string.ExpirationDialog_disappearing_messages));
-    builder.setView(view);
-    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
-      int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
-      listener.onClick(context.getResources().getIntArray(R.array.expiration_times)[selected]);
-    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
-  private static View createNumberPickerView(final Context context, final int currentExpiration) {
-    final LayoutInflater   inflater                = LayoutInflater.from(context);
-    final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
-    final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
-    final TextView         textView                = view.findViewById(R.id.expiration_details);
-    final int[]            expirationTimes         = context.getResources().getIntArray(R.array.expiration_times);
-    final String[]         expirationDisplayValues = new String[expirationTimes.length];
-
-    int selectedIndex = expirationTimes.length - 1;
-
-    for (int i=0;i<expirationTimes.length;i++) {
-      expirationDisplayValues[i] = ExpirationUtil.getExpirationDisplayValue(context, expirationTimes[i]);
-
-      if ((currentExpiration >= expirationTimes[i]) &&
-          (i == expirationTimes.length -1 || currentExpiration < expirationTimes[i+1])) {
-        selectedIndex = i;
-      }
-    }
-
-    numberPickerView.setDisplayedValues(expirationDisplayValues);
-    numberPickerView.setMinValue(0);
-    numberPickerView.setMaxValue(expirationTimes.length-1);
-
-    NumberPickerView.OnValueChangeListener listener = (picker, oldVal, newVal) -> {
-      if (newVal == 0) {
-        textView.setText(R.string.ExpirationDialog_your_messages_will_not_expire);
-      } else {
-        textView.setText(context.getString(R.string.ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen, picker.getDisplayedValues()[newVal]));
-      }
-    };
-
-    numberPickerView.setOnValueChangedListener(listener);
-    numberPickerView.setValue(selectedIndex);
-    listener.onValueChange(numberPickerView, selectedIndex, selectedIndex);
-
-    return view;
-  }
-
-  public interface OnClickListener {
-    public void onClick(int expirationTime);
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
new file mode 100644
index 0000000000..c12f9c46eb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
@@ -0,0 +1,53 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import cn.carbswang.android.numberpickerview.library.NumberPickerView
+import network.loki.messenger.R
+import org.session.libsession.utilities.ExpirationUtil
+
+fun Context.showExpirationDialog(
+    currentExpiration: Int,
+    onExpirationTime: (Int) -> Unit
+): AlertDialog {
+    val view = LayoutInflater.from(this).inflate(R.layout.expiration_dialog, null)
+    val numberPickerView = view.findViewById<NumberPickerView>(R.id.expiration_number_picker)
+
+    fun updateText(index: Int) {
+        view.findViewById<TextView>(R.id.expiration_details).text = when (index) {
+            0 -> getString(R.string.ExpirationDialog_your_messages_will_not_expire)
+            else -> getString(
+                R.string.ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen,
+                numberPickerView.displayedValues[index]
+            )
+        }
+    }
+
+    val expirationTimes = resources.getIntArray(R.array.expiration_times)
+    val expirationDisplayValues = expirationTimes
+        .map { ExpirationUtil.getExpirationDisplayValue(this, it) }
+        .toTypedArray()
+
+    val selectedIndex = expirationTimes.withIndex()
+        .firstOrNull { it.value >= currentExpiration }?.index
+        ?: (expirationTimes.size - 1)
+
+    numberPickerView.apply {
+        displayedValues = expirationDisplayValues
+        minValue = 0
+        maxValue = expirationTimes.size - 1
+        setOnValueChangedListener { _, _, index -> updateText(index) }
+        value = selectedIndex
+    }
+
+    updateText(selectedIndex)
+
+    return sessionDialog {
+        title(getString(R.string.ExpirationDialog_disappearing_messages))
+        view(view)
+        okButton { onExpirationTime(numberPickerView.let { expirationTimes[it.value] }) }
+        cancelButton()
+    }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 10d86e4a9f..e76591a9ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -29,8 +29,8 @@ annotation class DialogDsl
 @DialogDsl
 class SessionDialogBuilder(val context: Context) {
 
-    val dp20 = toPx(20, context.resources)
-    val dp40 = toPx(40, context.resources)
+    private val dp20 = toPx(20, context.resources)
+    private val dp40 = toPx(40, context.resources)
 
     private val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(context)
 
@@ -114,6 +114,7 @@ class SessionDialogBuilder(val context: Context) {
         listener
     )
 
+    fun okButton(listener: (() -> Unit) = {}) = button(android.R.string.ok, listener = listener)
     fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel_button, listener = listener)
 
     fun button(
@@ -132,8 +133,8 @@ class SessionDialogBuilder(val context: Context) {
             }
         }.let(buttonLayout::addView)
 
-    fun create(): AlertDialog = dialogBuilder.create()
-    fun show(): AlertDialog = dialogBuilder.show()
+    fun create(): AlertDialog = dialogBuilder.create().also { dialog = it }
+    fun show(): AlertDialog = dialogBuilder.show().also { dialog = it }
 }
 
 fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
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 166c8f8267..81a559f7cf 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
@@ -70,9 +70,7 @@ import org.session.libsignal.utilities.ListenableFuture
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.hexEncodedPrivateKey
-import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.ExpirationDialog
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.*
 import org.thoughtcrime.securesms.attachments.ScreenshotObserver
 import org.thoughtcrime.securesms.audio.AudioRecorder
 import org.thoughtcrime.securesms.contacts.SelectContactsActivity.Companion.selectedContactsKey
@@ -113,7 +111,6 @@ import org.thoughtcrime.securesms.mms.*
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.reactions.ReactionsDialogFragment
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiDialogFragment
-import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -1001,13 +998,13 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             val group = groupDb.getGroup(thread.address.toGroupString()).orNull()
             if (group?.isActive == false) { return }
         }
-        ExpirationDialog.show(this, thread.expireMessages) { expirationTime: Int ->
+        showExpirationDialog(thread.expireMessages) { expirationTime ->
             recipientDb.setExpireMessages(thread, expirationTime)
             val message = ExpirationTimerUpdate(expirationTime)
             message.recipient = thread.address.serialize()
             message.sentTimestamp = SnodeAPI.nowWithOffset
-            val expiringMessageManager = ApplicationContext.getInstance(this).expiringMessageManager
-            expiringMessageManager.setExpirationTimer(message)
+            ApplicationContext.getInstance(this)
+                .expiringMessageManager.setExpirationTimer(message)
             MessageSender.send(message, thread.address)
             invalidateOptionsMenu()
         }

From 80f21aeb410f949598c37ac7b4a4717a89b65ffc Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 22:23:46 +0930
Subject: [PATCH 10/19] Convert PrivacySettingsPreferenceFragment to Kotlin

---
 .../preferences/CallToggleListener.kt         |   2 +-
 .../PrivacySettingsPreferenceFragment.java    | 153 ------------------
 .../PrivacySettingsPreferenceFragment.kt      | 147 +++++++++++++++++
 3 files changed, 148 insertions(+), 154 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
index a8042ad3b4..815a5d6050 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.sessionDialog
 
 internal class CallToggleListener(
     private val context: Fragment,
-    private val setCallback: Function1<Boolean?, Void>
+    private val setCallback: (Boolean) -> Unit
 ) : Preference.OnPreferenceChangeListener {
 
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
deleted file mode 100644
index e7fbd14f95..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.thoughtcrime.securesms.preferences;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.preference.Preference;
-
-import org.session.libsession.utilities.TextSecurePreferences;
-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.CallNotificationBuilder;
-import org.thoughtcrime.securesms.util.IntentUtils;
-
-import network.loki.messenger.BuildConfig;
-import network.loki.messenger.R;
-
-public class PrivacySettingsPreferenceFragment extends ListSummaryPreferenceFragment {
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-  }
-
-  @Override
-  public void onCreate(Bundle paramBundle) {
-    super.onCreate(paramBundle);
-
-    this.findPreference(TextSecurePreferences.SCREEN_LOCK).setOnPreferenceChangeListener(new ScreenLockListener());
-
-    this.findPreference(TextSecurePreferences.READ_RECEIPTS_PREF).setOnPreferenceChangeListener(new ReadReceiptToggleListener());
-    this.findPreference(TextSecurePreferences.TYPING_INDICATORS).setOnPreferenceChangeListener(new TypingIndicatorsToggleListener());
-    this.findPreference(TextSecurePreferences.LINK_PREVIEWS).setOnPreferenceChangeListener(new LinkPreviewToggleListener());
-    this.findPreference(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED).setOnPreferenceChangeListener(new CallToggleListener(this, this::setCall));
-
-    initializeVisibility();
-  }
-
-  private Void setCall(boolean isEnabled) {
-    ((SwitchPreferenceCompat)findPreference(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED)).setChecked(isEnabled);
-    if (isEnabled && !CallNotificationBuilder.areNotificationsEnabled(requireActivity())) {
-      // show a dialog saying that calls won't work properly if you don't have notifications on at a system level
-      new AlertDialog.Builder(new ContextThemeWrapper(requireActivity(), R.style.ThemeOverlay_Session_AlertDialog))
-              .setTitle(R.string.CallNotificationBuilder_system_notification_title)
-              .setMessage(R.string.CallNotificationBuilder_system_notification_message)
-              .setPositiveButton(R.string.activity_notification_settings_title, (d, w) -> {
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                  Intent settingsIntent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                          .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                          .putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID);
-                  if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
-                    startActivity(settingsIntent);
-                  }
-                } else {
-                  Intent settingsIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                          .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                          .setData(Uri.parse("package:"+BuildConfig.APPLICATION_ID));
-                  if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
-                    startActivity(settingsIntent);
-                  }
-                }
-                d.dismiss();
-              })
-              .setNeutralButton(R.string.dismiss, (d, w) -> {
-                // do nothing, user might have broken notifications
-                d.dismiss();
-              })
-              .show();
-    }
-    return null;
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  @Override
-  public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
-    addPreferencesFromResource(R.xml.preferences_app_protection);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-  }
-
-  private void initializeVisibility() {
-    if (TextSecurePreferences.isPasswordDisabled(getContext())) {
-      KeyguardManager keyguardManager = (KeyguardManager)getContext().getSystemService(Context.KEYGUARD_SERVICE);
-      if (!keyguardManager.isKeyguardSecure()) {
-        ((SwitchPreferenceCompat)findPreference(TextSecurePreferences.SCREEN_LOCK)).setChecked(false);
-        findPreference(TextSecurePreferences.SCREEN_LOCK).setEnabled(false);
-      }
-    } else {
-      findPreference(TextSecurePreferences.SCREEN_LOCK).setVisible(false);
-      findPreference(TextSecurePreferences.SCREEN_LOCK_TIMEOUT).setVisible(false);
-    }
-  }
-
-  private class ScreenLockListener implements Preference.OnPreferenceChangeListener {
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-      boolean enabled = (Boolean)newValue;
-
-      TextSecurePreferences.setScreenLockEnabled(getContext(), enabled);
-
-      Intent intent = new Intent(getContext(), KeyCachingService.class);
-      intent.setAction(KeyCachingService.LOCK_TOGGLED_EVENT);
-      getContext().startService(intent);
-      return true;
-    }
-  }
-
-  private class ReadReceiptToggleListener implements Preference.OnPreferenceChangeListener {
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-      return true;
-    }
-  }
-
-  private class TypingIndicatorsToggleListener implements Preference.OnPreferenceChangeListener {
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-      boolean enabled = (boolean)newValue;
-
-      if (!enabled) {
-        ApplicationContext.getInstance(requireContext()).getTypingStatusRepository().clear();
-      }
-
-      return true;
-    }
-  }
-
-  private class LinkPreviewToggleListener implements Preference.OnPreferenceChangeListener {
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-      return true;
-    }
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
new file mode 100644
index 0000000000..10c5336df1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
@@ -0,0 +1,147 @@
+package org.thoughtcrime.securesms.preferences
+
+import android.app.AlertDialog
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.preference.Preference
+import network.loki.messenger.BuildConfig
+import network.loki.messenger.R
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.TextSecurePreferences.Companion.isPasswordDisabled
+import org.session.libsession.utilities.TextSecurePreferences.Companion.setScreenLockEnabled
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+import org.thoughtcrime.securesms.permissions.Permissions
+import org.thoughtcrime.securesms.service.KeyCachingService
+import org.thoughtcrime.securesms.util.CallNotificationBuilder.Companion.areNotificationsEnabled
+import org.thoughtcrime.securesms.util.IntentUtils
+
+class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
+    override fun onCreate(paramBundle: Bundle?) {
+        super.onCreate(paramBundle)
+        findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.onPreferenceChangeListener =
+            ScreenLockListener()
+        findPreference<Preference>(TextSecurePreferences.READ_RECEIPTS_PREF)!!.onPreferenceChangeListener =
+            ReadReceiptToggleListener()
+        findPreference<Preference>(TextSecurePreferences.TYPING_INDICATORS)!!.onPreferenceChangeListener =
+            TypingIndicatorsToggleListener()
+        findPreference<Preference>(TextSecurePreferences.LINK_PREVIEWS)!!.onPreferenceChangeListener =
+            LinkPreviewToggleListener()
+        findPreference<Preference>(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED)!!.onPreferenceChangeListener =
+            CallToggleListener(this) { setCall(it) }
+        initializeVisibility()
+    }
+
+    private fun setCall(isEnabled: Boolean) {
+        (findPreference<Preference>(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED) as SwitchPreferenceCompat?)!!.isChecked =
+            isEnabled
+        if (isEnabled && !areNotificationsEnabled(requireActivity())) {
+            // show a dialog saying that calls won't work properly if you don't have notifications on at a system level
+            AlertDialog.Builder(
+                ContextThemeWrapper(
+                    requireActivity(),
+                    R.style.ThemeOverlay_Session_AlertDialog
+                )
+            )
+                .setTitle(R.string.CallNotificationBuilder_system_notification_title)
+                .setMessage(R.string.CallNotificationBuilder_system_notification_message)
+                .setPositiveButton(R.string.activity_notification_settings_title) { d: DialogInterface, w: Int ->
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        val settingsIntent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID)
+                        if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
+                            startActivity(settingsIntent)
+                        }
+                    } else {
+                        val settingsIntent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID))
+                        if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
+                            startActivity(settingsIntent)
+                        }
+                    }
+                    d.dismiss()
+                }
+                .setNeutralButton(R.string.dismiss) { d: DialogInterface, w: Int ->
+                    // do nothing, user might have broken notifications
+                    d.dismiss()
+                }
+                .show()
+        }
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        addPreferencesFromResource(R.xml.preferences_app_protection)
+    }
+
+    override fun onResume() {
+        super.onResume()
+    }
+
+    private fun initializeVisibility() {
+        if (isPasswordDisabled(context!!)) {
+            val keyguardManager =
+                context!!.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            if (!keyguardManager.isKeyguardSecure) {
+                (findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK) as SwitchPreferenceCompat?)!!.isChecked =
+                    false
+                findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.isEnabled =
+                    false
+            }
+        } else {
+            findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.isVisible = false
+            findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK_TIMEOUT)!!.isVisible =
+                false
+        }
+    }
+
+    private inner class ScreenLockListener : Preference.OnPreferenceChangeListener {
+        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+            val enabled = newValue as Boolean
+            setScreenLockEnabled(context!!, enabled)
+            val intent = Intent(context, KeyCachingService::class.java)
+            intent.action = KeyCachingService.LOCK_TOGGLED_EVENT
+            context!!.startService(intent)
+            return true
+        }
+    }
+
+    private inner class ReadReceiptToggleListener : Preference.OnPreferenceChangeListener {
+        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+            return true
+        }
+    }
+
+    private inner class TypingIndicatorsToggleListener : Preference.OnPreferenceChangeListener {
+        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+            val enabled = newValue as Boolean
+            if (!enabled) {
+                ApplicationContext.getInstance(requireContext()).typingStatusRepository.clear()
+            }
+            return true
+        }
+    }
+
+    private inner class LinkPreviewToggleListener : Preference.OnPreferenceChangeListener {
+        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
+            return true
+        }
+    }
+}
\ No newline at end of file

From 72c07f4b9918dfcbf42d580067147fd426882cb6 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Wed, 31 May 2023 23:23:53 +0930
Subject: [PATCH 11/19] Utilise dialog dsl in PrivacySettingsPreferenceFragment

---
 .../securesms/SessionDialogBuilder.kt         |  4 +-
 .../conversation/v2/dialogs/BlockedDialog.kt  |  4 +-
 .../conversation/v2/dialogs/DownloadDialog.kt |  4 +-
 .../v2/dialogs/JoinOpenGroupDialog.kt         |  4 +-
 .../v2/dialogs/LinkPreviewDialog.kt           |  4 +-
 .../conversation/v2/dialogs/SendSeedDialog.kt |  4 +-
 .../preferences/CallToggleListener.kt         |  4 +-
 .../preferences/ClearAllDataDialog.kt         |  4 +-
 .../PrivacySettingsPreferenceFragment.kt      | 81 ++++++-------------
 .../securesms/preferences/SeedDialog.kt       |  3 +-
 .../securesms/preferences/ShareLogsDialog.kt  |  4 +-
 11 files changed, 46 insertions(+), 74 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index e76591a9ec..a516e89947 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -140,5 +140,7 @@ class SessionDialogBuilder(val context: Context) {
 fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
     SessionDialogBuilder(this).apply { build() }.show()
 
-fun Fragment.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
+fun Fragment.showSessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
+    SessionDialogBuilder(requireContext()).apply { build() }.show()
+fun Fragment.createSessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
     SessionDialogBuilder(requireContext()).apply { build() }.create()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
index e4a1c5fd9f..89a80be318 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
@@ -10,13 +10,13 @@ import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
-import org.thoughtcrime.securesms.sessionDialog
 
 /** Shown upon sending a message to a user that's blocked. */
 class BlockedDialog(private val recipient: Recipient) : DialogFragment() {
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         val contactDB = DatabaseComponent.get(requireContext()).sessionContactDatabase()
         val sessionID = recipient.address.toString()
         val contact = contactDB.getContactWithSessionID(sessionID)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
index ee1ef01f2b..5edd63f100 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt
@@ -13,9 +13,9 @@ import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.jobs.AttachmentDownloadJob
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.database.SessionContactDatabase
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
-import org.thoughtcrime.securesms.sessionDialog
 import javax.inject.Inject
 
 /** Shown when receiving media from a contact for the first time, to confirm that
@@ -25,7 +25,7 @@ class DownloadDialog(private val recipient: Recipient) : DialogFragment() {
 
     @Inject lateinit var contactDB: SessionContactDatabase
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         val sessionID = recipient.address.toString()
         val contact = contactDB.getContactWithSessionID(sessionID)
         val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
index 3d33f4fe87..e4cbd6ecee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/JoinOpenGroupDialog.kt
@@ -12,14 +12,14 @@ import network.loki.messenger.R
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.utilities.OpenGroupUrlParser
 import org.session.libsignal.utilities.ThreadUtils
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.groups.OpenGroupManager
-import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 /** Shown upon tapping an open group invitation. */
 class JoinOpenGroupDialog(private val name: String, private val url: String) : DialogFragment() {
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(resources.getString(R.string.dialog_join_open_group_title, name))
         val explanation = resources.getString(R.string.dialog_join_open_group_explanation, name)
         val spannable = SpannableStringBuilder(explanation)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
index f8eb7e4415..996dd41f94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt
@@ -5,13 +5,13 @@ import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.createSessionDialog
 
 /** Shown the first time the user inputs a URL that could generate a link preview, to
  * let them know that Session offers the ability to send and receive link previews. */
 class LinkPreviewDialog(private val onEnabled: () -> Unit) : DialogFragment() {
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.dialog_link_preview_title)
         text(R.string.dialog_link_preview_explanation)
         button(R.string.dialog_link_preview_enable_button_title) { enable() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
index b030da29f0..6abb0814d6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/SendSeedDialog.kt
@@ -4,12 +4,12 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.createSessionDialog
 
 /** Shown if the user is about to send their recovery phrase to someone. */
 class SendSeedDialog(private val proceed: (() -> Unit)? = null) : DialogFragment() {
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.dialog_send_seed_title)
         text(R.string.dialog_send_seed_explanation)
         button(R.string.dialog_send_seed_send_button_title) { send() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
index 815a5d6050..da166e63f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
@@ -6,8 +6,10 @@ import androidx.preference.Preference
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.TextSecurePreferences.Companion.setBooleanPreference
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 
 internal class CallToggleListener(
     private val context: Fragment,
@@ -18,7 +20,7 @@ internal class CallToggleListener(
         if (newValue == false) return true
 
         // check if we've shown the info dialog and check for microphone permissions
-        context.sessionDialog {
+        context.showSessionDialog {
             title(R.string.dialog_voice_video_title)
             text(R.string.dialog_voice_video_message)
             button(R.string.dialog_link_preview_enable_button_title, R.string.AccessibilityId_enable) { requestMicrophonePermission() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
index 17543f87d5..37a54a4afc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt
@@ -18,7 +18,7 @@ import network.loki.messenger.databinding.DialogClearAllDataBinding
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 class ClearAllDataDialog : DialogFragment() {
@@ -38,7 +38,7 @@ class ClearAllDataDialog : DialogFragment() {
             updateUI()
         }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         view(createView())
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
index 10c5336df1..eaf48f8688 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/PrivacySettingsPreferenceFragment.kt
@@ -1,15 +1,12 @@
 package org.thoughtcrime.securesms.preferences
 
-import android.app.AlertDialog
 import android.app.KeyguardManager
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import androidx.appcompat.view.ContextThemeWrapper
 import androidx.preference.Preference
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
@@ -20,22 +17,19 @@ import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.service.KeyCachingService
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.CallNotificationBuilder.Companion.areNotificationsEnabled
 import org.thoughtcrime.securesms.util.IntentUtils
 
 class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
     override fun onCreate(paramBundle: Bundle?) {
         super.onCreate(paramBundle)
-        findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.onPreferenceChangeListener =
-            ScreenLockListener()
-        findPreference<Preference>(TextSecurePreferences.READ_RECEIPTS_PREF)!!.onPreferenceChangeListener =
-            ReadReceiptToggleListener()
-        findPreference<Preference>(TextSecurePreferences.TYPING_INDICATORS)!!.onPreferenceChangeListener =
-            TypingIndicatorsToggleListener()
-        findPreference<Preference>(TextSecurePreferences.LINK_PREVIEWS)!!.onPreferenceChangeListener =
-            LinkPreviewToggleListener()
-        findPreference<Preference>(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED)!!.onPreferenceChangeListener =
-            CallToggleListener(this) { setCall(it) }
+        findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!
+            .onPreferenceChangeListener = ScreenLockListener()
+        findPreference<Preference>(TextSecurePreferences.TYPING_INDICATORS)!!
+            .onPreferenceChangeListener = TypingIndicatorsToggleListener()
+        findPreference<Preference>(TextSecurePreferences.CALL_NOTIFICATIONS_ENABLED)!!
+            .onPreferenceChangeListener = CallToggleListener(this) { setCall(it) }
         initializeVisibility()
     }
 
@@ -44,37 +38,24 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
             isEnabled
         if (isEnabled && !areNotificationsEnabled(requireActivity())) {
             // show a dialog saying that calls won't work properly if you don't have notifications on at a system level
-            AlertDialog.Builder(
-                ContextThemeWrapper(
-                    requireActivity(),
-                    R.style.ThemeOverlay_Session_AlertDialog
-                )
-            )
-                .setTitle(R.string.CallNotificationBuilder_system_notification_title)
-                .setMessage(R.string.CallNotificationBuilder_system_notification_message)
-                .setPositiveButton(R.string.activity_notification_settings_title) { d: DialogInterface, w: Int ->
+            showSessionDialog {
+                title(R.string.CallNotificationBuilder_system_notification_title)
+                text(R.string.CallNotificationBuilder_system_notification_message)
+                button(R.string.activity_notification_settings_title) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        val settingsIntent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
                             .putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID)
-                        if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
-                            startActivity(settingsIntent)
-                        }
                     } else {
-                        val settingsIntent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                             .setData(Uri.parse("package:" + BuildConfig.APPLICATION_ID))
-                        if (IntentUtils.isResolvable(requireContext(), settingsIntent)) {
-                            startActivity(settingsIntent)
-                        }
                     }
-                    d.dismiss()
+                        .apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
+                        .takeIf { IntentUtils.isResolvable(requireContext(), it) }.let {
+                        startActivity(it)
+                    }
                 }
-                .setNeutralButton(R.string.dismiss) { d: DialogInterface, w: Int ->
-                    // do nothing, user might have broken notifications
-                    d.dismiss()
-                }
-                .show()
+                button(R.string.dismiss)
+            }
         }
     }
 
@@ -96,19 +77,16 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
     }
 
     private fun initializeVisibility() {
-        if (isPasswordDisabled(context!!)) {
+        if (isPasswordDisabled(requireContext())) {
             val keyguardManager =
-                context!!.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+                requireContext().getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
             if (!keyguardManager.isKeyguardSecure) {
-                (findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK) as SwitchPreferenceCompat?)!!.isChecked =
-                    false
-                findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.isEnabled =
-                    false
+                findPreference<SwitchPreferenceCompat>(TextSecurePreferences.SCREEN_LOCK)!!.isChecked = false
+                findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.isEnabled = false
             }
         } else {
             findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK)!!.isVisible = false
-            findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK_TIMEOUT)!!.isVisible =
-                false
+            findPreference<Preference>(TextSecurePreferences.SCREEN_LOCK_TIMEOUT)!!.isVisible = false
         }
     }
 
@@ -123,12 +101,6 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
         }
     }
 
-    private inner class ReadReceiptToggleListener : Preference.OnPreferenceChangeListener {
-        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
-            return true
-        }
-    }
-
     private inner class TypingIndicatorsToggleListener : Preference.OnPreferenceChangeListener {
         override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
             val enabled = newValue as Boolean
@@ -139,9 +111,4 @@ class PrivacySettingsPreferenceFragment : ListSummaryPreferenceFragment() {
         }
     }
 
-    private inner class LinkPreviewToggleListener : Preference.OnPreferenceChangeListener {
-        override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
-            return true
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
index d28027d72e..0bdaa477ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
@@ -10,6 +10,7 @@ import androidx.fragment.app.DialogFragment
 import network.loki.messenger.R
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.hexEncodedPrivateKey
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MnemonicUtilities
 import org.thoughtcrime.securesms.sessionDialog
@@ -23,7 +24,7 @@ class SeedDialog: DialogFragment() {
             .encode(hexEncodedSeed, MnemonicCodec.Language.Configuration.english)
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.dialog_seed_title)
         text(R.string.dialog_seed_explanation)
         text(seed, R.style.SessionIDTextView)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
index 71855bd1ee..e3be429e3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
@@ -24,7 +24,7 @@ import network.loki.messenger.R
 import org.session.libsignal.utilities.ExternalStorageUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.util.FileProviderUtil
 import org.thoughtcrime.securesms.util.StreamUtil
 import java.io.File
@@ -37,7 +37,7 @@ class ShareLogsDialog : DialogFragment() {
 
     private var shareJob: Job? = null
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = sessionDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
         title(R.string.dialog_share_logs_title)
         text(R.string.dialog_share_logs_explanation)
         button(R.string.share) { shareLogs() }

From 4641512644df1d25728e7318183f68d7b8f05ce2 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 2 Jun 2023 19:11:58 +0930
Subject: [PATCH 12/19] Utilise dialog dsl in RationaleDialog

---
 .../securesms/ExpirationDialog.kt             |  2 +-
 .../org/thoughtcrime/securesms/MuteDialog.kt  |  6 +-
 .../securesms/SessionDialogBuilder.kt         |  2 +-
 .../conversation/v2/ConversationActivityV2.kt | 15 +++--
 .../conversation/v2/ConversationAdapter.kt    |  5 +-
 .../v2/menus/ConversationMenuHelper.kt        |  8 +--
 .../v2/utilities/NotificationUtils.kt         |  4 +-
 .../securesms/home/HomeActivity.kt            | 11 ++--
 .../MessageRequestsActivity.kt                |  9 ++-
 .../securesms/onboarding/PNModeActivity.kt    |  5 +-
 .../securesms/permissions/Permissions.java    | 14 ++---
 .../permissions/RationaleDialog.java          | 56 -------------------
 .../securesms/permissions/RationaleDialog.kt  | 54 ++++++++++++++++++
 .../preferences/BlockedContactsActivity.kt    |  5 +-
 .../preferences/CallToggleListener.kt         |  2 -
 .../preferences/ListPreferenceDialog.kt       |  4 +-
 .../securesms/preferences/SeedDialog.kt       |  1 -
 .../securesms/preferences/SettingsActivity.kt |  5 +-
 .../securesms/util/SaveAttachmentTask.kt      |  4 +-
 19 files changed, 96 insertions(+), 116 deletions(-)
 delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
index c12f9c46eb..cab11c907f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
@@ -44,7 +44,7 @@ fun Context.showExpirationDialog(
 
     updateText(selectedIndex)
 
-    return sessionDialog {
+    return showSessionDialog {
         title(getString(R.string.ExpirationDialog_disappearing_messages))
         view(view)
         okButton { onExpirationTime(numberPickerView.let { expirationTimes[it.value] }) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
index 96523d2e7d..f294e387ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt
@@ -1,19 +1,15 @@
 package org.thoughtcrime.securesms
 
 import android.content.Context
-import android.content.DialogInterface
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import network.loki.messenger.R
-import java.math.BigInteger
-import java.time.Instant
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 fun showMuteDialog(
     context: Context,
     onMuteDuration: (Long) -> Unit
-): AlertDialog = context.sessionDialog {
+): AlertDialog = context.showSessionDialog {
     title(R.string.MuteDialog_mute_notifications)
     items(Option.values().map { it.stringRes }.map(context::getString).toTypedArray()) {
         onMuteDuration(Option.values()[it].getTime())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index a516e89947..96bc32f14e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -137,7 +137,7 @@ class SessionDialogBuilder(val context: Context) {
     fun show(): AlertDialog = dialogBuilder.show().also { dialog = it }
 }
 
-fun Context.sessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
+fun Context.showSessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
     SessionDialogBuilder(this).apply { build() }.show()
 
 fun Fragment.showSessionDialog(build: SessionDialogBuilder.() -> Unit): AlertDialog =
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 81a559f7cf..688f5ecd39 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
@@ -20,7 +20,6 @@ import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.annotation.DimenRes
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
@@ -960,7 +959,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun block(deleteThread: Boolean) {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
             destructiveButton(R.string.RecipientPreferenceActivity_block, R.string.AccessibilityId_block_confirm) {
@@ -1011,7 +1010,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun unblock() {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.ConversationActivity_unblock_this_contact_question)
             text(R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
             destructiveButton(
@@ -1455,7 +1454,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     private fun showGIFPicker() {
         val hasSeenGIFMetaDataWarning: Boolean = textSecurePreferences.hasSeenGIFMetaDataWarning()
         if (!hasSeenGIFMetaDataWarning) {
-            sessionDialog {
+            showSessionDialog {
                 title(R.string.giphy_permission_title)
                 text(R.string.giphy_permission_message)
                 button(R.string.continue_2) {
@@ -1618,7 +1617,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         if (recipient.isOpenGroupRecipient) {
             val messageCount = 1
 
-            sessionDialog {
+            showSessionDialog {
                 title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
                 text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
                 button(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
@@ -1645,7 +1644,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         } else {
             val messageCount = 1
 
-            sessionDialog {
+            showSessionDialog {
                 title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
                 text(resources.getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messageCount, messageCount))
                 button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
@@ -1655,7 +1654,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun banUser(messages: Set<MessageRecord>) {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.ConversationFragment_ban_selected_user)
             text("This will ban the selected user from this room. It won't ban them from other rooms.")
             button(R.string.ban) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
@@ -1664,7 +1663,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun banAndDeleteAll(messages: Set<MessageRecord>) {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.ConversationFragment_ban_selected_user)
             text("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there.")
             button(R.string.ban) { viewModel.banAndDeleteAll(messages.first().individualRecipient); endActionMode() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 325b411290..ca7e1de780 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.conversation.v2
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.database.Cursor
@@ -31,7 +30,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 
 class ConversationAdapter(
     context: Context,
@@ -147,7 +146,7 @@ class ConversationAdapter(
                 viewHolder.view.bind(message, messageBefore)
                 if (message.isCallLog && message.isFirstMissedCall) {
                     viewHolder.view.setOnClickListener {
-                        context.sessionDialog {
+                        context.showSessionDialog {
                             title(R.string.CallNotificationBuilder_first_call_title)
                             text(R.string.CallNotificationBuilder_first_call_message)
                             button(R.string.activity_settings_title) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 20335aec59..11add657f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.conversation.v2.menus
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.PorterDuff
@@ -15,7 +14,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.ColorInt
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.widget.SearchView
@@ -44,7 +42,7 @@ import org.thoughtcrime.securesms.groups.EditClosedGroupActivity
 import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.groupIDKey
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.service.WebRtcCallService
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.util.BitmapUtil
 import java.io.IOException
@@ -187,7 +185,7 @@ object ConversationMenuHelper {
     private fun call(context: Context, thread: Recipient) {
 
         if (!TextSecurePreferences.isCallNotificationsEnabled(context)) {
-            context.sessionDialog {
+            context.showSessionDialog {
                 title(R.string.ConversationActivity_call_title)
                 text(R.string.ConversationActivity_call_prompt)
                 button(R.string.activity_settings_title, R.string.AccessibilityId_settings) {
@@ -303,7 +301,7 @@ object ConversationMenuHelper {
 
         fun onLeaveFailed() = Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
 
-        context.sessionDialog {
+        context.showSessionDialog {
             title(R.string.ConversationActivity_leave_group)
             text(message)
             button(R.string.yes) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
index 0a6f839405..c0ce83f631 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/NotificationUtils.kt
@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.conversation.v2.utilities
 import android.content.Context
 import network.loki.messenger.R
 import org.session.libsession.utilities.recipients.Recipient
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 
 object NotificationUtils {
     fun showNotifyDialog(context: Context, thread: Recipient, notifyTypeHandler: (Int)->Unit) {
-        context.sessionDialog {
+        context.showSessionDialog {
             title(R.string.RecipientPreferenceActivity_notification_settings)
             singleChoiceItems(
                 context.resources.getStringArray(R.array.notify_types),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index adcae62f58..2470c0ed04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -10,7 +10,6 @@ import android.os.Bundle
 import android.text.SpannableString
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
@@ -62,7 +61,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.onboarding.SeedActivity
 import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.preferences.SettingsActivity
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.util.DateUtils
@@ -489,7 +488,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun blockConversation(thread: ThreadRecord) {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact)
             button(R.string.RecipientPreferenceActivity_block) {
@@ -505,7 +504,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun unblockConversation(thread: ThreadRecord) {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.RecipientPreferenceActivity_unblock_this_contact_question)
             text(R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact)
             button(R.string.RecipientPreferenceActivity_unblock) {
@@ -576,7 +575,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
             resources.getString(R.string.activity_home_delete_conversation_dialog_message)
         }
 
-        sessionDialog {
+        showSessionDialog {
             text(message)
             button(R.string.yes) {
                 lifecycleScope.launch(Dispatchers.Main) {
@@ -643,7 +642,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun hideMessageRequests() {
-        sessionDialog {
+        showSessionDialog {
             text("Hide message requests?")
             button(R.string.yes) {
                 textSecurePreferences.setHasHiddenMessageRequests()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
index 4618ed0bda..60942fd72b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.messagerequests
 
-import android.app.AlertDialog
 import android.content.Intent
 import android.database.Cursor
 import android.os.Bundle
@@ -20,7 +19,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 import org.thoughtcrime.securesms.util.push
 import javax.inject.Inject
@@ -83,7 +82,7 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
             LoaderManager.getInstance(this).restartLoader(0, null, this)
         }
 
-        sessionDialog {
+        showSessionDialog {
             title(R.string.RecipientPreferenceActivity_block_this_contact_question)
                 text(R.string.message_requests_block_message)
                 button(R.string.recipient_preferences__block) { doBlock() }
@@ -100,7 +99,7 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
             }
         }
 
-        sessionDialog {
+        showSessionDialog {
             title(R.string.decline)
             text(resources.getString(R.string.message_requests_decline_message))
             button(R.string.decline) { doDecline() }
@@ -123,7 +122,7 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
             }
         }
 
-        sessionDialog {
+        showSessionDialog {
             text(resources.getString(R.string.message_requests_clear_all_message))
             button(R.string.yes) { doDeleteAllAndBlock() }
             button(R.string.no)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
index fe1139d031..42f3a85b47 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.onboarding
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.app.AlertDialog
 import android.content.Intent
 import android.graphics.drawable.TransitionDrawable
 import android.net.Uri
@@ -20,7 +19,7 @@ import org.session.libsession.utilities.ThemeUtil
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.home.HomeActivity
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.GlowViewUtilities
 import org.thoughtcrime.securesms.util.PNModeView
 import org.thoughtcrime.securesms.util.disableClipping
@@ -152,7 +151,7 @@ class PNModeActivity : BaseActionBarActivity() {
 
     private fun register() {
         if (selectedOptionView == null) {
-            sessionDialog {
+            showSessionDialog {
                 title(R.string.activity_pn_mode_no_option_picked_dialog_title)
                 button(R.string.ok)
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index 2d7e6dae59..8cda4ab95b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -162,15 +162,13 @@ public class Permissions {
       request.onResult(requestedPermissions, grantResults, new boolean[requestedPermissions.length]);
     }
 
-    @SuppressWarnings("ConstantConditions")
     private void executePermissionsRequestWithRationale(PermissionsRequest request) {
-      AlertDialog dialog = RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
-              .setPositiveButton(R.string.Permissions_continue, (d, which) -> executePermissionsRequest(request))
-              .setNegativeButton(R.string.Permissions_not_now, (d, which) -> executeNoPermissionsRequest(request))
-              .show();
-      dialog.getWindow().setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
-      Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-      positiveButton.setContentDescription("Continue");
+      RationaleDialog.show(
+        permissionObject.getContext(),
+        rationaleDialogMessage,
+        () -> executePermissionsRequest(request),
+        () -> executeNoPermissionsRequest(request),
+        rationalDialogHeader);
     }
 
     private void executePermissionsRequest(PermissionsRequest request) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
deleted file mode 100644
index a346d591ac..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.thoughtcrime.securesms.permissions;
-
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.TextView;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-
-import org.session.libsession.utilities.ViewUtil;
-
-import network.loki.messenger.R;
-
-public class RationaleDialog {
-
-  public static AlertDialog.Builder createFor(@NonNull Context context, @NonNull String message, @DrawableRes int... drawables) {
-    View      view   = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null);
-    view.setClipToOutline(true);
-    ViewGroup header = view.findViewById(R.id.header_container);
-    TextView  text   = view.findViewById(R.id.message);
-
-    for (int i=0;i<drawables.length;i++) {
-      ImageView imageView = new ImageView(context);
-      imageView.setImageDrawable(context.getResources().getDrawable(drawables[i]));
-      imageView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-
-      header.addView(imageView);
-
-      if (i != drawables.length - 1) {
-        TextView plus = new TextView(context);
-        plus.setText("+");
-        plus.setTextSize(TypedValue.COMPLEX_UNIT_SP, 40);
-        plus.setTextColor(Color.WHITE);
-
-        LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(ViewUtil.dpToPx(context, 20), 0, ViewUtil.dpToPx(context, 20), 0);
-
-        plus.setLayoutParams(layoutParams);
-        header.addView(plus);
-      }
-    }
-
-    text.setText(message);
-
-    return new AlertDialog.Builder(context, R.style.ThemeOverlay_Session_AlertDialog).setView(view);
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
new file mode 100644
index 0000000000..0d784cdeea
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
@@ -0,0 +1,54 @@
+package org.thoughtcrime.securesms.permissions
+
+import android.content.Context
+import android.graphics.Color
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.content.res.ResourcesCompat
+import network.loki.messenger.R
+import org.session.libsession.utilities.ViewUtil
+import org.thoughtcrime.securesms.showSessionDialog
+
+object RationaleDialog {
+    @JvmStatic
+    fun show(
+        context: Context,
+        message: String,
+        onPositive: Runnable,
+        onNegative: Runnable,
+        @DrawableRes vararg drawables: Int
+    ): androidx.appcompat.app.AlertDialog {
+        val view = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null)
+            .apply { clipToOutline = true }
+        val header = view.findViewById<ViewGroup>(R.id.header_container)
+        view.findViewById<TextView>(R.id.message).text = message
+        drawables.forEach {
+            ImageView(context).apply {
+                setImageDrawable(ResourcesCompat.getDrawable(context.resources, it, context.theme))
+                layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
+            }.also(header::addView)
+        }
+        if (drawables.isNotEmpty()) {
+            TextView(context).apply {
+                text = "+"
+                setTextSize(TypedValue.COMPLEX_UNIT_SP, 40f)
+                setTextColor(Color.WHITE)
+                layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply {
+                    ViewUtil.dpToPx(context, 20).let { setMargins(it, 0, it, 0) }
+                }
+            }.also(header::addView)
+        }
+
+        return context.showSessionDialog {
+            view(view)
+            button(R.string.Permissions_continue) { onPositive.run() }
+            button(R.string.Permissions_not_now) { onNegative.run() }
+        }
+    }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
index 122e1b533c..bd7aa80192 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsActivity.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.preferences
 
-import android.app.AlertDialog
 import android.os.Bundle
 import android.view.View
 import androidx.activity.viewModels
@@ -9,7 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ActivityBlockedContactsBinding
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 
 @AndroidEntryPoint
 class BlockedContactsActivity: PassphraseRequiredActionBarActivity(), View.OnClickListener {
@@ -52,7 +51,7 @@ class BlockedContactsActivity: PassphraseRequiredActionBarActivity(), View.OnCli
                 getString(R.string.Unblock_dialog__message, stringBuilder.toString())
             }
 
-            sessionDialog {
+            showSessionDialog {
                 title(title)
                 text(message)
                 button(R.string.continue_2) { viewModel.unblock(contactsToUnblock) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
index da166e63f4..ea747798c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/CallToggleListener.kt
@@ -6,9 +6,7 @@ import androidx.preference.Preference
 import network.loki.messenger.R
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.TextSecurePreferences.Companion.setBooleanPreference
-import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.sessionDialog
 import org.thoughtcrime.securesms.showSessionDialog
 
 internal class CallToggleListener(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
index f49cfc39d8..6f0998eecb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ListPreferenceDialog.kt
@@ -3,14 +3,14 @@ package org.thoughtcrime.securesms.preferences
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.ListPreference
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 
 fun listPreferenceDialog(
     context: Context,
     listPreference: ListPreference,
     onChange: () -> Unit
 ) : AlertDialog = listPreference.run {
-    context.sessionDialog {
+    context.showSessionDialog {
         val index = entryValues.indexOf(value)
         val options = entries.map(CharSequence::toString).toTypedArray()
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
index 0bdaa477ac..bae5f19605 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt
@@ -13,7 +13,6 @@ import org.session.libsignal.utilities.hexEncodedPrivateKey
 import org.thoughtcrime.securesms.createSessionDialog
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MnemonicUtilities
-import org.thoughtcrime.securesms.sessionDialog
 
 class SeedDialog: DialogFragment() {
     private val seed by lazy {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index a78038c3eb..71416a2ca7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -16,7 +16,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
@@ -38,7 +37,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity
 import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.util.BitmapDecodingException
 import org.thoughtcrime.securesms.util.BitmapUtil
 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
@@ -261,7 +260,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     }
 
     private fun showEditProfilePictureUI() {
-        sessionDialog {
+        showSessionDialog {
             title(R.string.activity_settings_set_display_picture)
             view(R.layout.dialog_change_avatar)
             button(R.string.activity_settings_upload) { startAvatarSelection() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
index 66dc414c4d..8b219849a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
@@ -16,7 +16,7 @@ import org.session.libsession.utilities.task.ProgressDialogAsyncTask
 import org.session.libsignal.utilities.ExternalStorageUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.mms.PartAuthority
-import org.thoughtcrime.securesms.sessionDialog
+import org.thoughtcrime.securesms.showSessionDialog
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -46,7 +46,7 @@ class SaveAttachmentTask @JvmOverloads constructor(context: Context, count: Int
         @JvmStatic
         @JvmOverloads
         fun showWarningDialog(context: Context, count: Int = 1, onAcceptListener: () -> Unit = {}) {
-            context.sessionDialog {
+            context.showSessionDialog {
                 title(R.string.ConversationFragment_save_to_sd_card)
                 iconAttribute(R.attr.dialog_alert_icon)
                 text(context.resources.getQuantityString(

From 033eabbc535ac4ad5f528eceba68ba874798e1a1 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 2 Jun 2023 19:19:43 +0930
Subject: [PATCH 13/19] Utilise dialog dsl in SettingsDialog

---
 .../securesms/permissions/Permissions.java    | 18 +++-------------
 .../securesms/permissions/SettingsDialog.kt   | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index 8cda4ab95b..88ee67cb4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -255,7 +255,7 @@ public class Permissions {
     resultListener.onResult(permissions, grantResults, shouldShowRationaleDialog);
   }
 
-  private static Intent getApplicationSettingsIntent(@NonNull Context context) {
+  static Intent getApplicationSettingsIntent(@NonNull Context context) {
     Intent intent = new Intent();
     intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
     Uri uri = Uri.fromParts("package", context.getPackageName(), null);
@@ -352,20 +352,8 @@ public class Permissions {
     @Override
     public void run() {
       Context context = this.context.get();
-
-      if (context != null) {
-        AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.ThemeOverlay_Session_AlertDialog)
-            .setTitle(R.string.Permissions_permission_required)
-            .setMessage(message)
-            .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> context.startActivity(getApplicationSettingsIntent(context)))
-            .setNegativeButton(android.R.string.cancel, null)
-            .create();
-        Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        if (positiveButton != null) {
-          positiveButton.setContentDescription(context.getString(R.string.AccessibilityId_continue));
-        }
-        alertDialog.show();
-      }
+      if (context == null) return;
+      SettingsDialog.show(context, message);
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt
new file mode 100644
index 0000000000..a4efd8d870
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/SettingsDialog.kt
@@ -0,0 +1,21 @@
+package org.thoughtcrime.securesms.permissions
+
+import android.content.Context
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.showSessionDialog
+
+class SettingsDialog {
+    companion object {
+        @JvmStatic
+        fun show(context: Context, message: String) {
+            context.showSessionDialog {
+                title(R.string.Permissions_permission_required)
+                text(message)
+                button(R.string.Permissions_continue, R.string.AccessibilityId_continue) {
+                    context.startActivity(Permissions.getApplicationSettingsIntent(context))
+                }
+                cancelButton()
+            }
+        }
+    }
+}

From 975f9fc4d1e1db2d4475fa144f87aa1b3bf67fac Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 2 Jun 2023 22:05:34 +0930
Subject: [PATCH 14/19] Utilise dialog dsl in DeleteMediaDialog

---
 .../securesms/DeleteMediaDialog.kt            | 28 +++++++++++
 .../securesms/MediaOverviewActivity.java      | 47 +++++++------------
 2 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt
new file mode 100644
index 0000000000..af38c31ff3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaDialog.kt
@@ -0,0 +1,28 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import network.loki.messenger.R
+
+class DeleteMediaDialog {
+    companion object {
+        @JvmStatic
+        fun show(context: Context, recordCount: Int, doDelete: Runnable) = context.showSessionDialog {
+            iconAttribute(R.attr.dialog_alert_icon)
+            title(
+                context.resources.getQuantityString(
+                    R.plurals.MediaOverviewActivity_Media_delete_confirm_title,
+                    recordCount,
+                    recordCount
+                )
+            )
+            text(
+                context.resources.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message,
+                    recordCount,
+                    recordCount
+                )
+            )
+            button(R.string.delete) { doDelete.run() }
+            cancelButton()
+        }
+    }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
index e8af4e5a8e..95ba15c82e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -376,41 +376,26 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     @SuppressLint("StaticFieldLeak")
     private void handleDeleteMedia(@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords) {
       int recordCount       = mediaRecords.size();
-      Resources res         = getContext().getResources();
-      String confirmTitle   = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_title,
-                                                    recordCount,
-                                                    recordCount);
-      String confirmMessage = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message,
-                                                    recordCount,
-                                                    recordCount);
 
-      AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-      builder.setIconAttribute(R.attr.dialog_alert_icon);
-      builder.setTitle(confirmTitle);
-      builder.setMessage(confirmMessage);
-      builder.setCancelable(true);
-
-      builder.setPositiveButton(R.string.delete, (dialogInterface, i) -> {
-        new ProgressDialogAsyncTask<MediaDatabase.MediaRecord, Void, Void>(getContext(),
-                                                                           R.string.MediaOverviewActivity_Media_delete_progress_title,
-                                                                           R.string.MediaOverviewActivity_Media_delete_progress_message)
-        {
-          @Override
-          protected Void doInBackground(MediaDatabase.MediaRecord... records) {
-            if (records == null || records.length == 0) {
-              return null;
-            }
-
-            for (MediaDatabase.MediaRecord record : records) {
-              AttachmentUtil.deleteAttachment(getContext(), record.getAttachment());
-            }
+      DeleteMediaDialog.show(
+              requireContext(),
+              recordCount,
+              () -> new ProgressDialogAsyncTask<MediaDatabase.MediaRecord, Void, Void>(
+                requireContext(),
+                R.string.MediaOverviewActivity_Media_delete_progress_title,
+                R.string.MediaOverviewActivity_Media_delete_progress_message) {
+        @Override
+        protected Void doInBackground(MediaDatabase.MediaRecord... records) {
+          if (records == null || records.length == 0) {
             return null;
           }
 
-        }.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[mediaRecords.size()]));
-      });
-      builder.setNegativeButton(android.R.string.cancel, null);
-      builder.show();
+          for (MediaDatabase.MediaRecord record : records) {
+            AttachmentUtil.deleteAttachment(getContext(), record.getAttachment());
+          }
+          return null;
+        }
+      }.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[mediaRecords.size()])));
     }
 
     private void handleSelectAllMedia() {

From 94b48d5fb934c0b5a55b269720ff277d18008ba4 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 2 Jun 2023 22:36:15 +0930
Subject: [PATCH 15/19] Utilise dialog dsl in DeleteMediaPreviewDialog

---
 .../securesms/DeleteMediaPreviewDialog.kt     | 19 ++++++++++++
 .../securesms/MediaPreviewActivity.java       | 31 +++++++------------
 2 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt

diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt
new file mode 100644
index 0000000000..0390a3007d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import network.loki.messenger.R
+
+class DeleteMediaPreviewDialog {
+    companion object {
+        @JvmStatic
+        fun show(context: Context, doDelete: Runnable) {
+            context.showSessionDialog {
+                iconAttribute(R.attr.dialog_alert_icon)
+                title(R.string.MediaPreviewActivity_media_delete_confirmation_title)
+                text(R.string.MediaPreviewActivity_media_delete_confirmation_message)
+                button(R.string.delete) { doDelete.run() }
+                cancelButton()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index e3cb839bc3..008a45cfd1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -451,29 +451,20 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
       return;
     }
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
-    builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
-    builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
-    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
-      new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          if (mediaItem.attachment == null) {
-            return null;
-          }
-          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
-                                          mediaItem.attachment);
-          return null;
-        }
-      }.execute();
+    DeleteMediaPreviewDialog.show(this, () -> {
+            new AsyncTask<Void, Void, Void>() {
+              @Override
+              protected Void doInBackground(Void... voids) {
+                DatabaseAttachment attachment = mediaItem.attachment;
+                if (attachment != null) {
+                  AttachmentUtil.deleteAttachment(getApplicationContext(), attachment);
+                }
+                return null;
+              }
+            }.execute();
 
       finish();
     });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
   }
 
   @Override

From 09b241ba6775182d657c3f126a251029aeda346c Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 5 Jun 2023 11:11:59 +0930
Subject: [PATCH 16/19] Fix dialog#view(layoutRes)

---
 .../java/org/thoughtcrime/securesms/SessionDialogBuilder.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 96bc32f14e..141a98e4ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -77,7 +77,7 @@ class SessionDialogBuilder(val context: Context) {
 
     fun view(view: View) = contentView.addView(view)
 
-    fun view(@LayoutRes layout: Int) = contentView.addView(LayoutInflater.from(context).inflate(layout, contentView))
+    fun view(@LayoutRes layout: Int): View = LayoutInflater.from(context).inflate(layout, contentView)
 
     fun iconAttribute(@AttrRes icon: Int): AlertDialog.Builder = dialogBuilder.setIconAttribute(icon)
 

From 4ee8dc712efd500cc5a3a7c1328325563d35aa89 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 23 Jun 2023 11:42:19 +0930
Subject: [PATCH 17/19] Fix + button in rationale dialog

---
 .../securesms/permissions/RationaleDialog.kt       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
index 0d784cdeea..110661c001 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
@@ -28,13 +28,15 @@ object RationaleDialog {
             .apply { clipToOutline = true }
         val header = view.findViewById<ViewGroup>(R.id.header_container)
         view.findViewById<TextView>(R.id.message).text = message
-        drawables.forEach {
+
+        fun addIcon(id: Int) {
             ImageView(context).apply {
-                setImageDrawable(ResourcesCompat.getDrawable(context.resources, it, context.theme))
+                setImageDrawable(ResourcesCompat.getDrawable(context.resources, id, context.theme))
                 layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
             }.also(header::addView)
         }
-        if (drawables.isNotEmpty()) {
+
+        fun addPlus() {
             TextView(context).apply {
                 text = "+"
                 setTextSize(TypedValue.COMPLEX_UNIT_SP, 40f)
@@ -45,6 +47,12 @@ object RationaleDialog {
             }.also(header::addView)
         }
 
+        drawables.dropLast(1).forEach {
+            addIcon(it)
+            addPlus()
+        }
+        drawables.lastOrNull()?.let(::addIcon)
+
         return context.showSessionDialog {
             view(view)
             button(R.string.Permissions_continue) { onPositive.run() }

From 20eac67761db7993fdc6a9f3f9f55680c84d244b Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 23 Jun 2023 13:01:11 +0930
Subject: [PATCH 18/19] simplify

---
 .../securesms/permissions/RationaleDialog.kt           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
index 110661c001..373da62c12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.kt
@@ -10,6 +10,7 @@ import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams.WRAP_CONTENT
 import android.widget.TextView
 import androidx.annotation.DrawableRes
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.res.ResourcesCompat
 import network.loki.messenger.R
 import org.session.libsession.utilities.ViewUtil
@@ -23,7 +24,7 @@ object RationaleDialog {
         onPositive: Runnable,
         onNegative: Runnable,
         @DrawableRes vararg drawables: Int
-    ): androidx.appcompat.app.AlertDialog {
+    ): AlertDialog {
         val view = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null)
             .apply { clipToOutline = true }
         val header = view.findViewById<ViewGroup>(R.id.header_container)
@@ -47,11 +48,8 @@ object RationaleDialog {
             }.also(header::addView)
         }
 
-        drawables.dropLast(1).forEach {
-            addIcon(it)
-            addPlus()
-        }
-        drawables.lastOrNull()?.let(::addIcon)
+        drawables.firstOrNull()?.let(::addIcon)
+        drawables.drop(1).forEach { addPlus(); addIcon(it) }
 
         return context.showSessionDialog {
             view(view)

From 97297508f4c22bd5ffec2973972e8f862f5f8c8b Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 26 Jun 2023 10:58:08 +0930
Subject: [PATCH 19/19] Simplify ExpirationDialog

---
 .../java/org/thoughtcrime/securesms/ExpirationDialog.kt   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
index cab11c907f..9a34c1ec4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.kt
@@ -9,7 +9,7 @@ import network.loki.messenger.R
 import org.session.libsession.utilities.ExpirationUtil
 
 fun Context.showExpirationDialog(
-    currentExpiration: Int,
+    expiration: Int,
     onExpirationTime: (Int) -> Unit
 ): AlertDialog {
     val view = LayoutInflater.from(this).inflate(R.layout.expiration_dialog, null)
@@ -30,14 +30,12 @@ fun Context.showExpirationDialog(
         .map { ExpirationUtil.getExpirationDisplayValue(this, it) }
         .toTypedArray()
 
-    val selectedIndex = expirationTimes.withIndex()
-        .firstOrNull { it.value >= currentExpiration }?.index
-        ?: (expirationTimes.size - 1)
+    val selectedIndex = expirationTimes.run { indexOfFirst { it >= expiration }.coerceIn(indices) }
 
     numberPickerView.apply {
         displayedValues = expirationDisplayValues
         minValue = 0
-        maxValue = expirationTimes.size - 1
+        maxValue = expirationTimes.lastIndex
         setOnValueChangedListener { _, _, index -> updateText(index) }
         value = selectedIndex
     }