1 files changed, 17 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index 60cb955496..f627ad789a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -21,6 +21,7 @@ import android.widget.Button
 import android.widget.ImageButton
 
 import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache
+import net.mullvad.mullvadvpn.dataproxy.RelayListListener
 import net.mullvad.mullvadvpn.model.GeoIpLocation
 import net.mullvad.mullvadvpn.model.TunnelStateTransition
 
@@ -34,6 +35,7 @@ class ConnectFragment : Fragment() {
 
     private lateinit var parentActivity: MainActivity
     private lateinit var locationInfoCache: LocationInfoCache
+    private lateinit var relayListListener: RelayListListener
 
     private var daemon = CompletableDeferred<MullvadDaemon>()
     private var vpnPermission = CompletableDeferred<Unit>()
@@ -51,6 +53,7 @@ class ConnectFragment : Fragment() {
 
         parentActivity = context as MainActivity
         locationInfoCache = parentActivity.locationInfoCache
+        relayListListener = parentActivity.relayListListener
         waitForDaemonJob = waitForDaemon(parentActivity.asyncDaemon)
     }
 
@@ -85,6 +88,20 @@ class ConnectFragment : Fragment() {
         return view
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        relayListListener.onRelayListChange = { relayList, selectedRelayItem ->
+            switchLocationButton.location = selectedRelayItem
+        }
+    }
+
+    override fun onPause() {
+        relayListListener.onRelayListChange = null
+
+        super.onPause()
+    }
+
     override fun onDestroyView() {
         locationInfo.onDestroy()
         switchLocationButton.onDestroy()