Country list on Risiko-Ermittlung AFTER WLAN ON (EXPOSUREAPP-3152)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.View
 import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentInteroperabilityConfigurationBinding
 import de.rki.coronawarnapp.ui.main.MainActivity
@@ -29,7 +30,6 @@ class InteroperabilityConfigurationFragment :
     private val networkCallback = object : ConnectivityHelper.NetworkCallback() {
         override fun onNetworkAvailable() {
             vm.getAllCountries()
-            unregisterNetworkCallback()
         }
 
         override fun onNetworkUnavailable() {
@@ -44,6 +44,10 @@ class InteroperabilityConfigurationFragment :
             binding.countryData = it
         }
 
+        if (ConnectivityHelper.isNetworkEnabled(CoronaWarnApplication.getAppContext())) {
+            registerNetworkCallback()
+        }
+
         vm.saveInteroperabilityUsed()
 
         binding.interoperabilityConfigurationHeader.headerButtonBack.buttonIcon.setOnClickListener {
@@ -58,14 +62,13 @@ class InteroperabilityConfigurationFragment :
 
         binding.interoperabilityConfigurationCountryList
             .noCountriesRiskdetailsInfoview.riskDetailsOpenSettingsButton.setOnClickListener {
-            val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY)
-            } else {
-                Intent(Settings.ACTION_SETTINGS)
+                val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY)
+                } else {
+                    Intent(Settings.ACTION_SETTINGS)
+                }
+                startActivity(intent)
             }
-            startActivity(intent)
-            registerNetworkCallback()
-        }
     }
 
     private fun registerNetworkCallback() {
@@ -88,4 +91,11 @@ class InteroperabilityConfigurationFragment :
         super.onDestroy()
         unregisterNetworkCallback()
     }
+
+    override fun onResume() {
+        super.onResume()
+        if (ConnectivityHelper.isNetworkEnabled(CoronaWarnApplication.getAppContext())) {
+            registerNetworkCallback()
+        }
+    }
 }