more pretty

Author: binarynoise

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

@@ -10,6 +10,7 @@ import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.getWifiInfoDescription
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.newGetWifiInfoDescription
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.wifiEntryClass
 import de.binarynoise.betterVerboseWiFiLogging.Wrapper.classLoader
+import de.binarynoise.reflection.cast
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
@@ -66,9 +67,9 @@ class Hook : IXposedHookLoadPackage {
 
                     result = listOf(
                         newGetWifiInfoDescription(wifiEntry),
-                        getNetworkCapabilityDescription.invoke(wifiEntry) as String?, // can stay as is
+                        getNetworkCapabilityDescription.invoke(wifiEntry)?.cast<String>()?.replace(":", ":\u00A0"), // can stay as is
                         newGetScanResultDescription(wifiEntry),
-                        getNetworkSelectionDescription.invoke(wifiEntry) as String?, // TODO
+                        getNetworkSelectionDescription.invoke(wifiEntry)?.cast<String?>(), // TODO
                     ).filterNot { it.isNullOrBlank() }.joinToString(",\n").trim()
                 }
             }

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

@@ -41,3 +41,22 @@ class method(private val cls: Class<*>, private vararg val params: Class<*>) {
 }
 
 fun <T : AccessibleObject> T.makeAccessible(): T = apply { isAccessible = true }
+
+/**
+ * Casts the object to T.
+ * If T is nullable, a safe cast is performed.
+ */
+@Suppress("UNCHECKED_CAST")
+inline fun <reified T> Any.cast(): T {
+    return when {
+        null is T -> {
+            // T is nullable. Use safe cast.
+            // Casting as T again is needed because compiler doesn't know in advance that T is nullable and complains otherwise.
+            (this as? T) as T
+        }
+        else -> {
+            // T is not nullable. Use direct cast.
+            this as T
+        }
+    }
+}