Support old versions of Samsung browsers

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

Hide file tree

Showing 3 changed files with 4 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
@@ -30,7 +30,9 @@ object UserScriptHook : BaseHook() {
     //     .hookBefore { Chrome.dropTabModel(it.thisObject) }
 
     if (Chrome.isSamsung) {
-      findMethod(proxy.tabWebContentsDelegateAndroidImpl) { name == "onDidFinishNavigation" }
+      findMethod(proxy.tabWebContentsDelegateAndroidImpl) {
+            name == "onDidFinishNavigation" || name == "updateBrowserControlsState"
+          }
           .hookAfter { Chrome.updateTab(it.thisObject) }
 
       runCatching {

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