Merge "Add initial data layer for issues." into main

4 files changed, 84 insertions, 21 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt
index b5a66da06..d29b0aa3e 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt
@@ -61,7 +61,6 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() {
             } else {
                 super.onCreateAdapter(preferenceScreen)
             }
-
         /* By default, the PreferenceGroupAdapter does setHasStableIds(true). Since each Preference
          * is internally allocated with an auto-incremented ID, it does not allow us to gracefully
          * update only changed preferences based on SafetyPreferenceComparisonCallback. In order to
@@ -77,10 +76,15 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() {
                 .split(",")
         safetyCenterSessionId = requireArguments().getLong(EXTRA_SESSION_ID, INVALID_SESSION_ID)
 
+        val activity = requireActivity()
         safetyCenterViewModel =
             ViewModelProvider(
-                    requireActivity(),
-                    LiveSafetyCenterViewModelFactory(requireActivity().getApplication()),
+                    activity,
+                    LiveSafetyCenterViewModelFactory(
+                        activity.application,
+                        activity.taskId,
+                        sameTaskSourceIds,
+                    ),
                 )
                 .get(SafetyCenterViewModel::class.java)
         safetyCenterViewModel.safetyCenterUiLiveData.observe(this) { uiData: SafetyCenterUiData? ->
@@ -91,8 +95,7 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() {
             displayErrorDetails(errorDetails)
         }
 
-        val safetyCenterIntent: ParsedSafetyCenterIntent =
-            requireActivity().intent.toSafetyCenterIntent()
+        val safetyCenterIntent: ParsedSafetyCenterIntent = activity.intent.toSafetyCenterIntent()
         val isQsFragment =
             getArguments()?.getBoolean(QUICK_SETTINGS_SAFETY_CENTER_FRAGMENT, false) ?: false
         collapsableIssuesCardHelper =
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/IssueUiData.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/IssueUiData.kt
new file mode 100644
index 000000000..e260bb917
--- /dev/null
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/IssueUiData.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.permissioncontroller.safetycenter.ui.model
+
+import android.safetycenter.SafetyCenterIssue
+
+/** UI model representation of [SafetyCenterIssue] */
+data class IssueUiData(
+    val issue: SafetyCenterIssue,
+    val isDismissed: Boolean,
+    val resolvedIssueActionId: String? = null,
+    val launchTaskId: Int? = null,
+)
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt
index 4ddcf1c3d..0b976f49d 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt
@@ -43,11 +43,16 @@ import com.android.safetycenter.internaldata.SafetyCenterIds
 
 /* A SafetyCenterViewModel that talks to the real backing service for Safety Center. */
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
+class LiveSafetyCenterViewModel(
+    app: Application,
+    private val taskId: Int,
+    private val sameTaskSourceIds: List<String>,
+) : SafetyCenterViewModel(app) {
 
     private val TAG: String = LiveSafetyCenterViewModel::class.java.simpleName
     override val statusUiLiveData: LiveData<StatusUiData>
         get() = safetyCenterUiLiveData.map { StatusUiData(it.safetyCenterData) }
+
     override val safetyCenterUiLiveData: LiveData<SafetyCenterUiData> by this::_safetyCenterLiveData
     override val errorLiveData: LiveData<SafetyCenterErrorDetails> by this::_errorLiveData
 
@@ -65,7 +70,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
     private val safetyCenterManager = app.getSystemService(SafetyCenterManager::class.java)!!
 
     override fun getCurrentSafetyCenterDataAsUiData(): SafetyCenterUiData =
-        SafetyCenterUiData(safetyCenterManager.safetyCenterData)
+        uiData(safetyCenterManager.safetyCenterData)
 
     override fun dismissIssue(issue: SafetyCenterIssue) {
         safetyCenterManager.dismissSafetyCenterIssue(issue.id)
@@ -74,7 +79,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
     override fun executeIssueAction(
         issue: SafetyCenterIssue,
         action: SafetyCenterIssue.Action,
-        launchTaskId: Int?
+        launchTaskId: Int?,
     ) {
         val issueId =
             if (launchTaskId != null) {
@@ -107,9 +112,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
     override fun navigateToSafetyCenter(context: Context, navigationSource: NavigationSource?) {
         val intent = Intent(ACTION_SAFETY_CENTER)
 
-        if (navigationSource != null) {
-            navigationSource.addToIntent(intent)
-        }
+        navigationSource?.addToIntent(intent)
 
         context.startActivity(intent)
     }
@@ -132,7 +135,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
             } else {
                 safetyCenterManager.refreshSafetySources(
                     SafetyCenterManager.REFRESH_REASON_PAGE_OPEN,
-                    safetySourceIds
+                    safetySourceIds,
                 )
             }
         }
@@ -174,7 +177,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
         override fun onActive() {
             safetyCenterManager.addOnSafetyCenterDataChangedListener(
                 getMainExecutor(app.applicationContext),
-                this
+                this,
             )
             super.onActive()
         }
@@ -209,7 +212,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
                 Log.d(
                     TAG,
                     "Received SafetyCenterData while issue resolution animations" +
-                        " occurring. Will update UI with new data soon."
+                        " occurring. Will update UI with new data soon.",
                 )
                 return
             }
@@ -254,7 +257,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
         private fun isCurrentlyScanning(): Boolean = value?.safetyCenterData?.isScanning() ?: false
 
         private fun sendNextData() {
-            value = SafetyCenterUiData(safetyCenterDataQueue.removeFirst())
+            value = uiData(safetyCenterDataQueue.removeFirst())
         }
 
         private fun skipNextData() = safetyCenterDataQueue.removeFirst()
@@ -270,7 +273,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
             // The current SafetyCenterData still contains the resolved SafetyCenterIssue objects.
             // Send it with the resolved IDs so the UI can generate the correct preferences and
             // trigger the right animations for issue resolution.
-            value = SafetyCenterUiData(currentData, currentResolvedIssues)
+            value = uiData(currentData, currentResolvedIssues)
         }
 
         @MainThread
