Fix issues with auto showing/hiding Taskbar when set as home screen

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
index 4027d7b..dd9cadf 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -404,7 +404,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
                     finish();
                 } catch (ActivityNotFoundException e) { /* Gracefully fail */ }
             }
-        } else if(U.shouldCollapse(this, false))
+        } else if(U.shouldCollapse(this, false, true))
             LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
     }
 
@@ -473,7 +473,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
             pref.edit().putBoolean("taskbar_active", false).apply();
 
         // Show the Taskbar temporarily, as nothing else will be visible on screen
-        if(U.shouldCollapse(this, false))
+        if(U.shouldCollapse(this, false, true))
             new Handler().postDelayed(() -> LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")), 100);
     }
 
@@ -492,7 +492,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
         if(!U.canBootToFreeform(this)) {
             setOnHomeScreen(false);
 
-            if(U.shouldCollapse(this, false))
+            if(U.shouldCollapse(this, false, true))
                 LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_TASKBAR"));
 
             if(this instanceof SecondaryHomeActivity) {

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 e360680..274bb98 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -1487,11 +1487,15 @@ public class U {
     }
 
     public static boolean shouldCollapse(Context context, boolean pendingAppLaunch) {
+        return shouldCollapse(context, pendingAppLaunch, false);
+    }
+
+    public static boolean shouldCollapse(Context context, boolean pendingAppLaunch, boolean isHomeActivity) {
         SharedPreferences pref = getSharedPreferences(context);
         if(pref.getBoolean("hide_taskbar", true)) {
             if(!pref.getBoolean("freeform_hack", false)
                     || isOverridingFreeformHack(context, false))
-                return !LauncherHelper.getInstance().isOnHomeScreen();
+                return !LauncherHelper.getInstance().isOnHomeScreen() || isHomeActivity;
             else {
                 FreeformHackHelper helper = FreeformHackHelper.getInstance();
                 if(pendingAppLaunch)