aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/foundation/e/advancedprivacy/features
diff options
context:
space:
mode:
authorGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-09-19 06:59:32 +0000
committerGuillaume Jacquart <guillaume.jacquart@hoodbrains.com>2023-09-19 06:59:32 +0000
commita69195af0c3ed5f639585b47db69b55b57b33c40 (patch)
tree951cd5ebc57b3972dbece4651de28761e5e1120d /app/src/main/java/foundation/e/advancedprivacy/features
parenta38472602d259b6c265660bf3b0ba472f20c6a7f (diff)
parentc421acd91db4decbf9a9f136ecfa2719ffada665 (diff)
downloadadvanced-privacy-a69195af0c3ed5f639585b47db69b55b57b33c40.tar.gz
Merge branch 'epic18-standalone_ipscrambling' into 'main'
epic18: make IPScrambling work standalone See merge request e/os/advanced-privacy!146
Diffstat (limited to 'app/src/main/java/foundation/e/advancedprivacy/features')
-rw-r--r--app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt2
-rw-r--r--app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt5
2 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
index 5eb0bb6..999955e 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
@@ -105,7 +105,7 @@ class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) {
}
viewLifecycleOwner.lifecycleScope.launch {
- viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+ viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
render(viewModel.state.value)
viewModel.state.collect(::render)
}
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
index 80e00bc..059e11d 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2023 MURENA SAS
* Copyright (C) 2021 E FOUNDATION
*
* This program is free software: you can redistribute it and/or modify
@@ -120,11 +121,11 @@ class InternetPrivacyViewModel(
}
}
- private fun actionUseRealIP() {
+ private suspend fun actionUseRealIP() {
ipScramblingStateUseCase.toggle(hideIp = false)
}
- private fun actionUseHiddenIP() {
+ private suspend fun actionUseHiddenIP() {
ipScramblingStateUseCase.toggle(hideIp = true)
}