SplitScreenMods: fix DividerSnapAlgorithm constructor hook on B

Author: programminghoch10

SplitScreenMods/src/main/java/com/programminghoch10/SplitScreenMods/AdditionalSnapTargetsHook.kt

@@ -10,7 +10,6 @@ import de.robv.android.xposed.IXposedHookInitPackageResources
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XSharedPreferences
-import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_InitPackageResources
 import de.robv.android.xposed.callbacks.XC_LoadPackage
@@ -45,7 +44,7 @@ class AdditionalSnapTargetsHook : IXposedHookLoadPackage, IXposedHookInitPackage
             return snapTarget
         }
 
-        XposedBridge.hookAllConstructors(DividerSnapAlgorithmClass, object : XC_MethodHook() {
+        hookDividerSnapAlgorithmAfterConstructor(lpparam.classLoader, object : XC_MethodHook() {
             override fun afterHookedMethod(param: MethodHookParam) {
                 log("after ${DividerSnapAlgorithmClass.simpleName} constructor")
                 val res = param.args[0] as Resources

SplitScreenMods/src/main/java/com/programminghoch10/SplitScreenMods/DisableFlingToDismissHook.kt

@@ -7,7 +7,6 @@ import de.binarynoise.logger.Logger.log
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XSharedPreferences
-import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
@@ -25,8 +24,7 @@ class DisableFlingToDismissHook : IXposedHookLoadPackage {
         val enabled = preferences.getBoolean("DisableFlingToDismiss", false)
         if (!enabled) return
 
-        val DividerSnapAlgorithmClass = XposedHelpers.findClass("com.android.wm.shell.common.split.DividerSnapAlgorithm", lpparam.classLoader)
-        XposedBridge.hookAllConstructors(DividerSnapAlgorithmClass, object : XC_MethodHook() {
+        hookDividerSnapAlgorithmAfterConstructor(lpparam.classLoader, object : XC_MethodHook() {
             override fun afterHookedMethod(param: MethodHookParam) {
                 log("disabling dismiss targets")
                 XposedHelpers.setObjectField(

SplitScreenMods/src/main/java/com/programminghoch10/SplitScreenMods/DisableSnapToDismissHook.kt

@@ -7,7 +7,6 @@ import de.binarynoise.logger.Logger.log
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XSharedPreferences
-import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
@@ -30,8 +29,7 @@ class DisableSnapToDismissHook : IXposedHookLoadPackage {
         val enabled = preferences.getBoolean("DisableSnapToDismiss", false)
         if (!enabled) return
 
-        val DividerSnapAlgorithmClass = XposedHelpers.findClass("com.android.wm.shell.common.split.DividerSnapAlgorithm", lpparam.classLoader)
-        XposedBridge.hookAllConstructors(DividerSnapAlgorithmClass, object : XC_MethodHook() {
+        hookDividerSnapAlgorithmAfterConstructor(lpparam.classLoader, object : XC_MethodHook() {
             override fun afterHookedMethod(param: MethodHookParam) {
                 val mTargets = XposedHelpers.getObjectField(param.thisObject, "mTargets") as ArrayList<Any?>
                 if (mTargets.isEmpty()) return

SplitScreenMods/src/main/java/com/programminghoch10/SplitScreenMods/FreeSnapHook.kt

@@ -6,7 +6,6 @@ import de.binarynoise.logger.Logger.log
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XSharedPreferences
-import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
@@ -24,11 +23,10 @@ class FreeSnapHook : IXposedHookLoadPackage {
         val enabled = preferences.getBoolean("FreeSnap", false)
         if (!enabled) return
 
-        val DividerSnapAlgorithmClass = XposedHelpers.findClass("com.android.wm.shell.common.split.DividerSnapAlgorithm", lpparam.classLoader)
-        XposedBridge.hookAllConstructors(DividerSnapAlgorithmClass, object : XC_MethodHook() {
+        hookDividerSnapAlgorithmAfterConstructor(lpparam.classLoader, object : XC_MethodHook() {
             override fun afterHookedMethod(param: MethodHookParam) {
                 XposedHelpers.setBooleanField(param.thisObject, "mFreeSnapMode", true)
-                log("${DividerSnapAlgorithmClass.simpleName} mFreeSnapMode constant changed to true")
+                log("${param.thisObject::class.java.simpleName} mFreeSnapMode constant changed to true")
             }
         })
     }

SplitScreenMods/src/main/java/com/programminghoch10/SplitScreenMods/Utils.kt

@@ -0,0 +1,29 @@
+package com.programminghoch10.SplitScreenMods
+
+import android.os.Build
+import de.robv.android.xposed.XC_MethodHook
+import de.robv.android.xposed.XposedBridge
+import de.robv.android.xposed.XposedHelpers
+
+/**
+ * hook after `DividerSnapAlgorithm` constructor
+ * this is needed because [Build.VERSION_CODES.BAKLAVA] removed the constructor entirely,
+ * so we hook the calling function instead
+ */
+fun hookDividerSnapAlgorithmAfterConstructor(classLoader: ClassLoader, methodHook: XC_MethodHook) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+        val SplitLayoutClass = XposedHelpers.findClass("com.android.wm.shell.common.split.SplitLayout", classLoader)
+        XposedHelpers.findAndHookMethod(SplitLayoutClass, "updateLayouts", object : XC_MethodHook() {
+            override fun afterHookedMethod(param: MethodHookParam) {
+                val mDividerSnapAlgorithm = XposedHelpers.getObjectField(param.thisObject, "mDividerSnapAlgorithm")
+                //param.thisObject = mDividerSnapAlgorithm
+                val newParam = XposedHelpers.newInstance(MethodHookParam::class.java) as MethodHookParam
+                newParam.thisObject = mDividerSnapAlgorithm
+                XposedHelpers.callMethod(methodHook, "afterHookedMethod", newParam)
+            }
+        })
+    } else {
+        val DividerSnapAlgorithmClass = XposedHelpers.findClass("com.android.wm.shell.common.split.DividerSnapAlgorithm", classLoader)
+        XposedBridge.hookAllConstructors(DividerSnapAlgorithmClass, methodHook)
+    }
+}