1 files changed, 7 insertions, 17 deletions
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
index 1180af3..b4fc8a1 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
@@ -32,7 +32,7 @@ import foundation.e.advancedprivacy.common.NavToolbarFragment
 import foundation.e.advancedprivacy.common.ToggleAppsAdapter
 import foundation.e.advancedprivacy.common.setToolTipForAsterisk
 import foundation.e.advancedprivacy.databinding.FragmentInternetActivityPolicyBinding
-import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.FeatureServiceState
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.util.Locale
@@ -136,19 +136,12 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
 
     private fun render(state: InternetPrivacyState) {
         binding.radioUseHiddenIp.radiobutton.apply {
-            isChecked = state.mode in listOf(
-                InternetPrivacyMode.HIDE_IP,
-                InternetPrivacyMode.HIDE_IP_LOADING
-            )
-            isEnabled = state.mode != InternetPrivacyMode.HIDE_IP_LOADING
+            isChecked = state.mode.isChecked
+            isEnabled = state.mode != FeatureServiceState.STARTING
         }
         binding.radioUseRealIp.radiobutton.apply {
-            isChecked =
-                state.mode in listOf(
-                InternetPrivacyMode.REAL_IP,
-                InternetPrivacyMode.REAL_IP_LOADING
-            )
-            isEnabled = state.mode != InternetPrivacyMode.REAL_IP_LOADING
+            isChecked = !state.mode.isChecked
+            isEnabled = state.mode != FeatureServiceState.STOPPING
         }
 
         binding.ipscramblingSelectLocation.setSelection(state.selectedLocationPosition)
@@ -157,7 +150,7 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
         binding.apps.post {
             (binding.apps.adapter as ToggleAppsAdapter?)?.setData(
                 list = state.getApps(),
-                isEnabled = state.mode == InternetPrivacyMode.HIDE_IP
+                isEnabled = state.mode == FeatureServiceState.ON
             )
         }
 
@@ -170,10 +163,7 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
         )
 
         when {
-            state.mode in listOf(
-                InternetPrivacyMode.HIDE_IP_LOADING,
-                InternetPrivacyMode.REAL_IP_LOADING
-            )
+            state.mode.isLoading
                 || state.availableApps.isEmpty() -> {
                 binding.loader.visibility = View.VISIBLE
                 viewIdsToHide.forEach { it.visibility = View.GONE }