Support org.chromium.chrome v129

Close #181 as completed
JingMatrix · Jul 30, 2024 · c4f857f · c4f857f
1 parent ff35a9e
commit c4f857f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/org/matrix/chromext/MainHook.kt b/app/src/main/java/org/matrix/chromext/MainHook.kt
@@ -40,6 +40,7 @@ val supportedPackages =
         "com.vivaldi.browser",
         "com.vivaldi.browser.snapshot",
         "org.bromite.bromite",
+        "org.chromium.chrome",
         "org.chromium.thorium",
         "org.cromite.cromite",
         "org.greatfire.freebrowser",

diff --git a/app/src/main/java/org/matrix/chromext/hook/PageMenu.kt b/app/src/main/java/org/matrix/chromext/hook/PageMenu.kt
@@ -115,7 +115,9 @@ object PageMenuHook : BaseHook() {
                     it.returnType == Bundle::class.java && it.parameterTypes.size == 1
                   } != null) &&
                   (returnType.declaredFields.size == 0 ||
-                      returnType.declaredFields.find { it.type == Context::class.java } != null) &&
+                      returnType.declaredFields.find {
+                        Context::class.java.isAssignableFrom(it.type)
+                      } != null) &&
                   (returnType.isInterface() || Modifier.isAbstract(returnType.modifiers))
             }
             // public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate()
@@ -124,7 +126,9 @@ object PageMenuHook : BaseHook() {
               val appMenuPropertiesDelegateImpl = it.result::class.java.superclass as Class<*>
               // Can be found by searching `Android.PrepareMenu`
               val mContext =
-                  findField(appMenuPropertiesDelegateImpl, true) { type == Context::class.java }
+                  findField(appMenuPropertiesDelegateImpl, true) {
+                    Context::class.java.isAssignableFrom(type)
+                  }
               mContext.setAccessible(true)
               val mActivityTabProvider =
                   findField(appMenuPropertiesDelegateImpl, true) {

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -23,6 +23,7 @@
 		<item>com.vivaldi.browser</item>
 		<item>com.vivaldi.browser.snapshot</item>
 		<item>org.bromite.bromite</item>
+		<item>org.chromium.chrome</item>
 		<item>org.chromium.thorium</item>
 		<item>org.cromite.cromite</item>
 		<item>org.greatfire.freebrowser</item>