Merge branch '5648-apps_pro_profile' into 'main'

5648: display trackers for pro-profile app instances.

See merge request e/os/advanced-privacy!100

2 files changed, 6 insertions, 8 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index 83359e1..cb32c2c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 E FOUNDATION
+ * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,9 +78,9 @@ class TrackersFragment :
         binding.apps.apply {
             layoutManager = LinearLayoutManager(requireContext())
             setHasFixedSize(true)
-            adapter = AppsAdapter(R.layout.trackers_item_app) { packageName ->
+            adapter = AppsAdapter(R.layout.trackers_item_app) { appUid ->
                 viewModel.submitAction(
-                    TrackersViewModel.Action.ClickAppAction(packageName)
+                    TrackersViewModel.Action.ClickAppAction(appUid)
                 )
             }
         }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
index 2cdfabc..8b5cc32 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 E FOUNDATION
+ * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@ import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import foundation.e.privacycentralapp.domain.entities.AppWithCounts
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
 import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -35,7 +34,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class TrackersViewModel(
-    private val getQuickPrivacyStateUseCase: GetQuickPrivacyStateUseCase,
     private val trackersStatisticsUseCase: TrackersStatisticsUseCase
 ) : ViewModel() {
 
@@ -79,7 +77,7 @@ class TrackersViewModel(
     }
 
     private suspend fun actionClickApp(action: Action.ClickAppAction) {
-        state.value.apps?.find { it.packageName == action.packageName }?.let {
+        state.value.apps?.find { it.uid == action.appUid }?.let {
             _singleEvents.emit(SingleEvent.OpenAppDetailsEvent(it))
         }
     }
@@ -91,7 +89,7 @@ class TrackersViewModel(
     }
 
     sealed class Action {
-        data class ClickAppAction(val packageName: String) : Action()
+        data class ClickAppAction(val appUid: Int) : Action()
         object ClickLearnMore : Action()
     }
 }