fix: add OnServerListUpdatedListener in LocationViewModel

ivpn · Aug 6, 2023 · c289d06 · c289d06
1 parent 468ceb1
commit c289d06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/core/src/main/java/net/ivpn/core/common/prefs/ServersRepository.kt b/core/src/main/java/net/ivpn/core/common/prefs/ServersRepository.kt
@@ -180,6 +180,7 @@ class ServersRepository @Inject constructor(
                 LOGGER.info(response.toString())
                 response.markServerTypes()
                 setServerList(response.openVpnServerList, response.wireGuardServerList)
+                updateLocations()
                 settings.setIpList(Mapper.stringFromIps(response.config.api.ips))
                 settings.setIPv6List(Mapper.stringFromIps(response.config.api.ipv6s))
                 settings.wireGuardPorts = response.config.ports.wireguard.filter { it.portNumber > 0 }

diff --git a/core/src/main/java/net/ivpn/core/v2/viewmodel/LocationViewModel.kt b/core/src/main/java/net/ivpn/core/v2/viewmodel/LocationViewModel.kt
@@ -28,11 +28,13 @@ import androidx.databinding.ObservableField
 import androidx.lifecycle.ViewModel
 import net.ivpn.core.common.dagger.ApplicationScope
 import net.ivpn.core.common.distance.DistanceProvider
+import net.ivpn.core.common.prefs.OnServerListUpdatedListener
 import net.ivpn.core.common.prefs.ServersRepository
 import net.ivpn.core.common.prefs.Settings
 import net.ivpn.core.rest.HttpClientFactory
 import net.ivpn.core.rest.IVPNApi
 import net.ivpn.core.rest.RequestListener
+import net.ivpn.core.rest.data.model.Server
 import net.ivpn.core.rest.data.model.ServerLocation
 import net.ivpn.core.rest.data.proofs.LocationResponse
 import net.ivpn.core.rest.requests.common.Request
@@ -102,6 +104,7 @@ class LocationViewModel @Inject constructor(
         vpnBehaviorController.addVpnStateListener(getVpnStateListener())
         checkLocation()
         protocolController.addOnProtocolChangedListener(getOnProtocolChangeListener())
+        serversRepository.addOnServersListUpdatedListener(getOnServerListUpdatedListener())
         uiIPStateListener = object : OnIPStateChangedListener {
             override fun onIPStateChanged(uiState: IPState) {
                 if (uiState == ipState.get()) return
@@ -372,6 +375,16 @@ class LocationViewModel @Inject constructor(
         return OnProtocolChangedListener { locations.set(serversRepository.locations) }
     }
 
+    private fun getOnServerListUpdatedListener(): OnServerListUpdatedListener {
+        return object : OnServerListUpdatedListener {
+            override fun onSuccess(servers: List<Server>, isForced: Boolean) {
+                locations.set(serversRepository.locations)
+            }
+            override fun onError(throwable: Throwable) {}
+            override fun onError() {}
+        }
+    }
+
     private fun getVpnStateListener(): VpnStateListener {
         return object : VpnStateListenerImpl() {
             override fun onConnectionStateChanged(state: ConnectionState) {