Possible fix for Taskbar opening/closing unneccessarily

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index 7f4a2a0..718e554 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -169,12 +169,6 @@ public class InvisibleActivityFreeform extends Activity {
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
-        possiblyHideTaskbar();
-    }
-
-    @Override
     protected void onDestroy() {
         super.onDestroy();
 
@@ -255,7 +249,8 @@ public class InvisibleActivityFreeform extends Activity {
     private void possiblyHideTaskbar() {
         new Handler().postDelayed(() -> {
             if(!doNotHide) {
-                if(U.shouldCollapse(this) && !LauncherHelper.getInstance().isOnHomeScreen())
+                SharedPreferences pref = U.getSharedPreferences(this);
+                if(pref.getBoolean("hide_taskbar", true) && !LauncherHelper.getInstance().isOnHomeScreen())
                     LocalBroadcastManager.getInstance(InvisibleActivityFreeform.this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_TASKBAR"));
                 else
                     LocalBroadcastManager.getInstance(InvisibleActivityFreeform.this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_START_MENU"));
@@ -264,7 +259,7 @@ public class InvisibleActivityFreeform extends Activity {
     }
 
     private void reallyFinish() {
-        InvisibleActivityFreeform.super.finish();
+        super.finish();
         overridePendingTransition(0, 0);
 
         if(!finish) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 3175e6b..02375b3 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -1088,7 +1088,7 @@ public class U {
                 return true;
             else {
                 FreeformHackHelper helper = FreeformHackHelper.getInstance();
-                return !helper.isInFreeformWorkspace();
+                return !helper.isFreeformHackActive();
             }
         } else
             return false;