Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f18e02 authored by Anton Potapov's avatar Anton Potapov
Browse files

Add userId check before loading icon in Device Controls 

Test: manual with the steps from the bug
Test: manual with a normal icon
Test: atest CanUseIconPredicate
Test: atest ControlViewHolderTest
Bug: 272025416
Merged-In: I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2
Merged-In: I60896a6f53307f0e97a9223b599a2891c6c0c08d
Merged-In: Ib0e677f7ccbed6299ea07939519c7dcf6d371bec
Merged-In: Ibe4fb69a90904787b9f97a7cd90d318a047d1e11
Change-Id: Iba846f19098c71c0519470cd7b8c1fd60d47e70b
parent 28428b73

packages/SystemUI/src/com/android/systemui/controls/management/ControlAdapter.kt

+9 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import androidx.recyclerview.widget.GridLayoutManager 
import androidx.recyclerview.widget.RecyclerView

import com.android.systemui.R

import com.android.systemui.controls.ControlInterface

import com.android.systemui.controls.ui.CanUseIconPredicate

import com.android.systemui.controls.ui.RenderInfo



private typealias ModelFavoriteChanger = (String, Boolean) -> Unit
@@ -49,7 +50,8 @@ private typealias ModelFavoriteChanger = (String, Boolean) -> Unit 
 * @property elevation elevation of each control view

 */

class ControlAdapter(

    private val elevation: Float

    private val elevation: Float,

    private val currentUserId: Int

) : RecyclerView.Adapter<Holder>() {



    companion object {
@@ -84,6 +86,7 @@ class ControlAdapter( 
                        background = parent.context.getDrawable(

                                R.drawable.control_background_ripple)

                    },

                    currentUserId,

                    model?.moveHelper // Indicates that position information is needed

                ) { id, favorite ->

                    model?.changeFavoriteStatus(id, favorite)
@@ -189,6 +192,7 @@ private class ZoneHolder(view: View) : Holder(view) { 
 */

internal class ControlHolder(

    view: View,

    currentUserId: Int,

    val moveHelper: ControlsModel.MoveHelper?,

    val favoriteCallback: ModelFavoriteChanger

) : Holder(view) {
@@ -205,6 +209,7 @@ internal class ControlHolder( 
        visibility = View.VISIBLE

    }



    private val canUseIconPredicate = CanUseIconPredicate(currentUserId)

    private val accessibilityDelegate = ControlHolderAccessibilityDelegate(

        this::stateDescription,

        this::getLayoutPosition,
@@ -264,7 +269,9 @@ internal class ControlHolder( 
        val fg = context.getResources().getColorStateList(ri.foreground, context.getTheme())



        icon.imageTintList = null

        ci.customIcon?.let {

        ci.customIcon

                ?.takeIf(canUseIconPredicate)

                ?.let {

            icon.setImageIcon(it)

        } ?: run {

            icon.setImageDrawable(ri.icon)

packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ class ControlsEditingActivity @Inject constructor( 
        val elevation = resources.getFloat(R.dimen.control_card_elevation)

        val recyclerView = requireViewById<RecyclerView>(R.id.list)

        recyclerView.alpha = 0.0f

        val adapter = ControlAdapter(elevation).apply {

        val adapter = ControlAdapter(elevation, currentUserTracker.currentUserId).apply {

            registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {

                var hasAnimated = false

                override fun onChanged() {

packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt

+3 −2
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ class ControlsFavoritingActivity @Inject constructor( 
                }



                executor.execute {

                    structurePager.adapter = StructureAdapter(listOfStructures)

                    structurePager.adapter = StructureAdapter(listOfStructures,

                            currentUserTracker.currentUserId)

                    structurePager.setCurrentItem(structureIndex)

                    if (error) {

                        statusText.text = resources.getString(R.string.controls_favorite_load_error,
@@ -210,7 +211,7 @@ class ControlsFavoritingActivity @Inject constructor( 
        structurePager.alpha = 0.0f

        pageIndicator.alpha = 0.0f

        structurePager.apply {

            adapter = StructureAdapter(emptyList())

            adapter = StructureAdapter(emptyList(), currentUserTracker.currentUserId)

            registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {

                override fun onPageSelected(position: Int) {

                    super.onPageSelected(position)

packages/SystemUI/src/com/android/systemui/controls/management/StructureAdapter.kt

+7 −4
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ import androidx.recyclerview.widget.RecyclerView 
import com.android.systemui.R



class StructureAdapter(

    private val models: List<StructureContainer>

    private val models: List<StructureContainer>,

    private val currentUserId: Int

) : RecyclerView.Adapter<StructureAdapter.StructureHolder>() {



    override fun onCreateViewHolder(parent: ViewGroup, p1: Int): StructureHolder {

        val layoutInflater = LayoutInflater.from(parent.context)

        return StructureHolder(

            layoutInflater.inflate(R.layout.controls_structure_page, parent, false)

            layoutInflater.inflate(R.layout.controls_structure_page, parent, false),

            currentUserId

        )

    }
@@ -40,7 +42,8 @@ class StructureAdapter( 
        holder.bind(models[index].model)

    }



    class StructureHolder(view: View) : RecyclerView.ViewHolder(view) {

    class StructureHolder(view: View, currentUserId: Int) :

            RecyclerView.ViewHolder(view) {



        private val recyclerView: RecyclerView

        private val controlAdapter: ControlAdapter
@@ -48,7 +51,7 @@ class StructureAdapter( 
        init {

            recyclerView = itemView.requireViewById<RecyclerView>(R.id.listAll)

            val elevation = itemView.context.resources.getFloat(R.dimen.control_card_elevation)

            controlAdapter = ControlAdapter(elevation)

            controlAdapter = ControlAdapter(elevation, currentUserId)

            setUpRecyclerView()

        }

packages/SystemUI/src/com/android/systemui/controls/ui/CanUseIconPredicate.kt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.systemui.controls.ui



import android.content.ContentProvider

import android.graphics.drawable.Icon



class CanUseIconPredicate(private val currentUserId: Int) : (Icon) -> Boolean {



    override fun invoke(icon: Icon): Boolean =

        if (icon.type == Icon.TYPE_URI || icon.type == Icon.TYPE_URI_ADAPTIVE_BITMAP) {

            ContentProvider.getUserIdFromUri(icon.uri, currentUserId) == currentUserId

        } else {

            true

        }

}