fix/add SystemUI compatibility

Author: binarynoise

BetterVerboseWiFiLogging/src/main/java/de/binarynoise/betterVerboseWiFiLogging/Hook.kt

@@ -4,6 +4,7 @@ import android.os.Build
 import de.binarynoise.betterVerboseWiFiLogging.StandardWifiEntry.newGetScanResultDescription
 import de.binarynoise.betterVerboseWiFiLogging.Utils.wifiTrackerLibUtilsClass
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.getNetworkCapabilityDescription
+import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.getNetworkCapabilityDescriptionFallback
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.getNetworkSelectionDescription
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.getWifiInfoDescription
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.newGetWifiInfoDescription
@@ -20,13 +21,15 @@ class Hook : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         Wrapper.classLoader = lpparam.classLoader
 
-        XposedBridge.hookMethod(getWifiInfoDescription, object : MethodHook() {
-            override fun beforeHookedMethod(param: MethodHookParam) {
-                with(param) {
-                    result = newGetWifiInfoDescription(thisObject)
+        if (getWifiInfoDescription != null) {
+            XposedBridge.hookMethod(getWifiInfoDescription, object : MethodHook() {
+                override fun beforeHookedMethod(param: MethodHookParam) {
+                    with(param) {
+                        result = newGetWifiInfoDescription(thisObject)
+                    }
                 }
-            }
-        })
+            })
+        }
 
         run {
             val hook = object : MethodHook() {
@@ -64,7 +67,8 @@ class Hook : IXposedHookLoadPackage {
 
                     result = listOf(
                         newGetWifiInfoDescription(wifiEntry),
-                        getNetworkCapabilityDescription.invoke(wifiEntry)?.cast<String>()?.replace(":", ":\u00A0"), // can stay as is
+                        (getNetworkCapabilityDescription?.invoke(wifiEntry) ?: getNetworkCapabilityDescriptionFallback(wifiEntry))?.cast<String>()
+                            ?.replace(":", ":\u00A0"), // can stay as is
                         newGetScanResultDescription(wifiEntry),
                         getNetworkSelectionDescription.invoke(wifiEntry)?.cast<String?>(), // TODO
                     ).filterNot { it.isNullOrBlank() }.joinToString(",\n").trim()

BetterVerboseWiFiLogging/src/main/java/de/binarynoise/betterVerboseWiFiLogging/Wrapper.kt

@@ -1,5 +1,6 @@
 package de.binarynoise.betterVerboseWiFiLogging
 
+import java.lang.reflect.Method
 import android.net.wifi.ScanResult
 import android.net.wifi.WifiConfiguration
 import android.net.wifi.WifiInfo
@@ -8,6 +9,8 @@ import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.mWifiInfoField
 import de.binarynoise.betterVerboseWiFiLogging.Wrapper.classLoader
 import de.binarynoise.reflection.findDeclaredField
 import de.binarynoise.reflection.findDeclaredMethod
+import de.binarynoise.reflection.findDeclaredMethodOrNull
+import de.robv.android.xposed.XposedHelpers
 import org.lsposed.hiddenapibypass.HiddenApiBypass
 
 const val wifitrackerlib = "com.android.wifitrackerlib"
@@ -17,11 +20,11 @@ object Wrapper {
 }
 
 object BaseWifiTracker {
-    val baseWiFiTrackerClass: Class<*> = classLoader.loadClass("$wifitrackerlib.BaseWifiTracker")
-    
     fun isVerboseLoggingEnabled(): Boolean {
-        if (Build.VERSION.SDK_INT < 34) return baseWiFiTrackerClass.getDeclaredMethod("isVerboseLoggingEnabled").invoke(null) as Boolean
-        else {
+        if (Build.VERSION.SDK_INT < 34) {
+            val baseWiFiTrackerClass: Class<*> = XposedHelpers.findClass("$wifitrackerlib.BaseWifiTracker", classLoader)
+            return baseWiFiTrackerClass.getDeclaredMethod("isVerboseLoggingEnabled").invoke(null) as Boolean
+        } else {
             // that actually is the fix, the original code doesn't check for this either anymore
             // https://cs.android.com/android/_/android/platform/frameworks/opt/net/wifi/+/main:libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java;l=529;bpv=0;bpt=0
             return true
@@ -201,8 +204,8 @@ val channelMap = mapOf(
 object WifiEntry {
     val wifiEntryClass: Class<*> = classLoader.loadClass("$wifitrackerlib.WifiEntry")
 
-    // TODO: check inline in SystemUI
-    val getWifiInfoDescription = wifiEntryClass.findDeclaredMethod("getWifiInfoDescription")
+    // inlined by r8 in SystemUI
+    val getWifiInfoDescription: Method? = wifiEntryClass.findDeclaredMethodOrNull("getWifiInfoDescription")
 
     private const val CONNECTED_STATE_CONNECTED = 2
     fun newGetWifiInfoDescription(wifiEntry: Any): String {
@@ -232,7 +235,29 @@ object WifiEntry {
         }
     }
 
-    val getNetworkCapabilityDescription = wifiEntryClass.findDeclaredMethod("getNetworkCapabilityDescription")
+    val getNetworkCapabilityDescription = wifiEntryClass.findDeclaredMethodOrNull("getNetworkCapabilityDescription")
+    
+    /**
+     * Fallback for getNetworkCapabilityDescription when it is inlined by r8
+     */
+    fun getNetworkCapabilityDescriptionFallback(wifiEntry: Any): String? {
+        val getConnectedState = wifiEntryClass.findDeclaredMethodOrNull("getConnectedState") ?: return null
+        val hasInternetAccess = wifiEntryClass.findDeclaredMethodOrNull("hasInternetAccess") ?: return null
+        val isDefaultNetwork = wifiEntryClass.findDeclaredMethodOrNull("isDefaultNetwork") ?: return null
+        val isLowQuality = wifiEntryClass.findDeclaredMethodOrNull("isLowQuality") ?: return null
+        
+        return buildString {
+            if (getConnectedState(wifiEntry) == CONNECTED_STATE_CONNECTED) {
+                append("hasInternet:")
+                append(hasInternetAccess(wifiEntry))
+                append(", isDefaultNetwork:")
+                append(isDefaultNetwork(wifiEntry))
+                append(", isLowQuality:")
+                append(isLowQuality(wifiEntry))
+            }
+        }
+    }
+    
     val getNetworkSelectionDescription = wifiEntryClass.findDeclaredMethod("getNetworkSelectionDescription")
 
     val getScanResultDescription = wifiEntryClass.findDeclaredMethod("getScanResultDescription") // -> StandardWifiEntry

BetterVerboseWiFiLogging/src/main/res/values/arrays.xml

@@ -2,5 +2,6 @@
 <resources>
     <string-array name="scope">
         <item>com.android.settings</item>
+        <item>com.android.systemui</item>
     </string-array>
 </resources>

reflection/src/main/java/de/binarynoise/reflection/Reflection.kt

@@ -18,6 +18,18 @@ fun <T> Class<T>.findDeclaredMethod(name: String, vararg params: Class<*>): Meth
     throw NoSuchMethodException("$name(${params.joinToString { it.simpleName }})")
 }
 
+fun <T> Class<T>.findDeclaredMethodOrNull(name: String, vararg params: Class<*>): Method? {
+    var c: Class<*>? = this
+    while (c != null) {
+        c.declaredMethods.filter { it.name == name }
+            .firstOrNull { params.isEmpty() || (it.parameterTypes.map { t -> t.name }) == (params.map { p -> p.name }) }
+            ?.let { return it.makeAccessible() }
+        c = c.superclass
+    }
+    
+    return null
+}
+
 fun <T> Class<T>.findDeclaredField(name: String): Field {
     var c: Class<*>? = this
     while (c != null) {