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

Commit fe36b334 authored by Sumedh Sen's avatar Sumedh Sen Committed by Android (Google) Code Review
Browse files

Merge "Skip checking if a broadcastreceiver was already registered" into main

parents 54c80f6a b6b88351

src/com/android/settings/spa/app/appinfo/AppRestoreButton.kt

+5 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ class AppRestoreButton(packageInfoPresenter: PackageInfoPresenter) { 
    private val packageInstaller = userPackageManager.packageInstaller

    private val packageName = packageInfoPresenter.packageName

    private val userHandle = UserHandle.of(packageInfoPresenter.userId)

    private var broadcastReceiverIsCreated = false

    private lateinit var coroutineScope: CoroutineScope

    private lateinit var updateButtonTextJob: Job

    private val buttonTexts = intArrayOf(
@@ -65,15 +64,13 @@ class AppRestoreButton(packageInfoPresenter: PackageInfoPresenter) { 


    @Composable

    fun getActionButton(app: ApplicationInfo): ActionButton {

        if (!broadcastReceiverIsCreated) {

        val intentFilter = IntentFilter(INTENT_ACTION)

        DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent ->

            if (app.packageName == intent.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME)) {

                onReceive(intent, app)

            }

        }

            broadcastReceiverIsCreated = true

        }



        coroutineScope = rememberCoroutineScope()

        if (app.isArchived && ::updateButtonTextJob.isInitialized && !updateButtonTextJob.isActive) {

            buttonTextIndexStateFlow.value = 0