From f57e1f9641e72c07b509b003cc02b3b4033fe8d7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 9 Nov 2018 09:44:04 +0000
Subject: [PATCH] Added delete selection

---
 .../eu/faircode/email/FragmentMessages.java   | 80 ++++++++++++++++++-
 app/src/main/res/layout/fragment_messages.xml | 19 +++++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0221962b69..df897c3e81 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -20,6 +20,7 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Canvas;
@@ -91,6 +92,7 @@ public class FragmentMessages extends FragmentEx {
     private Group grpReady;
     private FloatingActionButton fab;
     private FloatingActionButton fabMove;
+    private FloatingActionButton fabDelete;
 
     private long folder = -1;
     private long account = -1;
@@ -173,6 +175,7 @@ public class FragmentMessages extends FragmentEx {
         grpReady = view.findViewById(R.id.grpReady);
         fab = view.findViewById(R.id.fab);
         fabMove = view.findViewById(R.id.fabMove);
+        fabDelete = view.findViewById(R.id.fabDelete);
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
 
@@ -287,10 +290,13 @@ public class FragmentMessages extends FragmentEx {
             selectionTracker.addObserver(new SelectionTracker.SelectionObserver() {
                 @Override
                 public void onSelectionChanged() {
-                    if (selectionTracker.hasSelection())
+                    if (selectionTracker.hasSelection()) {
                         fabMove.show();
-                    else
+                        fabDelete.show();
+                    } else {
                         fabMove.hide();
+                        fabDelete.hide();
+                    }
                 }
             });
         }
@@ -692,6 +698,75 @@ public class FragmentMessages extends FragmentEx {
             }
         });
 
+        fabDelete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (Helper.isPro(getContext()))
+                    new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+                            .setMessage(R.string.title_ask_delete_selected)
+                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Bundle args = new Bundle();
+                                    MutableSelection<Long> selection = new MutableSelection<>();
+                                    selectionTracker.copySelection(selection);
+
+                                    long[] ids = new long[selection.size()];
+                                    int i = 0;
+                                    for (Long id : selection)
+                                        ids[i++] = id;
+
+                                    selectionTracker.clearSelection();
+
+                                    args.putLongArray("ids", ids);
+
+                                    new SimpleTask<Void>() {
+                                        @Override
+                                        protected Void onLoad(Context context, Bundle args) {
+                                            long[] ids = args.getLongArray("ids");
+
+                                            DB db = DB.getInstance(context);
+                                            try {
+                                                db.beginTransaction();
+
+                                                for (long id : ids) {
+                                                    EntityMessage message = db.message().getMessage(id);
+                                                    if (message.uid == null && !TextUtils.isEmpty(message.error)) // outbox
+                                                        db.message().deleteMessage(id);
+                                                    else {
+                                                        db.message().setMessageUiHide(message.id, true);
+                                                        EntityOperation.queue(db, message, EntityOperation.DELETE);
+                                                    }
+                                                }
+
+                                                db.setTransactionSuccessful();
+                                            } finally {
+                                                db.endTransaction();
+                                            }
+
+                                            EntityOperation.process(context);
+
+                                            return null;
+                                        }
+
+                                        @Override
+                                        protected void onException(Bundle args, Throwable ex) {
+                                            Helper.unexpectedError(getContext(), ex);
+                                        }
+                                    }.load(FragmentMessages.this, args);
+                                }
+                            })
+                            .setNegativeButton(android.R.string.cancel, null)
+                            .show();
+                else {
+                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+                    fragmentTransaction.commit();
+                }
+
+            }
+        });
+
         ((ActivityBase) getActivity()).addBackPressedListener(new ActivityBase.IBackPressedListener() {
             @Override
             public boolean onBackPressed() {
@@ -711,6 +786,7 @@ public class FragmentMessages extends FragmentEx {
 
         fab.hide();
         fabMove.hide();
+        fabDelete.hide();
 
         return view;
     }
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index a5e31a9441..3309f08213 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -218,6 +218,25 @@
         android:tint="@color/colorActionForeground"
         app:backgroundTint="?attr/colorSeparator" />
 
+    <View
+        android:id="@+id/fabAnchor"
+        android:layout_width="0dp"
+        android:layout_height="15dp"
+        android:layout_gravity="bottom|end"
+        app:layout_anchor="@+id/fabMove"
+        app:layout_anchorGravity="bottom" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabDelete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:src="@drawable/baseline_delete_24"
+        android:tint="@color/colorActionForeground"
+        app:backgroundTint="?attr/colorSeparator"
+        app:layout_anchor="@+id/fabAnchor"
+        app:layout_anchorGravity="bottom" />
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22fc63f54f..6332df6bd0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -217,6 +217,7 @@
     <string name="title_attachment_saved">Attachment saved</string>
     <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
     <string name="title_ask_delete">Delete message permanently?</string>
+    <string name="title_ask_delete_selected">Delete selected messages permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
     <string name="title_fix">Fix</string>