improve OpenWifiOnTop

now sorted in this order:
- currently connected
- saved && !open
- saved && open
- !saved && open
- !saved && !open
- others, sorted by default

Author: binarynoise

OpenWifiOnTop/build.gradle.kts

@@ -14,4 +14,5 @@ android {
 
 dependencies {
     implementation(project(":reflection"))
+    implementation(project(":logger"))
 }

OpenWifiOnTop/src/main/java/de/binarynoise/openWifiOnTop/Hook.kt

@@ -1,7 +1,7 @@
 package de.binarynoise.openWifiOnTop
 
+import de.binarynoise.logger.Logger.log
 import de.binarynoise.reflection.cast
-import de.binarynoise.reflection.findDeclaredField
 import de.binarynoise.reflection.findDeclaredMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
@@ -14,30 +14,59 @@ class Hook : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         val WifiEntryClass = lpparam.classLoader.loadClass("com.android.wifitrackerlib.WifiEntry")
         val getSecurityTypes = WifiEntryClass.findDeclaredMethod("getSecurityTypes")
+        val isSaved = WifiEntryClass.findDeclaredMethod("isSaved")
+        val isPrimary = WifiEntryClass.findDeclaredMethod("isPrimaryNetwork")
+        val WIFI_PICKER_COMPARATOR = XposedHelpers.getStaticObjectField(WifiEntryClass, "WIFI_PICKER_COMPARATOR").cast<Comparator<Any>>()
+        
+        val comparator: (Any, Any) -> Int = { a, b ->
+            val aPrimary = isPrimary.invoke(a) as Boolean
+            val bPrimary = isPrimary.invoke(b) as Boolean
+            
+            val aSaved = isSaved.invoke(a) as Boolean
+            val bSaved = isSaved.invoke(b) as Boolean
+            
+            val aOpen = getSecurityTypes.invoke(a)!!.cast<List<Int>>().minOrNull() == 0 // SECURITY_TYPE_OPEN
+            val bOpen = getSecurityTypes.invoke(b)!!.cast<List<Int>>().minOrNull() == 0
+            
+            // we want
+            // - primary
+            // - saved && !open
+            // - saved && open
+            // - !saved && open
+            // - !saved && !open
+            
+            val resultPrimary = aPrimary.compareTo(bPrimary)
+            val resultSaved = aSaved.compareTo(bSaved)
+            val resultOpen = aOpen.compareTo(bOpen)
+            
+            if (resultPrimary != 0) -resultPrimary // primary before !primary
+            else if (resultSaved != 0) -resultSaved // saved before !saved
+            else if (resultOpen != 0) if (aSaved) resultOpen else -resultOpen // saved != open before saved == open
+            else WIFI_PICKER_COMPARATOR.compare(a, b)
+        }
 
         val WifiPickerTrackerClass = lpparam.classLoader.loadClass("com.android.wifitrackerlib.WifiPickerTracker")
 
         try {
             XposedHelpers.findAndHookMethod(WifiPickerTrackerClass, "getWifiEntries", object : MethodHook() {
                 override fun afterHookedMethod(param: MethodHookParam) = with(param) {
-                    result = result.cast<List<*>>().sortedByDescending {
-                        getSecurityTypes.invoke(it)!!.cast<List<Int>>().minOrNull() == 0
-                    }
+                    result.cast<MutableList<*>>().sortWith(comparator)
                 }
             })
-        } catch (_: Throwable) {
+            log("handleLoadPackage: hooked getWifiEntries")
+        } catch (t: Throwable) {
+            XposedBridge.log(t)
         }
 
         try {
             XposedBridge.hookAllMethods(WifiPickerTrackerClass, "updateWifiEntries", object : MethodHook() {
                 override fun afterHookedMethod(param: MethodHookParam): Unit = with(param) {
-                    val mWifiEntries = WifiPickerTrackerClass.findDeclaredField("mWifiEntries")
-                    mWifiEntries.set(param.thisObject, mWifiEntries.get(thisObject)!!.cast<List<*>>().sortedByDescending {
-                        getSecurityTypes.invoke(it)?.cast<List<Int>>()?.minOrNull() == 0
-                    }.let(::ArrayList)) // convert java.util.Arrays$ArrayList to java.util.ArrayList
+                    XposedHelpers.getObjectField(thisObject, "mWifiEntries").cast<MutableList<*>>().sortWith(comparator)
                 }
             })
-        } catch (_: Throwable) {
+            log("handleLoadPackage: hooked updateWifiEntries")
+        } catch (t: Throwable) {
+            XposedBridge.log(t)
         }
     }
 }