Support old versions of Samsung browsers

An ad hoc fix for #169
JingMatrix · May 21, 2024 · f056566 · f056566
1 parent f070143
commit f056566
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/org/matrix/chromext/Chrome.kt b/app/src/main/java/org/matrix/chromext/Chrome.kt
@@ -189,7 +189,7 @@ object Chrome {
   }
 
   fun updateTab(tab: Any?) {
-    if (tab != null) {
+    if (tab != null && tab != getTab()) {
       mTab = WeakReference(tab)
       if (Chrome.isSamsung) {
         val context = findField(UserScriptProxy.tabImpl) { name == "mContext" }

diff --git a/app/src/main/java/org/matrix/chromext/hook/UserScript.kt b/app/src/main/java/org/matrix/chromext/hook/UserScript.kt
@@ -13,6 +13,7 @@ import org.matrix.chromext.script.ScriptDbManager
 import org.matrix.chromext.utils.Log
 import org.matrix.chromext.utils.findField
 import org.matrix.chromext.utils.findMethod
+import org.matrix.chromext.utils.findMethodOrNull
 import org.matrix.chromext.utils.hookAfter
 import org.matrix.chromext.utils.hookBefore
 
@@ -30,7 +31,14 @@ object UserScriptHook : BaseHook() {
     //     .hookBefore { Chrome.dropTabModel(it.thisObject) }
 
     if (Chrome.isSamsung) {
-      findMethod(proxy.tabWebContentsDelegateAndroidImpl) { name == "onDidFinishNavigation" }
+      findMethodOrNull(proxy.tabWebContentsDelegateAndroidImpl) { name == "onDidFinishNavigation" }
+          .let {
+            if (it == null)
+                findMethod(proxy.tabWebContentsDelegateAndroidImpl) {
+                  name == "updateBrowserControlsState"
+                }
+            else it
+          }
           .hookAfter { Chrome.updateTab(it.thisObject) }
 
       runCatching {

diff --git a/base.apk b/base.apk