Utilise dialog dsl in DeleteMediaPreviewDialog

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

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);
+    DeleteMediaPreviewDialog.show(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) {
+                DatabaseAttachment attachment = mediaItem.attachment;
-            return null;
+                if (attachment != null) {
+                  AttachmentUtil.deleteAttachment(getApplicationContext(), attachment);
                 }
-          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
-                                          mediaItem.attachment);
                 return null;
               }
             }.execute();
 
       finish();
     });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
   }
 
   @Override