From fc86239b50ca57e6e3658ff19cef20723e956705 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Jan 2022 19:07:57 +0100 Subject: [PATCH] Prevent empty undo space --- app/src/main/java/eu/faircode/email/ActivityView.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index fdd3db16ca..c7ee947bd6 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1170,7 +1170,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB @Override public void onClick(View v) { Log.i("Undo cancel"); - getMainHandler().removeCallbacks(timeout); + content.removeCallbacks(timeout); snackbar.dismiss(); if (show != null) show.execute(ActivityView.this, args, "undo:show"); @@ -1178,27 +1178,24 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB }); 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(); + 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; + lparam.bottomMargin = 0; content.setLayoutParams(lparam); } }); snackbar.show(); - getMainHandler().postDelayed(timeout, undo_timeout); + content.postDelayed(timeout, undo_timeout); } private void checkFirst() {