From 8136f57b5e368b9b266238c4857d9488b83e67ec Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 5 May 2022 11:06:16 +0100 Subject: [PATCH] making use of the view lifecycle scope for the view based fragment logic --- .../ftueauth/FtueAuthCombinedServerSelectionFragment.kt | 2 +- .../features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt | 2 +- .../onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt index 2e6057288a..b7a5dc7298 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt @@ -68,7 +68,7 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractFt views.chooseServerSubmit.debouncedClicks { updateServerUrl() } views.chooseServerInput.editText().textChanges() .onEach { views.chooseServerInput.error = null } - .launchIn(lifecycleScope) + .launchIn(viewLifecycleOwner.lifecycleScope) } private fun updateServerUrl() { diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt index 20d1a10e0f..84251b3701 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthEmailEntryFragment.kt @@ -57,7 +57,7 @@ class FtueAuthEmailEntryFragment @Inject constructor() : AbstractFtueAuthFragmen views.emailEntryInput.error = null views.emailEntrySubmit.isEnabled = it.isEmail() } - .launchIn(lifecycleScope) + .launchIn(viewLifecycleOwner.lifecycleScope) } private fun updateEmail() { diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt index 49e8875cb5..05295c5b8d 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt @@ -109,7 +109,7 @@ class FtueAuthSplashCarouselFragment @Inject constructor( private fun ViewPager2.scheduleCarouselTransition(): Job { val itemCount = adapter?.itemCount ?: throw IllegalStateException("An adapter must be set") - return lifecycleScope.launch { + return viewLifecycleOwner.lifecycleScope.launch { delay(CAROUSEL_ROTATION_DELAY_MS) setCurrentItem(currentItem.incrementByOneAndWrap(max = itemCount - 1), duration = CAROUSEL_TRANSITION_TIME_MS) }