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

Commit 36c82537 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Unregister listeners from ClockRegistry when destroyed am: e980bd3a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23407197



Change-Id: I150a03b8e6fbab275e92e359869df5cefa9e107a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73cfb75e e980bd3a

src/com/android/customization/module/CustomizationInjector.kt

+11 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.customization.module 
import android.content.Context

import androidx.activity.ComponentActivity

import androidx.fragment.app.FragmentActivity

import androidx.lifecycle.LifecycleOwner

import com.android.customization.model.theme.OverlayManagerCompat

import com.android.customization.model.theme.ThemeBundleProvider

import com.android.customization.model.theme.ThemeManager
@@ -47,11 +48,17 @@ interface CustomizationInjector : Injector { 
        context: Context,

    ): KeyguardQuickAffordancePickerInteractor



    fun getClockRegistry(context: Context): ClockRegistry

    fun getClockRegistry(context: Context, lifecycleOwner: LifecycleOwner): ClockRegistry



    fun getClockPickerInteractor(context: Context): ClockPickerInteractor

    fun getClockPickerInteractor(

        context: Context,

        lifecycleOwner: LifecycleOwner

    ): ClockPickerInteractor



    fun getClockSectionViewModel(context: Context): ClockSectionViewModel

    fun getClockSectionViewModel(

        context: Context,

        lifecycleOwner: LifecycleOwner

    ): ClockSectionViewModel



    fun getColorPickerInteractor(

        context: Context,
@@ -73,5 +80,6 @@ interface CustomizationInjector : Injector { 
        context: Context,

        wallpaperColorsViewModel: WallpaperColorsViewModel,

        clockViewFactory: ClockViewFactory,

        lifecycleOwner: LifecycleOwner,

    ): ClockSettingsViewModel.Factory

}

src/com/android/customization/module/ThemePickerInjector.kt

+31 −15
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import androidx.fragment.app.FragmentActivity 
import androidx.lifecycle.DefaultLifecycleObserver

import androidx.lifecycle.LifecycleOwner

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.get

import com.android.customization.model.color.ColorCustomizationManager

import com.android.customization.model.color.ColorOptionsProvider

import com.android.customization.model.grid.GridOptionsManager
@@ -99,7 +98,11 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
    private var keyguardQuickAffordanceSnapshotRestorer: KeyguardQuickAffordanceSnapshotRestorer? =

        null

    private var notificationsSnapshotRestorer: NotificationsSnapshotRestorer? = null

    private var clockRegistry: ClockRegistry? = null

    /**

     * Mapping from LifeCycleOwner's hashcode to ClockRegistry as we need to keep different

     * ClockRegistries per LifeCycle to ensure proper cleanup

     */

    private var clockRegistries: MutableMap<Int, ClockRegistry> = HashMap()

    private var clockPickerInteractor: ClockPickerInteractor? = null

    private var clockSectionViewModel: ClockSectionViewModel? = null

    private var clockCarouselViewModelFactory: ClockCarouselViewModel.Factory? = null
@@ -132,7 +135,7 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
                    ),

                    getFlags(),

                    getClockCarouselViewModelFactory(

                        getClockPickerInteractor(activity.applicationContext),

                        getClockPickerInteractor(activity.applicationContext, activity),

                    ),

                    getClockViewFactory(activity),

                    getDarkModeSnapshotRestorer(activity),
@@ -314,8 +317,8 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
                .also { notificationsSnapshotRestorer = it }

    }



    override fun getClockRegistry(context: Context): ClockRegistry {

        return clockRegistry

    override fun getClockRegistry(context: Context, lifecycleOwner: LifecycleOwner): ClockRegistry {

        return clockRegistries[lifecycleOwner.hashCode()]

            ?: ClockRegistryProvider(

                    context = context,

                    coroutineScope = getApplicationCoroutineScope(),
@@ -323,28 +326,42 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
                    backgroundDispatcher = Dispatchers.IO,

                )

                .get()

                .also { clockRegistry = it }

                .also {

                    clockRegistries[lifecycleOwner.hashCode()] = it

                    lifecycleOwner.lifecycle.addObserver(

                        object : DefaultLifecycleObserver {

                            override fun onDestroy(owner: LifecycleOwner) {

                                super.onDestroy(owner)

                                clockRegistries[lifecycleOwner.hashCode()]?.unregisterListeners()

                                clockRegistries.remove(lifecycleOwner.hashCode())

                            }

                        }

                    )

                }

    }



    override fun getClockPickerInteractor(

        context: Context,

        lifecycleOwner: LifecycleOwner,

    ): ClockPickerInteractor {

        return clockPickerInteractor

            ?: ClockPickerInteractor(

                    ClockPickerRepositoryImpl(

                        secureSettingsRepository = getSecureSettingsRepository(context),

                        registry = getClockRegistry(context),

                        registry = getClockRegistry(context, lifecycleOwner),

                        scope = getApplicationCoroutineScope(),

                    ),

                )

                .also { clockPickerInteractor = it }

    }



    override fun getClockSectionViewModel(context: Context): ClockSectionViewModel {

    override fun getClockSectionViewModel(

        context: Context,

        lifecycleOwner: LifecycleOwner

    ): ClockSectionViewModel {

        return clockSectionViewModel

            ?: ClockSectionViewModel(context, getClockPickerInteractor(context)).also {

                clockSectionViewModel = it

            }

            ?: ClockSectionViewModel(context, getClockPickerInteractor(context, lifecycleOwner))

                .also { clockSectionViewModel = it }

    }



    override fun getClockCarouselViewModelFactory(
@@ -363,9 +380,7 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
                    activity.applicationContext,

                    ScreenSizeCalculator.getInstance()

                        .getScreenSize(activity.windowManager.defaultDisplay),

                    getClockRegistry(

                        activity.applicationContext,

                    ),

                    getClockRegistry(activity.applicationContext, activity),

                )

                .also {

                    clockViewFactories[activityHashCode] = it
@@ -484,11 +499,12 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject 
        context: Context,

        wallpaperColorsViewModel: WallpaperColorsViewModel,

        clockViewFactory: ClockViewFactory,

        lifecycleOwner: LifecycleOwner,

    ): ClockSettingsViewModel.Factory {

        return clockSettingsViewModelFactory

            ?: ClockSettingsViewModel.Factory(

                    context,

                    getClockPickerInteractor(context),

                    getClockPickerInteractor(context, lifecycleOwner),

                    getColorPickerInteractor(

                        context,

                        wallpaperColorsViewModel,

src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragment.kt

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ class ClockCustomDemoFragment : AppbarFragment() { 
        setUpToolbar(view)

        clockRegistry =

            (InjectorProvider.getInjector() as ThemePickerInjector).getClockRegistry(

                requireContext()

                requireContext(),

                this

            )

        val listInUse = clockRegistry.getClocks().filter { "NOT_IN_USE" !in it.clockId }

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ class ClockSettingsFragment : AppbarFragment() { 
                        context,

                        injector.getWallpaperColorsViewModel(),

                        injector.getClockViewFactory(activity),

                        activity,

                    ),

                )

                .get(),