Utilise dialog dsl in DeleteMediaDialog

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()
+        }
+    }
+}

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,
+      DeleteMediaDialog.show(
-                                                    recordCount,
+              requireContext(),
-                                                    recordCount);
+              recordCount,
-      String confirmMessage = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message,
+              () -> new ProgressDialogAsyncTask<MediaDatabase.MediaRecord, Void, Void>(
-                                                    recordCount,
+                requireContext(),
-                                                    recordCount);
+                R.string.MediaOverviewActivity_Media_delete_progress_title,
-
+                R.string.MediaOverviewActivity_Media_delete_progress_message) {
-      AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        @Override
-      builder.setIconAttribute(R.attr.dialog_alert_icon);
+        protected Void doInBackground(MediaDatabase.MediaRecord... records) {
-      builder.setTitle(confirmTitle);
+          if (records == null || records.length == 0) {
-      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());
-            }
             return null;
           }
 
-        }.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[mediaRecords.size()]));
+          for (MediaDatabase.MediaRecord record : records) {
-      });
+            AttachmentUtil.deleteAttachment(getContext(), record.getAttachment());
-      builder.setNegativeButton(android.R.string.cancel, null);
+          }
-      builder.show();
+          return null;
+        }
+      }.execute(mediaRecords.toArray(new MediaDatabase.MediaRecord[mediaRecords.size()])));
     }
 
     private void handleSelectAllMedia() {