@@ -279,6 +282,11 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) {
             maybeProcessDataToNextResolvedIssues()
         }
     }
+
+    private fun uiData(
+        safetyCenterData: SafetyCenterData,
+        resolvedIssues: Map<IssueId, ActionId> = emptyMap(),
+    ) = SafetyCenterUiData(safetyCenterData, taskId, sameTaskSourceIds, resolvedIssues)
 }
 
 /** Returns inflight issues pending resolution */
@@ -309,8 +317,15 @@ private val SafetyCenterData.allResolvableIssues: Sequence<SafetyCenterIssue>
         }
 
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-class LiveSafetyCenterViewModelFactory(private val app: Application) : ViewModelProvider.Factory {
+class LiveSafetyCenterViewModelFactory
+@JvmOverloads
+constructor(
+    private val app: Application,
+    private val taskId: Int = 0,
+    private val sameTaskSourceIds: List<String> = emptyList(),
+) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        @Suppress("UNCHECKED_CAST") return LiveSafetyCenterViewModel(app) as T
+        @Suppress("UNCHECKED_CAST")
+        return LiveSafetyCenterViewModel(app, taskId, sameTaskSourceIds) as T
     }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
index 69a315f08..d8aadae2f 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
@@ -29,11 +29,21 @@ import com.android.safetycenter.internaldata.SafetyCenterIds
 import com.android.safetycenter.internaldata.SafetyCenterIssueKey
 
 /** UI model representation of Safety Center Data */
+@RequiresApi(TIRAMISU)
 data class SafetyCenterUiData(
     val safetyCenterData: SafetyCenterData,
-    val resolvedIssues: Map<IssueId, ActionId> = emptyMap()
+    private val taskId: Int,
+    private val sameTaskSourceIds: List<String>,
+    val resolvedIssues: Map<IssueId, ActionId> = emptyMap(),
 ) {
-    @RequiresApi(TIRAMISU)
+
+    val issueUiDatas: List<IssueUiData> by
+        lazy(LazyThreadSafetyMode.NONE) {
+            safetyCenterData.issues.map {
+                IssueUiData(it, false, resolvedIssues[it.id], getLaunchTaskIdForIssue(it))
+            }
+        }
+
     fun getMatchingIssue(issueKey: SafetyCenterIssueKey): SafetyCenterIssue? {
         return safetyCenterData.issues.find {
             SafetyCenterIds.issueIdFromString(it.id).safetyCenterIssueKey == issueKey
@@ -67,7 +77,7 @@ data class SafetyCenterUiData(
     @RequiresApi(UPSIDE_DOWN_CAKE)
     private fun selectMatchingIssuesForGroup(
         groupId: String,
-        issues: List<SafetyCenterIssue>
+        issues: List<SafetyCenterIssue>,
     ): List<SafetyCenterIssue> {
         val issuesToGroups = safetyCenterData.extras.getBundle(ISSUES_TO_GROUPS_BUNDLE_KEY)
         return issues.filter {
@@ -84,4 +94,12 @@ data class SafetyCenterUiData(
     @RequiresApi(UPSIDE_DOWN_CAKE)
     fun SafetyCenterData.visibleDismissedIssues() =
         dismissedIssues.filter { it.severityLevel > ISSUE_SEVERITY_LEVEL_OK }
+
+    private fun getLaunchTaskIdForIssue(issue: SafetyCenterIssue): Int? {
+        val sourceId: String =
+            SafetyCenterIds.issueIdFromString(issue.id)
+                .getSafetyCenterIssueKey()
+                .getSafetySourceId()
+        return if (sameTaskSourceIds.contains(sourceId)) taskId else null
+    }
 }