InternetPreferenceController V2 (7/7)

Support alternateSummary for HotspotNetworkEntry.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I6a454e86453ea8ed597a032d3f5769b6cf9102ba

src/com/android/settings/wifi/WifiSummaryRepository.kt

@@ -17,44 +17,45 @@
 package com.android.settings.wifi
 
 import android.content.Context
-import android.content.IntentFilter
-import android.net.ConnectivityManager
-import android.net.NetworkScoreManager
 import android.net.wifi.WifiInfo
-import android.net.wifi.WifiManager
+import com.android.settings.wifi.repository.SharedConnectivityRepository
+import com.android.settings.wifi.repository.WifiPickerRepository
+import com.android.settings.wifi.repository.WifiStatusRepository
 import com.android.settingslib.R
-import com.android.settingslib.spaprivileged.framework.common.broadcastReceiverFlow
 import com.android.settingslib.wifi.WifiStatusTracker
+import com.android.wifitrackerlib.HotspotNetworkEntry
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 
-/**
- * Repository that listeners to wifi callback and provide wifi summary flow to client.
- */
+/** Repository that listeners to wifi callback and provide wifi summary flow to client. */
 class WifiSummaryRepository(
     private val context: Context,
-    private val wifiStatusTrackerFactory: (callback: Runnable) -> WifiStatusTracker = { callback ->
-        WifiStatusTracker(
-            context,
-            context.getSystemService(WifiManager::class.java),
-            context.getSystemService(NetworkScoreManager::class.java),
-            context.getSystemService(ConnectivityManager::class.java),
-            callback,
-        )
-    },
+    private val wifiStatusRepository: WifiStatusRepository = WifiStatusRepository(context),
+    private val wifiPickerRepository: WifiPickerRepository? =
+        if (SharedConnectivityRepository.isDeviceConfigEnabled()) WifiPickerRepository(context)
+        else null,
 ) {
 
-    fun summaryFlow() = wifiStatusTrackerFlow()
-        .map { wifiStatusTracker -> wifiStatusTracker.getSummary() }
-        .conflate()
-        .flowOn(Dispatchers.Default)
+    fun summaryFlow(): Flow<String> {
+        if (wifiPickerRepository == null) return wifiStatusSummaryFlow()
+        return combine(
+            wifiStatusSummaryFlow(),
+            wifiPickerRepository.connectedWifiEntryFlow(),
+        ) { wifiStatusSummary, wifiEntry ->
+            if (wifiEntry is HotspotNetworkEntry) wifiEntry.alternateSummary else wifiStatusSummary
+        }
+    }
+
+    private fun wifiStatusSummaryFlow() =
+        wifiStatusRepository
+            .wifiStatusTrackerFlow()
+            .map { wifiStatusTracker -> wifiStatusTracker.getSummary() }
+            .conflate()
+            .flowOn(Dispatchers.Default)
 
     private fun WifiStatusTracker.getSummary(): String {
         if (!enabled) return context.getString(com.android.settings.R.string.switch_off_text)
@@ -62,30 +63,9 @@ class WifiSummaryRepository(
         val sanitizedSsid = WifiInfo.sanitizeSsid(ssid) ?: ""
         if (statusLabel.isNullOrEmpty()) return sanitizedSsid
         return context.getString(
-            R.string.preference_summary_default_combination, sanitizedSsid, statusLabel
+            R.string.preference_summary_default_combination,
+            sanitizedSsid,
+            statusLabel,
         )
     }
-
-    private fun wifiStatusTrackerFlow(): Flow<WifiStatusTracker> = callbackFlow {
-        var wifiStatusTracker: WifiStatusTracker? = null
-        wifiStatusTracker = wifiStatusTrackerFactory { wifiStatusTracker?.let(::trySend) }
-
-        context.broadcastReceiverFlow(INTENT_FILTER)
-            .onEach { intent -> wifiStatusTracker.handleBroadcast(intent) }
-            .launchIn(this)
-
-        wifiStatusTracker.setListening(true)
-        wifiStatusTracker.fetchInitialState()
-        trySend(wifiStatusTracker)
-
-        awaitClose { wifiStatusTracker.setListening(false) }
-    }.conflate().flowOn(Dispatchers.Default)
-
-    private companion object {
-        val INTENT_FILTER = IntentFilter().apply {
-            addAction(WifiManager.WIFI_STATE_CHANGED_ACTION)
-            addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION)
-            addAction(WifiManager.RSSI_CHANGED_ACTION)
-        }
-    }
 }