From 2c1befaa2552012f11766c80be902eac1a1a6c31 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 22 Sep 2020 14:56:25 -0700 Subject: [PATCH] For #13959: rename to attachListenerToDisablePenaltyDeath for clarity. --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 2 +- app/src/main/java/org/mozilla/fenix/StrictModeManager.kt | 4 ++-- app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index b1109f73f..ea8d863de 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -150,7 +150,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private lateinit var navigationToolbar: Toolbar final override fun onCreate(savedInstanceState: Bundle?) { - StrictModeManager.changeStrictModePolicies(supportFragmentManager) + StrictModeManager.attachListenerToDisablePenaltyDeath(supportFragmentManager) // There is disk read violations on some devices such as samsung and pixel for android 9/10 StrictMode.allowThreadDiskReads().resetPoliciesAfter { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt b/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt index e0dd864ad..a64e1598e 100644 --- a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt +++ b/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt @@ -46,11 +46,11 @@ object StrictModeManager { } /** - * Revert strict mode to disable penalty. Tied to fragment lifecycle since strict mode + * Revert strict mode to disable penalty based on fragment lifecycle since strict mode * needs to switch to penalty logs. Using the fragment life cycle allows decoupling from any * specific fragment. */ - fun changeStrictModePolicies(fragmentManager: FragmentManager) { + fun attachListenerToDisablePenaltyDeath(fragmentManager: FragmentManager) { fragmentManager.registerFragmentLifecycleCallbacks(object : FragmentManager.FragmentLifecycleCallbacks() { override fun onFragmentResumed(fm: FragmentManager, f: Fragment) { diff --git a/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt b/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt index 560787384..62ec64d28 100644 --- a/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/StrictModeManagerTest.kt @@ -63,7 +63,7 @@ class StrictModeManagerTest { fun `test changeStrictModePolicies`() { val callbacks = slot() - StrictModeManager.changeStrictModePolicies(fragmentManager) + StrictModeManager.attachListenerToDisablePenaltyDeath(fragmentManager) verify { fragmentManager.registerFragmentLifecycleCallbacks(capture(callbacks), false) } confirmVerified(fragmentManager)