No need for CompatUtils to determine whether to use invisible activit…

…y hacks
farmerbb · Sep 12, 2024 · f3912dd · f3912dd
1 parent 39d2493
commit f3912dd
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 22 deletions.
diff --git a/app/src/compat-28/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-28/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -26,8 +26,4 @@ public static boolean isImeVisible(View view) {
     }
 
     public static void grantNotificationPermissionIfNeeded(Activity activity) {}
-
-    public static boolean needsInvisibleActivityHacks() {
-        return true;
-    }
 }
diff --git a/app/src/compat-29/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-29/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -26,8 +26,4 @@ public static boolean isImeVisible(View view) {
     }
 
     public static void grantNotificationPermissionIfNeeded(Activity activity) {}
-
-    public static boolean needsInvisibleActivityHacks() {
-        return true;
-    }
 }
diff --git a/app/src/compat-30/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-30/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -33,8 +33,4 @@ public static boolean isImeVisible(View view) {
     }
 
     public static void grantNotificationPermissionIfNeeded(Activity activity) {}
-
-    public static boolean needsInvisibleActivityHacks() {
-        return true;
-    }
 }
diff --git a/app/src/compat-31/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-31/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -33,8 +33,4 @@ public static boolean isImeVisible(View view) {
     }
 
     public static void grantNotificationPermissionIfNeeded(Activity activity) {}
-
-    public static boolean needsInvisibleActivityHacks() {
-        return true;
-    }
 }
diff --git a/app/src/compat-34/java/com/farmerbb/taskbar/util/CompatUtils.java b/app/src/compat-34/java/com/farmerbb/taskbar/util/CompatUtils.java
@@ -41,8 +41,4 @@ public static void grantNotificationPermissionIfNeeded(Activity activity) {
             activity.requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 42);
         }
     }
-
-    public static boolean needsInvisibleActivityHacks() {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2;
-    }
 }
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
@@ -394,7 +394,7 @@ private void startTaskbarService() {
         if(U.hasFreeformSupport(this)
                 && U.isFreeformModeEnabled(this)
                 && !FreeformHackHelper.getInstance().isFreeformHackActive()
-                && CompatUtils.needsInvisibleActivityHacks()) {
+                && U.needsInvisibleActivityHacks()) {
             U.startFreeformHack(this, true);
         }
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -606,7 +606,7 @@ private static void prepareToStartActivity(Context context, boolean openInNewWin
                 && shouldLaunchTouchAbsorber(context)) {
             startTouchAbsorberActivity(context);
             newHandler().postDelayed(runnable, 100);
-        } else if(openInNewWindow && CompatUtils.needsInvisibleActivityHacks()) {
+        } else if(openInNewWindow && needsInvisibleActivityHacks()) {
             Intent intent = new Intent(context, DummyActivity.class);
             intent.putExtra("finish_on_pause", true);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -2241,4 +2241,8 @@ public static boolean relaunchActivityIfNeeded(Activity activity) {
         activity.finish();
         return true;
     }
+
+    public static boolean needsInvisibleActivityHacks() {
+        return getCurrentApiVersion() < 32.0f;
+    }
 }