From 7ba38e176d663c39c86acb884762c388de37df7f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 20 Jun 2020 21:25:47 +0200
Subject: [PATCH] Always undo

---
 .../java/eu/faircode/email/ActivityView.java  |  4 +++
 .../eu/faircode/email/FragmentMessages.java   | 28 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 815c16fe7f..e596a4f386 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -395,6 +395,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         fragmentTransaction.commit();
     }
 
+    View getContentView() {
+        return drawerLayout.getChildAt(0);
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 76b3627619..faccf30779 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4520,7 +4520,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (result.size() == 0)
             return;
 
-        if (undo) {
+        if (undo || true) {
             moveUndo(result);
             return;
         }
@@ -4643,9 +4643,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onExecuted(Bundle args, final ArrayList<MessageTarget> result) {
+                ActivityView activity = (ActivityView) getActivity();
+                View content = activity.getContentView();
+
                 // Show undo snackbar
                 final Snackbar snackbar = Snackbar.make(
-                        view,
+                        content,
                         getString(R.string.title_moving, getDisplay(result)),
                         Snackbar.LENGTH_INDEFINITE);
                 snackbar.setAction(R.string.title_undo, new View.OnClickListener() {
@@ -4686,9 +4689,28 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             protected void onException(Bundle args, Throwable ex) {
                                 Log.unexpectedError(getParentFragmentManager(), ex);
                             }
-                        }.execute(FragmentMessages.this, args, "messages:moveundo");
+                        }.execute(activity, activity, args, "messages:moveundo");
                     }
                 });
+                snackbar.addCallback(new Snackbar.Callback() {
+                    private int margin;
+
+                    @Override
+                    public void onShown(Snackbar sb) {
+                        ViewGroup.MarginLayoutParams lparam = (ViewGroup.MarginLayoutParams) content.getLayoutParams();
+                        margin = lparam.bottomMargin;
+                        lparam.bottomMargin += snackbar.getView().getHeight();
+                        content.setLayoutParams(lparam);
+                    }
+
+                    @Override
+                    public void onDismissed(Snackbar transientBottomBar, int event) {
+                        ViewGroup.MarginLayoutParams lparam = (ViewGroup.MarginLayoutParams) content.getLayoutParams();
+                        lparam.bottomMargin = margin;
+                        content.setLayoutParams(lparam);
+                    }
+                });
+                snackbar.show();
                 snackbar.show();
 
                 final Context context = getContext().getApplicationContext();