summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt8
-rw-r--r--app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt4
-rw-r--r--app/src/main/res/values/strings.xml2
3 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
index 95726db..7270c32 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
@@ -55,7 +55,7 @@ class DashboardFeature(
val locationMode: LocationMode = LocationMode.REAL_LOCATION,
val leakedTrackersCount: Int? = null,
val trackersCount: Int? = null,
- val activeTrackersCount: Int? = null,
+ val allowedTrackersCount: Int? = null,
val dayStatistics: List<Pair<Int, Int>>? = null,
val dayLabels: List<String>? = null
)
@@ -88,7 +88,7 @@ class DashboardFeature(
val dayLabels: List<String>,
val dayTrackersCount: Int,
val trackersCount: Int,
- val activeTrackersCount: Int
+ val allowedTrackersCount: Int
) : Effect()
data class TrackersBlockedUpdatedEffect(val areAllTrackersBlocked: Boolean) : Effect()
data class UpdateLocationModeEffect(val mode: LocationMode) : Effect()
@@ -119,7 +119,7 @@ class DashboardFeature(
dayLabels = effect.dayLabels,
leakedTrackersCount = effect.dayTrackersCount,
trackersCount = effect.trackersCount,
- activeTrackersCount = effect.activeTrackersCount
+ allowedTrackersCount = effect.allowedTrackersCount
)
is Effect.TrackersBlockedUpdatedEffect -> state.copy(
@@ -179,7 +179,7 @@ class DashboardFeature(
dayLabels = dayStatistics.periods,
dayTrackersCount = dayStatistics.trackersCount,
trackersCount = trackersCount,
- activeTrackersCount = nonBlockedTrackersCount
+ allowedTrackersCount = nonBlockedTrackersCount
)
}
}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
index 588eedd..ea470a2 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
@@ -239,8 +239,8 @@ class DashboardFragment :
)
}
- if (state.activeTrackersCount != null && state.trackersCount != null) {
- binding.amITracked.subTitle = getString(R.string.dashboard_am_i_tracked_subtitle, state.trackersCount, state.activeTrackersCount)
+ if (state.allowedTrackersCount != null && state.trackersCount != null) {
+ binding.amITracked.subTitle = getString(R.string.dashboard_am_i_tracked_subtitle, state.trackersCount, state.allowedTrackersCount)
} else {
binding.amITracked.subTitle = ""
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13ecf23..cd9c9bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,7 +29,7 @@
<string name="dashboard_first_ipscrambling_activation">While your IP is faked, your internet speed is likely to be reduced.</string>
<string name="dashboard_am_i_tracked_title">Manage apps\' trackers</string>
- <string name="dashboard_am_i_tracked_subtitle">%1$d app trackers, %2$d active trackers</string>
+ <string name="dashboard_am_i_tracked_subtitle">%1$d app trackers, %2$d allowed trackers</string>
<string name="dashboard_apps_permissions_title">Manage apps\' permissions</string>
<string name="dashboard_apps_permissions_subtitle">Manage your permissions</string>
<string name="dashboard_location_title">Manage my location</string>