From 0d5b1e2bac77cb23446b983ab906893a4d614eef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 30 Jun 2019 23:15:58 +0200
Subject: [PATCH] Use dialog fragment to delete error operations

---
 .../eu/faircode/email/FragmentOperations.java | 73 ++++++++++---------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java
index 61e8b6da21..d28ee346ea 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOperations.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java
@@ -19,6 +19,7 @@ package eu.faircode.email;
     Copyright 2018-2019 by Marcel Bokhorst (M66B)
 */
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -35,7 +36,9 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
+import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -122,7 +125,7 @@ public class FragmentOperations extends FragmentBase {
                 onMenuHelp();
                 return true;
             case R.id.menu_delete:
-                onMenuDelete();
+                new DialogDelete().show(getFragmentManager(), "operations:delete");
                 return true;
 
             default:
@@ -134,41 +137,45 @@ public class FragmentOperations extends FragmentBase {
         startActivity(getFAQIntent());
     }
 
-    private void onMenuDelete() {
-        new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                .setMessage(R.string.title_delete_operation)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        new SimpleTask<Void>() {
-                            @Override
-                            protected Void onExecute(Context context, Bundle args) {
-                                DB db = DB.getInstance(context);
-                                List<EntityOperation> ops = db.operation().getOperationsError();
-                                Log.i("Operations with error count=" + ops.size());
-                                for (EntityOperation op : ops) {
-                                    Log.w("Deleting operation=" + op.id + " error=" + op.error);
-                                    if (op.message != null)
-                                        db.message().setMessageUiHide(op.message, 0L);
-                                    db.operation().deleteOperation(op.id);
-                                }
-                                return null;
-                            }
-
-                            @Override
-                            protected void onException(Bundle args, Throwable ex) {
-                                Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
-                            }
-                        }.execute(FragmentOperations.this, new Bundle(), "operation:delete");
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel, null)
-                .show();
-    }
-
     private Intent getFAQIntent() {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(Uri.parse(Helper.FAQ_URI + "#user-content-faq3"));
         return intent;
     }
+
+    public static class DialogDelete extends DialogFragment {
+        @NonNull
+        @Override
+        public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getContext())
+                    .setMessage(R.string.title_delete_operation)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            new SimpleTask<Void>() {
+                                @Override
+                                protected Void onExecute(Context context, Bundle args) {
+                                    DB db = DB.getInstance(context);
+                                    List<EntityOperation> ops = db.operation().getOperationsError();
+                                    Log.i("Operations with error count=" + ops.size());
+                                    for (EntityOperation op : ops) {
+                                        Log.w("Deleting operation=" + op.id + " error=" + op.error);
+                                        if (op.message != null)
+                                            db.message().setMessageUiHide(op.message, 0L);
+                                        db.operation().deleteOperation(op.id);
+                                    }
+                                    return null;
+                                }
+
+                                @Override
+                                protected void onException(Bundle args, Throwable ex) {
+                                    Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
+                                }
+                            }.execute(getContext(), getActivity(), new Bundle(), "operations:delete");
+                        }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+        }
+    }
 }