diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java index 9a2804d72..606128e61 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.os.Bundle; +import android.view.ActionMode; import android.view.View; import android.widget.Toast; @@ -35,6 +36,7 @@ public class BaseActivity extends CyaneaAppCompatActivity { public static final int READ_WRITE_STORAGE = 52; public static Timer timer; + public static boolean canShowActionMode = true; static { Helper.installProvider(); @@ -62,6 +64,7 @@ public class BaseActivity extends CyaneaAppCompatActivity { .penaltyDeath() .build()); }*/ + canShowActionMode = true; super.onCreate(savedInstanceState); } @@ -135,4 +138,14 @@ public class BaseActivity extends CyaneaAppCompatActivity { Toasty.info(getApplicationContext(), message, Toast.LENGTH_SHORT).show(); } } + + + @Override + public void onActionModeStarted(ActionMode mode) { + if (!canShowActionMode) { + mode.finish(); + } + super.onActionModeStarted(mode); + + } } diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index d3a6f41a9..b1efb8ece 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -1706,17 +1706,10 @@ public abstract class BaseMainActivity extends BaseActivity } - public static boolean canShowActionMode = true; - @Override - public void onActionModeStarted(ActionMode mode) { - if (!canShowActionMode) { - mode.finish(); - } - super.onActionModeStarted(mode); - } + @Override protected void onPause() { diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index ef8689948..ea4737ef7 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -77,6 +77,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import app.fedilab.android.R; +import app.fedilab.android.activities.BaseActivity; import app.fedilab.android.activities.BaseMainActivity; import app.fedilab.android.activities.GroupActivity; import app.fedilab.android.activities.HashTagActivity; @@ -712,11 +713,11 @@ public class Status implements Parcelable { popup.setOnDismissListener(new PopupMenu.OnDismissListener() { @Override public void onDismiss(PopupMenu menu) { - BaseMainActivity.canShowActionMode = true; + BaseActivity.canShowActionMode = true; } }); popup.show(); - BaseMainActivity.canShowActionMode = false; + BaseActivity.canShowActionMode = false; }