Configure for e, on sdk 29

4 files changed, 13 insertions, 14 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFeature.kt
index e0eb12c..a9482db 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFeature.kt
@@ -137,7 +137,7 @@ class InternetPrivacyFeature(
                     action is Action.LoadInternetModeAction -> merge(
                         getQuickPrivacyStateUseCase.quickPrivacyEnabledFlow.map { Effect.QuickPrivacyUpdatedEffect(it) },
                         ipScramblingStateUseCase.internetPrivacyMode.map { Effect.ModeUpdatedEffect(it) }.shareIn(scope = coroutineScope, started = SharingStarted.Lazily, replay = 0),
-                        flowOf(Effect.ModeUpdatedEffect(InternetPrivacyMode.REAL_IP)),
+                        // flowOf(Effect.ModeUpdatedEffect(InternetPrivacyMode.REAL_IP)),
                         appListUseCase.getAppsUsingInternet().map { apps ->
                             if (ipScramblerModule.appList.isEmpty()) {
                                 ipScramblerModule.appList =
@@ -189,11 +189,8 @@ class InternetPrivacyFeature(
                             InternetPrivacyMode.REAL_IP_LOADING
                         ) -> {
                         if (getQuickPrivacyStateUseCase.isQuickPrivacyEnabled) {
-                            ipScramblingStateUseCase.toggle(hideIp = true)?.let {
-                                flowOf(Effect.ShowAndroidVpnDisclaimerEffect(it))
-                            } ?: run {
-                                flowOf(Effect.ModeUpdatedEffect(InternetPrivacyMode.HIDE_IP_LOADING))
-                            }
+                            ipScramblingStateUseCase.toggle(hideIp = true)
+                            flowOf(Effect.ModeUpdatedEffect(InternetPrivacyMode.HIDE_IP_LOADING))
                         } else {
                             flowOf(Effect.QuickPrivacyDisabledWarningEffect)
                         }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
index e7a9480..135b563 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
@@ -101,13 +101,15 @@ class InternetPrivacyFragment :
             }
         }
 
-        binding.radioUseRealIp.container.setOnClickListener {
+        binding.radioUseRealIp.radiobutton.setOnClickListener {
             viewModel.submitAction(InternetPrivacyFeature.Action.UseRealIPAction)
         }
 
-        binding.radioUseHiddenIp.container.setOnClickListener {
+        binding.radioUseHiddenIp.radiobutton.setOnClickListener {
             viewModel.submitAction(InternetPrivacyFeature.Action.UseHiddenIPAction)
         }
+
+        binding.executePendingBindings()
     }
 
     override fun getTitle(): String = getString(R.string.ipscrambling_title)
@@ -144,7 +146,7 @@ class InternetPrivacyFragment :
             }
 
             setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(parentView: AdapterView<*>, selectedItemView: View, position: Int, id: Long) {
+                override fun onItemSelected(parentView: AdapterView<*>, selectedItemView: View?, position: Int, id: Long) {
                     viewModel.submitAction(InternetPrivacyFeature.Action.SelectLocationAction(position))
                 }
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
index 5d20e7c..81edea8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -152,7 +152,7 @@ class TrackersFeature(
                                 )
                             )
                         },
-                        appListUseCase.getAppsUsingInternet().map { apps ->
+                        appListUseCase.getInstalledAppsUsingInternet().map { apps ->
                             Effect.AvailableAppsListEffect(apps)
                         }
                     )
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
index 1c3144d..f0b0aef 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
@@ -75,9 +75,9 @@ class AppTrackersFragment :
             }
         }
         lifecycleScope.launchWhenStarted {
-            viewModel.submitAction(
-                Action.InitAction(requireArguments().getString(PARAM_PACKAGE_NAME))
-            )
+            requireArguments().getString(PARAM_PACKAGE_NAME)?.let {
+                viewModel.submitAction(Action.InitAction(it))
+            }
         }
     }
 
@@ -86,7 +86,7 @@ class AppTrackersFragment :
             .show()
     }
 
-    override fun getTitle(): String = requireArguments().getString(PARAM_LABEL)
+    override fun getTitle(): String = requireArguments().getString(PARAM_LABEL) ?: ""
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)