Configure relay list listener in onResume/onPause

1 files changed, 14 insertions, 4 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
index 62a9440f64..96519c1893 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
@@ -48,10 +48,6 @@ class SelectLocationFragment : Fragment() {
 
         parentActivity = context as MainActivity
         relayListListener = parentActivity.relayListListener
-
-        relayListListener.onRelayListChange = { relayList, selectedItem ->
-            updateRelayListJob = updateRelayList(relayList, selectedItem)
-        }
     }
 
     override fun onCreateView(
@@ -71,6 +67,20 @@ class SelectLocationFragment : Fragment() {
         return view
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        relayListListener.onRelayListChange = { relayList, selectedItem ->
+            updateRelayListJob = updateRelayList(relayList, selectedItem)
+        }
+    }
+
+    override fun onPause() {
+        relayListListener.onRelayListChange = null
+
+        super.onPause()
+    }
+
     override fun onDestroyView() {
         updateRelayListJob?.cancel()