diff options
Diffstat (limited to 'app/src/main/java/foundation/e/privacycentralapp/features')
4 files changed, 11 insertions, 7 deletions
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 00e3fb7..e2eb58d 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 @@ -119,7 +119,7 @@ class TrackersFeature( ) } }, - appListUseCase.getBlockableApps().map { apps -> + appListUseCase.getAppsUsingInternet().map { apps -> Effect.AvailableAppsListEffect(apps) }, trackersStatisticsUseCase.listenUpdates().map { diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt index ff0c9db..16cd4a0 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFeature.kt @@ -118,7 +118,7 @@ class AppTrackersFeature( when (action) { is Action.InitAction -> { val appDesc = - trackersStateUseCase.getApplicationPermission(action.packageName) + trackersStateUseCase.getApplicationDescription(action.packageName) merge<Effect>( flow { @@ -154,9 +154,7 @@ class AppTrackersFeature( emit( Effect.AppTrackersBlockingActivatedEffect( - !trackersStateUseCase.isWhitelisted( - appUid - ) + !trackersStateUseCase.isWhitelisted(appUid) ) ) } 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 1f339ee..440edf7 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 @@ -97,7 +97,6 @@ class AppTrackersFragment : super.onViewCreated(view, savedInstanceState) binding = ApptrackersFragmentBinding.bind(view) - // TODO: crash sqlite ? binding.blockAllToggle.setOnClickListener { viewModel.submitAction(Action.BlockAllToggleAction(binding.blockAllToggle.isChecked)) } diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt index 0ab3987..580a60c 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt @@ -22,6 +22,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Switch import android.widget.TextView +import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import foundation.e.privacycentralapp.R import foundation.e.privacymodules.trackers.Tracker @@ -38,11 +39,13 @@ class ToggleTrackersAdapter( val title: TextView = view.findViewById(R.id.title) val toggle: Switch = view.findViewById(R.id.toggle) + val toggleOverlay: View = view.findViewById(R.id.toggle_clicker) fun bind(item: Pair<Tracker, Boolean>, isEnabled: Boolean) { title.text = item.first.label toggle.isChecked = item.second toggle.isEnabled = isEnabled + toggleOverlay.isVisible = !isEnabled } } @@ -58,9 +61,13 @@ class ToggleTrackersAdapter( val view = LayoutInflater.from(parent.context) .inflate(itemsLayout, parent, false) val holder = ViewHolder(view) - holder.itemView.setOnClickListener { + holder.toggle.setOnClickListener { listener(dataSet[holder.adapterPosition].first, holder.toggle.isChecked) } + holder.toggleOverlay.setOnClickListener { + listener(dataSet[holder.adapterPosition].first, false) + } + return holder } |