Disable invisible activity hacks on Android 12L+

farmerbb · Sep 12, 2024 · f475e15 · f475e15
1 parent 739ca46
commit f475e15
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 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,4 +26,8 @@ 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,4 +26,8 @@ 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,4 +33,8 @@ 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,4 +33,8 @@ 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,4 +41,8 @@ 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
@@ -393,7 +393,8 @@ private void startTaskbarService() {
 
         if(U.hasFreeformSupport(this)
                 && U.isFreeformModeEnabled(this)
-                && !FreeformHackHelper.getInstance().isFreeformHackActive()) {
+                && !FreeformHackHelper.getInstance().isFreeformHackActive()
+                && CompatUtils.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) {
+        } else if(openInNewWindow && CompatUtils.needsInvisibleActivityHacks()) {
             Intent intent = new Intent(context, DummyActivity.class);
             intent.putExtra("finish_on_pause", true);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK