Upgrade to kotlin 1.6.21

Upgrade gradle to 7.0.4
Change flow publisher type to WifiInfo?
Remove unused res

Author: matteoKuama

build.gradle

@@ -1,10 +1,10 @@
 buildscript {
-    ext.kotlin_version = "1.5.31"
+    ext.kotlin_version = "1.6.21"
     repositories {
         google()
         mavenCentral()
         dependencies {
-            classpath "com.android.tools.build:gradle:7.0.3"
+            classpath "com.android.tools.build:gradle:7.0.4"
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
             classpath "com.diffplug.spotless:spotless-plugin-gradle:5.17.1"
         }
@@ -50,7 +50,7 @@ android {
 
     kotlinOptions {
         allWarningsAsErrors = true
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
+        freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
     }
 
     buildTypes {

src/main/java/net/kuama/wifiMonitor/WifiListener.kt

@@ -1,11 +1,12 @@
 package net.kuama.wifiMonitor
 
 import android.content.Context
+import android.net.wifi.WifiInfo
 import kotlinx.coroutines.flow.Flow
 
 /**
  * Interface for a platform-specific WiFi monitoring implementation.
  */
 interface WifiListener {
-    fun listen(context: Context): Flow<Unit>
+    fun listen(context: Context): Flow<WifiInfo?>
 }

src/main/java/net/kuama/wifiMonitor/WifiMonitor.kt

@@ -56,15 +56,13 @@ class WifiMonitor private constructor(
      *
      * @return A flow of WiFi statuses.
      */
-    fun monitor(): Flow<WifiStatus> = listener.listen(context).map {
+    fun monitor(): Flow<WifiStatus> = listener.listen(context).map { wifiInfo ->
         when (wifiManager.wifiState) {
             WifiManager.WIFI_STATE_DISABLED, WifiManager.WIFI_STATE_DISABLING -> WifiStatus(
                 State.DISCONNECTED
             )
             WifiManager.WIFI_STATE_ENABLED -> {
-                // TODO: WiFiManager.getConnectionInfo() is deprecated in Android SDK 31 (Android 12).
-                val connectionInfo = @Suppress("DEPRECATION") wifiManager.connectionInfo
-
+                val connectionInfo = wifiInfo ?: @Suppress("DEPRECATION") wifiManager.connectionInfo
                 WifiStatus(
                     state = if (isFineLocationAccessGranted) State.CONNECTED else State.CONNECTED_MISSING_FINE_LOCATION_PERMISSION,
                     ssid = connectionInfo.ssid,

src/main/java/net/kuama/wifiMonitor/implementation/AndroidQWifiListener.kt

@@ -5,6 +5,8 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.wifi.WifiInfo
 import android.os.Build
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
@@ -24,19 +26,25 @@ import net.kuama.wifiMonitor.WifiListener
 @TargetApi(Build.VERSION_CODES.Q)
 internal class AndroidQWifiListener : WifiListener {
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun listen(context: Context): Flow<Unit> = callbackFlow {
+    override fun listen(context: Context): Flow<WifiInfo?> = callbackFlow {
         val callback = object : ConnectivityManager.NetworkCallback() {
             override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
                 super.onCapabilitiesChanged(network, networkCapabilities)
+
+                val wifiInfo = networkCapabilities.transportInfo as WifiInfo
                 @Suppress("BlockingMethodInNonBlockingContext")
-                trySendBlocking(Unit)
+                trySendBlocking(wifiInfo)
             }
         }
 
+        val request = NetworkRequest.Builder()
+            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+            .build()
+
         val connectivityManager = context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
         // Register the callback on network changes.
-        connectivityManager.registerDefaultNetworkCallback(callback)
+        connectivityManager.registerNetworkCallback(request, callback)
 
         // Wait for flow cancellation, then unregister the callback.
         awaitClose {

src/main/java/net/kuama/wifiMonitor/implementation/BeforeAndroidQWifiListener.kt

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.net.wifi.WifiInfo
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
@@ -18,11 +19,11 @@ import net.kuama.wifiMonitor.WifiListener
  */
 internal class BeforeAndroidQWifiListener : WifiListener {
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun listen(context: Context): Flow<Unit> = callbackFlow {
+    override fun listen(context: Context): Flow<WifiInfo?> = callbackFlow {
         val receiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 @Suppress("BlockingMethodInNonBlockingContext")
-                trySendBlocking(Unit)
+                trySendBlocking(null)
             }
         }
 

src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">K Wi-Fi Spy</string>
+
 </resources>

src/test/java/net/kuama/wifiMonitor/WifiMonitorTest.kt

@@ -33,7 +33,7 @@ class WifiMonitorTest {
             every {
                 wifiListener.listen(context)
             } answers {
-                flowOf(Unit)
+                flowOf(null)
             }
 
             // Act