Select server URL based on Wi-Fi connection

Author: adamff-dev

app/src/main/kotlin/io/homeassistant/companion/android/settings/server/ServerSettingsFragment.kt

@@ -338,15 +338,16 @@ class ServerSettingsFragment :
         }
     }
 
-    override fun updateHomeNetwork(ssids: List<String>, ethernet: Boolean?, vpn: Boolean?) {
+    override fun updateHomeNetwork(ssids: List<String>, ethernet: Boolean?, vpn: Boolean?, anyWifi: Boolean) {
         findPreference<Preference>("connection_internal_ssids")?.let {
             it.summary =
-                if (ssids.isEmpty() && ethernet != true && vpn != true) {
+                if (ssids.isEmpty() && ethernet != true && vpn != true && !anyWifi) {
                     getString(commonR.string.not_set)
                 } else {
                     val options = ssids.toMutableList()
                     if (ethernet == true) options += getString(commonR.string.manage_ssids_ethernet)
                     if (vpn == true) options += getString(commonR.string.manage_ssids_vpn)
+                    if (anyWifi) options += getString(commonR.string.pref_connection_use_any_wifi_for_internal)
 
                     options.joinToString()
                 }

app/src/main/kotlin/io/homeassistant/companion/android/settings/server/ServerSettingsPresenterImpl.kt

@@ -155,9 +155,17 @@ class ServerSettingsPresenterImpl @Inject constructor(
             val connection = serverManager.getServer(serverId)?.connection
             val ssids = connection?.internalSsids.orEmpty()
             view.enableInternalConnection(
-                ssids.isNotEmpty() || connection?.internalEthernet == true || connection?.internalVpn == true,
+                ssids.isNotEmpty() ||
+                    connection?.useAnyWifiForInternal == true ||
+                    connection?.internalEthernet == true ||
+                    connection?.internalVpn == true,
+            )
+            view.updateHomeNetwork(
+                ssids,
+                connection?.internalEthernet,
+                connection?.internalVpn,
+                connection?.useAnyWifiForInternal == true,
             )
-            view.updateHomeNetwork(ssids, connection?.internalEthernet, connection?.internalVpn)
         }
     }
 

app/src/main/kotlin/io/homeassistant/companion/android/settings/server/ServerSettingsView.kt

@@ -4,6 +4,6 @@ interface ServerSettingsView {
     fun updateServerName(name: String)
     fun enableInternalConnection(isEnabled: Boolean)
     fun updateExternalUrl(url: String, useCloud: Boolean)
-    fun updateHomeNetwork(ssids: List<String>, ethernet: Boolean?, vpn: Boolean?)
+    fun updateHomeNetwork(ssids: List<String>, ethernet: Boolean?, vpn: Boolean?, anyWifi: Boolean)
     fun onRemovedServer(success: Boolean, hasAnyRemaining: Boolean)
 }

app/src/main/kotlin/io/homeassistant/companion/android/settings/ssid/SsidFragment.kt

@@ -47,6 +47,7 @@ class SsidFragment : Fragment() {
                         wifiSsids = viewModel.wifiSsids,
                         canReadWifi = canReadWifi,
                         ethernet = viewModel.ethernet,
+                        anyWifi = viewModel.anyWifi,
                         vpn = viewModel.vpn,
                         prioritizeInternal = viewModel.prioritizeInternal,
                         usingWifi = viewModel.usingWifi,
@@ -56,6 +57,7 @@ class SsidFragment : Fragment() {
                         onRemoveWifiSsid = viewModel::removeHomeWifiSsid,
                         onRequestPermission = { onRequestLocationPermission() },
                         onSetEthernet = viewModel::setInternalWithEthernet,
+                        onSetAnyWifi = viewModel::setInternalWithAnyWifi,
                         onSetVpn = viewModel::setInternalWithVpn,
                         onSetPrioritize = viewModel::setPrioritize,
                     )

app/src/main/kotlin/io/homeassistant/companion/android/settings/ssid/SsidViewModel.kt

@@ -29,6 +29,9 @@ class SsidViewModel @Inject constructor(
     var ethernet by mutableStateOf<Boolean?>(null)
         private set
 
+    var anyWifi by mutableStateOf(false)
+        private set
+
     var vpn by mutableStateOf<Boolean?>(null)
         private set
 
@@ -53,6 +56,7 @@ class SsidViewModel @Inject constructor(
             wifiSsids.clear()
             wifiSsids.addAll(server?.connection?.internalSsids.orEmpty())
             ethernet = server?.connection?.internalEthernet
+            anyWifi = server?.connection?.useAnyWifiForInternal == true
             vpn = server?.connection?.internalVpn
             server?.connection?.prioritizeInternal?.let { prioritizeInternal = it }
 
@@ -115,6 +119,21 @@ class SsidViewModel @Inject constructor(
         }
     }
 
+    fun setInternalWithAnyWifi(enabled: Boolean) {
+        viewModelScope.launch {
+            serverManager.getServer(serverId)?.let {
+                serverManager.updateServer(
+                    it.copy(
+                        connection = it.connection.copy(
+                            useAnyWifiForInternal = enabled,
+                        ),
+                    ),
+                )
+                anyWifi = enabled
+            }
+        }
+    }
+
     fun setInternalWithVpn(privateNetwork: Boolean) {
         viewModelScope.launch {
             serverManager.getServer(serverId)?.let {

app/src/main/kotlin/io/homeassistant/companion/android/settings/ssid/views/SsidView.kt

@@ -71,6 +71,7 @@ fun SsidView(
     wifiSsids: List<String>,
     canReadWifi: Boolean,
     ethernet: Boolean?,
+    anyWifi: Boolean,
     vpn: Boolean?,
     prioritizeInternal: Boolean,
     usingWifi: Boolean,
@@ -80,6 +81,7 @@ fun SsidView(
     onRemoveWifiSsid: (String) -> Unit,
     onRequestPermission: () -> Unit,
     onSetEthernet: (Boolean) -> Unit,
+    onSetAnyWifi: (Boolean) -> Unit,
     onSetVpn: (Boolean) -> Unit,
     onSetPrioritize: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
@@ -218,7 +220,16 @@ fun SsidView(
             }
         }
 
-        if (wifiSsids.isNotEmpty() || ethernet == true || vpn == true) {
+        item("any_wifi") {
+            SsidSubheader(
+                title = stringResource(commonR.string.pref_connection_use_any_wifi_for_internal),
+                icon = Icons.Default.Wifi,
+                checked = anyWifi,
+                onClicked = onSetAnyWifi,
+            )
+        }
+
+        if (wifiSsids.isNotEmpty() || ethernet == true || anyWifi || vpn == true) {
             item("warn") {
                 Box(
                     Modifier
@@ -403,6 +414,7 @@ private fun PreviewSsidViewEmpty() {
         wifiSsids = emptyList(),
         canReadWifi = true,
         ethernet = null,
+        anyWifi = false,
         vpn = null,
         prioritizeInternal = false,
         activeSsid = "home-assistant-wifi",
@@ -412,6 +424,7 @@ private fun PreviewSsidViewEmpty() {
         onRemoveWifiSsid = {},
         onRequestPermission = {},
         onSetEthernet = {},
+        onSetAnyWifi = {},
         onSetVpn = {},
         onSetPrioritize = {},
     )
@@ -424,6 +437,7 @@ private fun PreviewSsidViewItems() {
         wifiSsids = listOf("home-assistant-wifi", "wifi-one", "BSSID:1A:2B:3C:4D:5E:6F"),
         canReadWifi = true,
         ethernet = false,
+        anyWifi = true,
         vpn = true,
         prioritizeInternal = false,
         activeSsid = "home-assistant-wifi",
@@ -433,6 +447,7 @@ private fun PreviewSsidViewItems() {
         onRemoveWifiSsid = {},
         onRequestPermission = {},
         onSetEthernet = {},
+        onSetAnyWifi = {},
         onSetVpn = {},
         onSetPrioritize = {},
     )