Taskbar 3.7 (release 5)

Fix behavior from previous commit

diff --git a/app/build.gradle b/app/build.gradle
index 8e560b0..95be253 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,7 +34,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 26
 
-        versionCode 165
+        versionCode 166
         versionName "3.7"
 
         resConfigs "en", "ja", "ru", "de"

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index ae0d7bd..548b3f3 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -496,6 +496,9 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
 
                 U.launchApp(getApplicationContext(), packageName, componentName, userId, windowSize, false, true);
 
+                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    U.cancelToast();
+
                 showStartMenu = false;
                 shouldHideTaskbar = true;
                 contextMenuFix = false;
@@ -690,7 +693,8 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
 
             getListView().setOnItemLongClickListener(null);
 
-            U.cancelToast();
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                U.cancelToast();
         } else {
             if(contextMenuFix && !showStartMenu)
                 U.startFreeformHack(this, false, false);