From f73798c673b10a40e229c15f3ce1cae8e7911243 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 24 May 2022 13:59:44 -0400 Subject: [PATCH 01/40] Update navComponentVersion to 2.4.2 --- build.gradle | 2 +- .../preview/PreviewImageFragment.kt | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index cb09ec0c4097..ebcb64a30c62 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ ext { buildscript { ext.kotlinVersion = '1.6.10' - ext.navComponentVersion = '2.3.5' + ext.navComponentVersion = '2.4.2' ext.detektVersion = '1.15.0' ext.daggerVersion = '2.41' diff --git a/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt b/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt index bd2bcc39c16c..c9eda4e59afb 100644 --- a/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt +++ b/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt @@ -271,14 +271,16 @@ class PreviewImageFragment : Fragment(R.layout.preview_image_fragment) { // TODO: Temporarily added if check to fix this occasional crash // https://stackoverflow.com/q/51060762/193545 if (navController.currentDestination?.id == R.id.preview_dest) { - navController.navigate( - PreviewImageFragmentDirections.actionPreviewFragmentToCropFragment( - inputFilePath, - outputFileExtension, - shouldReturnToPreviewScreen - ), - navOptions - ) + outputFileExtension?.let { + navController.navigate( + PreviewImageFragmentDirections.actionPreviewFragmentToCropFragment( + inputFilePath, + outputFileExtension, + shouldReturnToPreviewScreen + ), + navOptions + ) + } } } From 26b9c46beeead3d769b6a988ee0ce0d0f89ac327 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 24 May 2022 17:20:07 -0400 Subject: [PATCH 02/40] Ignore NullSafeMutableLiveData lint error --- config/lint.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/lint.xml b/config/lint.xml index 5ddeb9c0bbc7..08006cd23f03 100644 --- a/config/lint.xml +++ b/config/lint.xml @@ -89,4 +89,17 @@ + + From a6e9cc192b15e86d8d313a2617e2a783ab30b4a5 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 24 May 2022 18:35:47 -0400 Subject: [PATCH 03/40] Disable NullSafeMutableLiveData from build.gradle --- WordPress/build.gradle | 16 ++++++++++++++++ config/lint.xml | 13 ------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 44693f124b7d..d9b5b2fb4ce9 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -270,6 +270,22 @@ android { checkDependencies = true checkGeneratedSources = true lintConfig file("${project.rootDir}/config/lint.xml") + + /* + There are several bugs reported for several lifecycle-livedata versions. Here is a couple: + * https://issuetracker.google.com/issues/169249668 + * https://issuetracker.google.com/issues/189967522 + + There are several bug fix reports in ther lifecycle release notes. I can see 5 bug fixes + related to it if I search for `NullSafeMutableLiveData`: + * https://developer.android.com/jetpack/androidx/releases/lifecycle NullSafeMutableLiveData) + + We are disabling this check for now as it results in a crash, but we should try to enable + it again as we update our `lifecycle` version. + + Disabling this from `lint.xml` file doesn't seem to work, that's why it's added here. + */ + disable "NullSafeMutableLiveData" } packagingOptions { diff --git a/config/lint.xml b/config/lint.xml index 08006cd23f03..5ddeb9c0bbc7 100644 --- a/config/lint.xml +++ b/config/lint.xml @@ -89,17 +89,4 @@ - - From 2d2973d1fef9ff2e4b9be6113f06120d4e81a738 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 24 May 2022 18:36:18 -0400 Subject: [PATCH 04/40] Fixes FragmentLiveDataObserve lint errors --- .../android/ui/activitylog/list/ActivityLogListFragment.kt | 2 +- .../main/java/org/wordpress/android/ui/pages/PagesFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt index e0e32e02065d..47f22a08fa46 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt @@ -192,7 +192,7 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) { } }) - viewModel.moveToTop.observe(this@ActivityLogListFragment, { + viewModel.moveToTop.observe(viewLifecycleOwner, { logListView.scrollToPosition(0) }) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt index dbbc69b993ae..640861dca3ae 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt @@ -468,7 +468,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ } }) - viewModel.publishAction.observe(this@PagesFragment, { + viewModel.publishAction.observe(viewLifecycleOwner, { it?.let { uploadUtilsWrapper.publishPost(activity, it.post, it.site) } From 51af542de4a64d6a26681cf5c5b2e2131f94e676 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Wed, 25 May 2022 10:56:56 -0400 Subject: [PATCH 05/40] Adds defaultValue @null to outputFileExtension in nav_graph --- .../preview/PreviewImageFragment.kt | 18 ++++++++---------- .../src/main/res/navigation/nav_graph.xml | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt b/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt index c9eda4e59afb..bd2bcc39c16c 100644 --- a/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt +++ b/libs/image-editor/ImageEditor/src/main/kotlin/org/wordpress/android/imageeditor/preview/PreviewImageFragment.kt @@ -271,16 +271,14 @@ class PreviewImageFragment : Fragment(R.layout.preview_image_fragment) { // TODO: Temporarily added if check to fix this occasional crash // https://stackoverflow.com/q/51060762/193545 if (navController.currentDestination?.id == R.id.preview_dest) { - outputFileExtension?.let { - navController.navigate( - PreviewImageFragmentDirections.actionPreviewFragmentToCropFragment( - inputFilePath, - outputFileExtension, - shouldReturnToPreviewScreen - ), - navOptions - ) - } + navController.navigate( + PreviewImageFragmentDirections.actionPreviewFragmentToCropFragment( + inputFilePath, + outputFileExtension, + shouldReturnToPreviewScreen + ), + navOptions + ) } } diff --git a/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml b/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml index d7c954847a50..353f495ba4f2 100644 --- a/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml +++ b/libs/image-editor/ImageEditor/src/main/res/navigation/nav_graph.xml @@ -17,6 +17,7 @@ android:defaultValue='""'/> Date: Wed, 25 May 2022 11:00:20 -0400 Subject: [PATCH 06/40] Improve the comment for disabling NullSafeMutableLiveData lint check --- WordPress/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d9b5b2fb4ce9..b382e1e8ea58 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -280,8 +280,10 @@ android { related to it if I search for `NullSafeMutableLiveData`: * https://developer.android.com/jetpack/androidx/releases/lifecycle NullSafeMutableLiveData) - We are disabling this check for now as it results in a crash, but we should try to enable - it again as we update our `lifecycle` version. + We are disabling this check for now as the lint task crashes due to the bugs mentioned above. + We should try to enable it again as we update our `lifecycle` version. We already have + several `NullSafeMutableLiveData` lint issues we need to address, so it's an important + check for us to keep enabled. Disabling this from `lint.xml` file doesn't seem to work, that's why it's added here. */ From e0ff59fe0d40a0c78ea9ab05a589a44651d15c77 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 12:34:45 +0300 Subject: [PATCH 07/40] Analysis: Remove global disabling of null safe mutable live data There are currently 32 errors related to 'NullSafeMutableLiveData'. All those will get resolved or suppressed locally in subsequent commits. --- WordPress/build.gradle | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index b382e1e8ea58..44693f124b7d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -270,24 +270,6 @@ android { checkDependencies = true checkGeneratedSources = true lintConfig file("${project.rootDir}/config/lint.xml") - - /* - There are several bugs reported for several lifecycle-livedata versions. Here is a couple: - * https://issuetracker.google.com/issues/169249668 - * https://issuetracker.google.com/issues/189967522 - - There are several bug fix reports in ther lifecycle release notes. I can see 5 bug fixes - related to it if I search for `NullSafeMutableLiveData`: - * https://developer.android.com/jetpack/androidx/releases/lifecycle NullSafeMutableLiveData) - - We are disabling this check for now as the lint task crashes due to the bugs mentioned above. - We should try to enable it again as we update our `lifecycle` version. We already have - several `NullSafeMutableLiveData` lint issues we need to address, so it's an important - check for us to keep enabled. - - Disabling this from `lint.xml` file doesn't seem to work, that's why it's added here. - */ - disable "NullSafeMutableLiveData" } packagingOptions { From 693e6c21f307fd91efeba2a6f24b1a4220522986 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 12:43:23 +0300 Subject: [PATCH 08/40] Analysis: Resolve null safe mutable live data for base list use case The 'mutableSnackbarMessage' mutable live data value is set to null during 'onCleared()' and as such it needs to be declared as nullable. Then, using 'let' on the 'snackbarMessage' live data this can be guarded against so that to avoid a null pointer exception. --- .../android/ui/stats/refresh/lists/BaseListUseCase.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt index c2924b3557dc..54522e96bfdd 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt @@ -69,9 +69,9 @@ class BaseListUseCase( distinct = false ) - private val mutableSnackbarMessage = MutableLiveData() + private val mutableSnackbarMessage = MutableLiveData() val snackbarMessage: LiveData = mutableSnackbarMessage.map { - SnackbarMessageHolder(UiStringRes(it)) + it?.let { SnackbarMessageHolder(UiStringRes(it)) } } private val mutableListSelected = SingleLiveEvent() From 500e18b776b3200d3f106a6413332320f72c06b1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 12:58:31 +0300 Subject: [PATCH 09/40] Analysis: Resolve null safe mutable live data for show error message The 'showErrorMessage' mutable live data value is set to 'event.error.message' on multiple occasions. However, 'event.error' can be nullable and as such the 'event.error.message' itself. There is an 'if (event.isError) { ... }' statement above to guard from that ever happening, but the compiler is not smart enough to understand that. Maybe with 'Kotlin Contracts' this problem would have been avoided, but this feature is a separate discussion of its own. Thus, by guarding this with 'let' before setting this 'showErrorMessage' mutable live data is the best that can be done at this point of time. --- .../ui/domains/DomainRegistrationDetailsViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt index d2d7fe01f450..646ec745d513 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt @@ -188,7 +188,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( isStateProgressIndicatorVisible = false, isDomainRegistrationButtonEnabled = true ) - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } AppLog.e(T.DOMAIN_REGISTRATION, "An error occurred while fetching supported countries") } else { _uiState.value = uiState.value?.copy( @@ -255,7 +255,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( @Subscribe(threadMode = ThreadMode.MAIN) fun onPrimaryDomainDesignated(event: OnPrimaryDomainDesignated) { if (event.isError) { // in case of error we notify used and proceed to next step - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } AppLog.e( T.DOMAIN_REGISTRATION, "An error occurred while redeeming a shopping cart : " + event.error.type + @@ -273,7 +273,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( T.DOMAIN_REGISTRATION, "An error occurred while updating site details : " + event.error.message ) - _showErrorMessage.value = event.error.message + event.error?.message?.let { _showErrorMessage.value = it } finishRegistration() return } From bab68efcd9a5ebad1be416f5ecb1e1eaf5e29ec6 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 13:04:04 +0300 Subject: [PATCH 10/40] Analysis: Resolve null safe mutable live data for supported states The 'supportedStates' mutable live data value is set to null during 'onCountrySelected(...)' and can be also set to null via the 'OnDomainSupportedStatesFetched.supportedStates' from within the 'SiteStore' as it is actually defined as nullable. As such, the 'supportedStates' itself needs to be declared as nullable. --- .../android/ui/domains/DomainRegistrationDetailsViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt index 646ec745d513..94365fb41831 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsViewModel.kt @@ -58,7 +58,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor( private var siteCheckTries = 0 private var supportedCountries: List? = null - private val _supportedStates = MutableLiveData>() + private val _supportedStates = MutableLiveData?>() private val _uiState = MutableLiveData() val uiState: LiveData From 83898850d2d37f7a1fd74d6dd69b5b5e718e0d63 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 13:17:46 +0300 Subject: [PATCH 11/40] Refactor: Optimize import for feature announcement --- .../android/ui/whatsnew/FeatureAnnouncementViewModel.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt index d4bdd28028b4..b6addb693d2f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.wordpress.android.analytics.AnalyticsTracker.Stat import org.wordpress.android.modules.UI_THREAD import org.wordpress.android.ui.prefs.AppPrefsWrapper From f1b21dbbd33a0b79b598f095aae2e405767c81e0 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 13:31:14 +0300 Subject: [PATCH 12/40] Analysis: Resolve null safe mutable live data for feature announcement The 'currentFeatureAnnouncement' mutable live data can be set to null during 'loadFeatures()' and via 'FeatureAnnouncementProvider.getLatestFeatureAnnouncement(...)' which might produce a nullable 'FeatureAnnouncement'. As such, the 'currentFeatureAnnouncement' itself needs to be declared as nullable. The rest of the changes are propagated due to the above change and are mainly guarding the rest of the functionality that depends on that with 'let' and '?' scope functions. --- .../ui/whatsnew/FeatureAnnouncementViewModel.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt index b6addb693d2f..f7bee5c6c7d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementViewModel.kt @@ -22,7 +22,7 @@ class FeatureAnnouncementViewModel @Inject constructor( private val appPrefsWrapper: AppPrefsWrapper, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher ) : ScopedViewModel(mainDispatcher) { - private val _currentFeatureAnnouncement = MutableLiveData() + private val _currentFeatureAnnouncement = MutableLiveData() private val timeOnScreenParameter = "time_on_screen_sec" @@ -46,13 +46,14 @@ class FeatureAnnouncementViewModel @Inject constructor( init { _uiModel.addSource(_currentFeatureAnnouncement) { featureAnnouncement -> _uiModel.value = _uiModel.value?.copy( - appVersion = featureAnnouncement.appVersionName, isProgressVisible = false, - isFindOutMoreVisible = !TextUtils.isEmpty(featureAnnouncement.detailsUrl) + appVersion = featureAnnouncement?.appVersionName ?: "", + isProgressVisible = false, + isFindOutMoreVisible = !TextUtils.isEmpty(featureAnnouncement?.detailsUrl) ) } _featureItems.addSource(_currentFeatureAnnouncement) { featureAnnouncement -> - _featureItems.value = featureAnnouncement.features + featureAnnouncement?.features?.let { _featureItems.value = it } } } @@ -83,7 +84,7 @@ class FeatureAnnouncementViewModel @Inject constructor( fun onFindMoreButtonPressed() { analyticsTrackerWrapper.track(Stat.FEATURE_ANNOUNCEMENT_FIND_OUT_MORE_TAPPED) - _onAnnouncementDetailsRequested.value = _currentFeatureAnnouncement.value?.detailsUrl + _currentFeatureAnnouncement.value?.detailsUrl?.let { _onAnnouncementDetailsRequested.value = it } } data class FeatureAnnouncementUiModel( From e7f736d720d26ac8420517485794645adc24a1f9 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 13:51:54 +0300 Subject: [PATCH 13/40] Refactor: Remove unused live data extensions (from 2017) This 'LiveDataExtensions' is not used anywhere within the codebase and as such can be safely remove. If at any point in the future it will be needed again, engineers should either bring it back, with a more model version of it, or use another utility from the 'LiveData' library itself, which will serve the same purpose. This also solves two 'NullSafeMutableLiveData' lint errors related to this function. --- .../util/extensions/LiveDataExtensions.kt | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt diff --git a/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt b/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt deleted file mode 100644 index dee5e7305997..000000000000 --- a/WordPress/src/main/java/org/wordpress/android/util/extensions/LiveDataExtensions.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.wordpress.android.util.extensions - -/* - * Copyright (C) 2017 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. - */ - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MediatorLiveData -import androidx.lifecycle.Observer - -/** - * LiveData that propagates only distinct emissions. - */ -fun LiveData.getDistinct(): LiveData { - val distinctLiveData = MediatorLiveData() - distinctLiveData.addSource(this, object : Observer { - private var initialized = false - private var lastObj: T? = null - - override fun onChanged(obj: T?) { - if (!initialized) { - initialized = true - lastObj = obj - distinctLiveData.postValue(lastObj) - } else if ((obj == null && lastObj != null) || obj != lastObj) { - lastObj = obj - distinctLiveData.postValue(lastObj) - } - } - }) - - return distinctLiveData -} From 38ca284b222db3c0eacfca03a7659c3f3853b365 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 13:55:13 +0300 Subject: [PATCH 14/40] Refactor: Suppress null safe mutable live data for live data utils Suppress this 'NullSafeMutableLiveData' instead of changing this 'LiveData.mapAsync(...)' extension function and as such its signature seems to be the safest choice at the moment since this extension function is being utilized in extension places. --- .../src/main/java/org/wordpress/android/util/LiveDataUtils.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt index 3622ce5ffb85..2eb5cc4d663c 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt @@ -1,5 +1,6 @@ package org.wordpress.android.util +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.Observer @@ -313,6 +314,7 @@ fun LiveData.map(mapper: (T) -> U?): MediatorLiveData { * A wrapper of the map utility method that is null safe and runs the mapping on a background thread * @param scope defines the scope to run mapping in */ +@SuppressLint("NullSafeMutableLiveData") fun LiveData.mapAsync(scope: CoroutineScope, mapper: suspend (T) -> U?): MediatorLiveData { val result = MediatorLiveData() result.addSource(this) { x -> From e7e8d2581c168ed441d47581ced5da8ed38a1dbe Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:17:48 +0300 Subject: [PATCH 15/40] Analysis: Resolve null safe mutable live data for media picker The 'selectedIds' mutable live data can be set to null during the 'start(...)' and via its 'selectedIds' parameter which is nullable. As such, the 'selectedIds' itself needs to be declared as nullable. --- .../wordpress/android/ui/mediapicker/MediaPickerViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt index 9c8c9a9f2f92..8b69b5f34cce 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt @@ -101,7 +101,7 @@ class MediaPickerViewModel @Inject constructor( private val loadActions = Channel() private var searchJob: Job? = null private val _domainModel = MutableLiveData() - private val _selectedIds = MutableLiveData>() + private val _selectedIds = MutableLiveData?>() private val _onPermissionsRequested = MutableLiveData>() private val _softAskRequest = MutableLiveData() private val _searchExpanded = MutableLiveData() @@ -193,7 +193,7 @@ class MediaPickerViewModel @Inject constructor( } val fileExtension = it.mimeType?.let { mimeType -> - mediaUtilsWrapper.getExtensionForMimeType(mimeType).toUpperCase(localeManagerWrapper.getLocale()) + mediaUtilsWrapper.getExtensionForMimeType(mimeType).uppercase(localeManagerWrapper.getLocale()) } when (it.type) { IMAGE -> PhotoItem( From 94c5a3945fc9fe14068ee5e6d7899d38b9e8716f Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:24:03 +0300 Subject: [PATCH 16/40] Analysis: Resolve null safe mutable live data for photo picker The 'selectedIds' mutable live data can be set to null during the 'start(...)' and via its 'selectedIds' parameter which is nullable. As such, the 'selectedIds' itself needs to be declared as nullable. Although the initial logic was different and what I am describing above, and setting the 'selectedIds' was guarded with 'let' I chose to update this logic and align that with the 'MediaPickerViewModel' logic and the update I did there with my previous commit. Actually, this makes sense as this view model and its associated fragment is treating this 'selectedIds' live data value as nullable already and guarding against it accordingly. --- .../android/ui/photopicker/PhotoPickerViewModel.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt index 96b4c00880e5..7d22a120ce94 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt @@ -58,7 +58,6 @@ import org.wordpress.android.util.merge import org.wordpress.android.viewmodel.Event import org.wordpress.android.viewmodel.ResourceProvider import org.wordpress.android.viewmodel.ScopedViewModel -import java.util.HashMap import javax.inject.Inject import javax.inject.Named @@ -81,7 +80,7 @@ class PhotoPickerViewModel @Inject constructor( private val _onInsert = MutableLiveData>>() private val _showPopupMenu = MutableLiveData>() private val _photoPickerItems = MutableLiveData>() - private val _selectedIds = MutableLiveData>() + private val _selectedIds = MutableLiveData?>() private val _onIconClicked = MutableLiveData>() private val _onPermissionsRequested = MutableLiveData>() private val _softAskRequest = MutableLiveData() @@ -94,7 +93,7 @@ class PhotoPickerViewModel @Inject constructor( val onShowPopupMenu: LiveData> = _showPopupMenu val onPermissionsRequested: LiveData> = _onPermissionsRequested - val selectedIds: LiveData> = _selectedIds + val selectedIds: LiveData?> = _selectedIds val uiState: LiveData = merge( _photoPickerItems.distinct(), @@ -254,9 +253,7 @@ class PhotoPickerViewModel @Inject constructor( lastTappedIcon: PhotoPickerIcon?, site: SiteModel? ) { - selectedIds?.let { - _selectedIds.value = selectedIds - } + _selectedIds.value = selectedIds this.browserType = browserType this.lastTappedIcon = lastTappedIcon this.site = site From 164638fe990d12a902b604989b389cf0672438b8 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:26:56 +0300 Subject: [PATCH 17/40] Refactor: Optimize import for plans view model --- .../main/java/org/wordpress/android/ui/plans/PlansViewModel.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt index 7ac95e46a1e3..3da59ffea982 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt @@ -3,7 +3,6 @@ package org.wordpress.android.ui.plans import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.wordpress.android.analytics.AnalyticsTracker.Stat From c0d5ff04918d38a1c837e419337441e64ab74ec9 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:32:29 +0300 Subject: [PATCH 18/40] Refactor: Remove unused cached plans live data The live data 'cachedPlans' is only utilized from within the view model and as such can be replaced with the '_cachedPlans' mutable live data. This change will make 'cachedPlans' intention much more straightforward. --- .../java/org/wordpress/android/ui/plans/PlansViewModel.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt index 3da59ffea982..a3fe23e45881 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt @@ -41,13 +41,10 @@ class PlansViewModel @Inject constructor( get() = _listStatus private val _plans = MutableLiveData>() + private val _cachedPlans = MutableLiveData>() val plans: LiveData> get() = _plans - private val _cachedPlans = MutableLiveData>() - val cachedPlans: LiveData> - get() = _cachedPlans - private val _showDialog = SingleLiveEvent() val showDialog: LiveData get() = _showDialog @@ -89,7 +86,7 @@ class PlansViewModel @Inject constructor( fun onShowCachedPlansButtonClicked() { _listStatus.value = DONE - _plans.value = cachedPlans.value + _plans.value = _cachedPlans.value } @Subscribe(threadMode = ThreadMode.MAIN) From 18f4d59b9e3141cb2865ac6625008196ac9be442 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:42:22 +0300 Subject: [PATCH 19/40] Analysis: Resolve null safe mutable live data for plans The 'plans' and 'cachedPlans' mutable live data value can be set to null during 'onPlanOffersFetched(...)' because of the 'OnPlanOffersFetched.planOffers' from within the 'PlansOfferStore' as it is actually defined as nullable. As such, the 'plans' and 'cachedPlans' themselves need to be declared as nullable. --- .../java/org/wordpress/android/ui/plans/PlansViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt index a3fe23e45881..044110349b30 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt @@ -40,9 +40,9 @@ class PlansViewModel @Inject constructor( val listStatus: LiveData get() = _listStatus - private val _plans = MutableLiveData>() - private val _cachedPlans = MutableLiveData>() - val plans: LiveData> + private val _plans = MutableLiveData?>() + private val _cachedPlans = MutableLiveData?>() + val plans: LiveData?> get() = _plans private val _showDialog = SingleLiveEvent() From 4223d9b5dc3e14a9a6ef72caa00da67992ed330c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:48:34 +0300 Subject: [PATCH 20/40] Analysis: Resolve null safe mutable live data for plugin browser Defaulting to an empty title is enough for this use case. --- .../android/viewmodel/plugins/PluginBrowserViewModel.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt index d75f0a64a640..5ee34eb67943 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt @@ -34,7 +34,6 @@ import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginList import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.POPULAR import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.SEARCH import org.wordpress.android.viewmodel.plugins.PluginBrowserViewModel.PluginListType.SITE -import java.util.ArrayList import javax.inject.Inject import kotlin.properties.Delegates @@ -397,7 +396,7 @@ class PluginBrowserViewModel @Inject constructor( } fun setTitle(title: String?) { - _title.postValue(title) + _title.postValue(title ?: "") } // ListState Helpers From 69a34dfca5608f7f16d0471f5738f9bbc1a74619 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 14:55:53 +0300 Subject: [PATCH 21/40] Analysis: Resolve null safe mutable live data for post list The 'searchQuery' mutable live data is set to null during 'clearSearch()'. As such, the 'searchQuery' itself needs to be declared as nullable. Also, this view model's associated fragment and activity screens are treating this 'searchQuery' live data value as nullable already and use it as such accordingly. --- .../org/wordpress/android/ui/posts/PostListMainViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt index d268073290fd..4d8673a419b0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt @@ -144,8 +144,8 @@ class PostListMainViewModel @Inject constructor( private val _isSearchExpanded = MutableLiveData() val isSearchExpanded: LiveData = _isSearchExpanded - private val _searchQuery = MutableLiveData() - val searchQuery: LiveData = _searchQuery + private val _searchQuery = MutableLiveData() + val searchQuery: LiveData = _searchQuery private val _onFabClicked = MutableLiveData>() val onFabClicked: LiveData> = _onFabClicked From e1decef56ef3720b4eccfa04be8ba115777e3844 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:12:24 +0300 Subject: [PATCH 22/40] Analysis: Resolve null safe mutable live data for add category The 'navigateBack' mutable live data can be set to null during 'cleanupAndFinish()'. As such, the 'navigateBack' itself needs to be declared as nullable. Also, this view model's associated fragment is treating this 'navigateBack' live data value as nullable already and guards against it accordingly. --- .../android/ui/posts/PrepublishingAddCategoryViewModel.kt | 4 ++-- .../prepublishing/PrepublishingAddCategoryViewModelTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt index af488f9d5ad7..4f6d9d5ac891 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryViewModel.kt @@ -32,8 +32,8 @@ class PrepublishingAddCategoryViewModel @Inject constructor( private var closeKeyboard = true private lateinit var siteModel: SiteModel - private val _navigateBack = MutableLiveData() - val navigateBack: LiveData = _navigateBack + private val _navigateBack = MutableLiveData() + val navigateBack: LiveData = _navigateBack private val _dismissKeyboard = MutableLiveData>() val dismissKeyboard: LiveData> = _dismissKeyboard diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt index a1ed24c4e11c..948c840919fc 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingAddCategoryViewModelTest.kt @@ -159,7 +159,7 @@ class PrepublishingAddCategoryViewModelTest : BaseUnitTest() { val uiStates = mutableListOf() viewModel.uiState.observeForever { uiStates.add(it) } - val navigateBack = mutableListOf() + val navigateBack = mutableListOf() viewModel.navigateBack.observeForever { navigateBack.add(it) } val dismissKeyboard = mutableListOf>() @@ -183,7 +183,7 @@ class PrepublishingAddCategoryViewModelTest : BaseUnitTest() { // set up observers private data class Observers( val uiStates: List, - val navigateBack: List, + val navigateBack: List, val dismissKeyboard: List>, val toolbarTitleUiState: List, val snackbarMsgs: List> From dab2bc168b1d7b12dccd859aaf45396e8f9b3c3e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:22:57 +0300 Subject: [PATCH 23/40] Analysis: Resolve null safe mutable live data for publish settings The 'onNotificationTime' mutable live data can be set to null during 'onNotificationCreated()'. As such, the 'onNotificationTime' itself needs to be declared as nullable. Also, this view model's associated fragment is treating this 'onNotificationTime' live data value as nullable already and guards against it accordingly. --- .../wordpress/android/ui/posts/PublishSettingsViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt index 4b88df5c8638..5121ef46da14 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt @@ -57,8 +57,8 @@ constructor( val onToast: LiveData> = _onToast private val _onShowNotificationDialog = MutableLiveData>() val onShowNotificationDialog: LiveData> = _onShowNotificationDialog - private val _onNotificationTime = MutableLiveData() - val onNotificationTime: LiveData = _onNotificationTime + private val _onNotificationTime = MutableLiveData() + val onNotificationTime: LiveData = _onNotificationTime private val _onNotificationAdded = MutableLiveData>() val onNotificationAdded: LiveData> = _onNotificationAdded private val _onAddToCalendar = MutableLiveData>() From 5b053fb54809c68d7e326185612116876c7600be Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:31:50 +0300 Subject: [PATCH 24/40] Analysis: Resolve null safe mutable live data for selected date provider The 'selectedDateChanged' mutable live data is set to null during the 'clear(...)' functions. As such, the 'selectedDateChanged' itself needs to be declared as nullable. Also, this view model's associated fragments are treating this 'selectedDateChanged' live data value as nullable already and guard against it accordingly. --- .../refresh/lists/sections/granular/SelectedDateProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt index 49fad9c8bd61..102d4d65fcda 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt @@ -40,10 +40,10 @@ class SelectedDateProvider YEARS to SelectedDate(loading = true) ) - private val selectedDateChanged = MutableLiveData() + private val selectedDateChanged = MutableLiveData() - fun granularSelectedDateChanged(statsSection: StatsSection): LiveData { - return selectedDateChanged.filter { it.selectedSection == statsSection } + fun granularSelectedDateChanged(statsSection: StatsSection): LiveData { + return selectedDateChanged.filter { it?.selectedSection == statsSection } } fun selectDate(date: Date, statsSection: StatsSection) { From b937b2eff69b906e995ecc7cadbfc865efc972b6 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:38:22 +0300 Subject: [PATCH 25/40] Refactor: Optimize import for site creation intents view model --- .../ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt index 120cb36ea161..5f622488fae8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt @@ -9,8 +9,8 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import org.wordpress.android.R import org.wordpress.android.modules.BG_THREAD -import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.DefaultItems import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker +import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.DefaultItems import org.wordpress.android.ui.sitecreation.verticals.SiteCreationIntentsViewModel.IntentsUiState.Content.FullItemsList import org.wordpress.android.viewmodel.SingleLiveEvent import javax.inject.Inject From 4b1845f23d55f6ab3e3f44ad3dcf852cba5ece53 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:44:02 +0300 Subject: [PATCH 26/40] Analysis: Resolve null safe mutable live data for site creation The 'onIntentSelected' mutable live data can be set to null during 'onCustomVerticalSelected()' because of the 'IntentsUiState.searchQuery' as it is actually defined as nullable. As such, the 'onIntentSelected' itself needs to be declared as nullable. However, this view model's associated activity, main view model and interface were expecting a non-nullable intent. But, this can actually change easily and the interface intent can be defined and used as nullable as well. It ends us anyway being using within the 'SiteCreationMainVM.onSiteIntentSelected(...)', which can accept a nullable intent without any problems. --- .../wordpress/android/ui/sitecreation/SiteCreationActivity.kt | 2 +- .../wordpress/android/ui/sitecreation/SiteCreationMainVM.kt | 2 +- .../ui/sitecreation/verticals/IntentsScreenListener.kt | 2 +- .../ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt index fd95bbc0d263..ad532624cebe 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt @@ -148,7 +148,7 @@ class SiteCreationActivity : LocaleAwareActivity(), }) } - override fun onIntentSelected(intent: String) { + override fun onIntentSelected(intent: String?) { mainViewModel.onSiteIntentSelected(intent) if (!siteNameFeatureConfig.isEnabled()) { ActivityUtils.hideKeyboard(this) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt index bf63ac0077cb..a3e7269cb170 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt @@ -101,7 +101,7 @@ class SiteCreationMainVM @Inject constructor( outState.putParcelable(KEY_SITE_CREATION_STATE, siteCreationState) } - fun onSiteIntentSelected(intent: String) { + fun onSiteIntentSelected(intent: String?) { siteCreationState = siteCreationState.copy(siteIntent = intent) wizardManager.showNextStep() } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt index 8939024395d7..aec03b61239e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/IntentsScreenListener.kt @@ -1,5 +1,5 @@ package org.wordpress.android.ui.sitecreation.verticals interface IntentsScreenListener { - fun onIntentSelected(intent: String) + fun onIntentSelected(intent: String?) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt index 5f622488fae8..712d496552a1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/SiteCreationIntentsViewModel.kt @@ -40,8 +40,8 @@ class SiteCreationIntentsViewModel @Inject constructor( private val _onBackButtonPressed = SingleLiveEvent() val onBackButtonPressed: LiveData = _onBackButtonPressed - private val _onIntentSelected = SingleLiveEvent() - val onIntentSelected: LiveData = _onIntentSelected + private val _onIntentSelected = SingleLiveEvent() + val onIntentSelected: LiveData = _onIntentSelected fun start() { if (isInitialized) return From 26111efac6f893c00c80a390734d10de0f8e9260 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:51:27 +0300 Subject: [PATCH 27/40] Refactor: Rename mutable site changed to expected backing field syntax --- .../ui/stats/refresh/utils/StatsSiteProvider.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt index 7ec09b26ac7c..5f89313b3a84 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt @@ -26,8 +26,8 @@ class StatsSiteProvider var siteModel = SiteModel() private set - private val mutableSiteChanged = MutableLiveData>() - val siteChanged: LiveData> = mutableSiteChanged + private val _siteChanged = MutableLiveData>() + val siteChanged: LiveData> = _siteChanged private val maxAttempts = 3 private var counter = 0 @@ -52,8 +52,8 @@ class StatsSiteProvider } fun clear() { - if (mutableSiteChanged.value != null) { - mutableSiteChanged.value = null + if (_siteChanged.value != null) { + _siteChanged.value = null } } @@ -68,14 +68,14 @@ class StatsSiteProvider if (site.siteId != 0L) { counter = 0 siteModel = site - mutableSiteChanged.value = Event(SiteConnected(site.siteId)) + _siteChanged.value = Event(SiteConnected(site.siteId)) } else { if (counter < maxAttempts) { counter++ dispatcher.dispatch(SiteActionBuilder.newFetchSiteAction(site)) } else { counter = 0 - mutableSiteChanged.value = Event(NotConnectedJetpackSite) + _siteChanged.value = Event(NotConnectedJetpackSite) } } } From 990cb3579516f07151dd3348805217dcfa352f2c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:55:19 +0300 Subject: [PATCH 28/40] Analysis: Suppress null safe mutable live data for stats site provider Suppress this 'NullSafeMutableLiveData' instead of changing this 'LiveData.observeEvent(...)' extension function and as such its signature seems to be the safest choice at the moment since this extension function is being utilized in extension places. For more info see 'StatsFragment' and the usage of 'viewModel.siteChanged.observeEvent(...)' which prevents us from changing this easily. --- .../android/ui/stats/refresh/utils/StatsSiteProvider.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt index 5f89313b3a84..d0aa1b32f003 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsSiteProvider.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.utils +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.greenrobot.eventbus.Subscribe @@ -51,6 +52,7 @@ class StatsSiteProvider start(selectedSiteRepository.getSelectedSiteLocalId()) } + @SuppressLint("NullSafeMutableLiveData") fun clear() { if (_siteChanged.value != null) { _siteChanged.value = null From e0dda4b98a9545177344d926d45554c655ae1a04 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 15:56:43 +0300 Subject: [PATCH 29/40] Refactor: Rename mutable snackbar message to a backing field syntax Also, this change moves this 'showSnackbarMessage' backing field closer to it equivalent and associated public live data field. --- .../android/ui/stats/refresh/StatsViewAllViewModel.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt index fbbae1bfd576..b7da663e65af 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt @@ -33,8 +33,6 @@ class StatsViewAllViewModel( private val dateSelector: StatsDateSelector, @StringRes val title: Int ) : ScopedViewModel(mainDispatcher) { - private val mutableSnackbarMessage = MutableLiveData>() - val selectedDate = dateSelector.selectedDate val dateSelectorData: LiveData = dateSelector.dateSelectorData.mapNullable { @@ -55,7 +53,8 @@ class StatsViewAllViewModel( private val _isRefreshing = MutableLiveData() val isRefreshing: LiveData = _isRefreshing - val showSnackbarMessage: LiveData> = mutableSnackbarMessage + private val _showSnackbarMessage = MutableLiveData>() + val showSnackbarMessage: LiveData> = _showSnackbarMessage val toolbarHasShadow = dateSelectorData.map { !it.isVisible } @@ -71,7 +70,7 @@ class StatsViewAllViewModel( } fun onPullToRefresh() { - mutableSnackbarMessage.value = null + _showSnackbarMessage.value = null refreshData() } @@ -88,7 +87,7 @@ class StatsViewAllViewModel( if (statsSiteProvider.hasLoadedSite()) { useCase.fetch(refresh, forced) } else { - mutableSnackbarMessage.postValue( + _showSnackbarMessage.postValue( Event(SnackbarMessageHolder(UiStringRes(R.string.stats_site_not_loaded_yet))) ) } @@ -96,7 +95,7 @@ class StatsViewAllViewModel( } override fun onCleared() { - mutableSnackbarMessage.value = null + _showSnackbarMessage.value = null useCase.clear() statsSiteProvider.reset() } From 02f29f2d8cc19b3a7e05b92f1c06568b180a2f2c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 16:01:31 +0300 Subject: [PATCH 30/40] Analysis: Suppress null safe mutable live data for stats view all Suppress this 'NullSafeMutableLiveData' instead of changing this 'LiveData.observeEvent(...)' extension function and as such its signature seems to be the safest choice at the moment since this extension function is being utilized in extension places. For more info see 'StatsViewAllFragment' and the usage of 'viewModel.showSnackbarMessage.observeEvent(...)' which prevents us from changing this easily. --- .../android/ui/stats/refresh/StatsViewAllViewModel.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt index b7da663e65af..0168b4596b31 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -69,6 +70,7 @@ class StatsViewAllViewModel( dateSelector.updateDateSelector() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null refreshData() @@ -94,6 +96,7 @@ class StatsViewAllViewModel( } } + @SuppressLint("NullSafeMutableLiveData") override fun onCleared() { _showSnackbarMessage.value = null useCase.clear() From 6b3469442a3d50e2a218b6cb7ad8c373f5d6695e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 16:04:00 +0300 Subject: [PATCH 31/40] Refactor: Remove redundant let call from on subfilter page updated --- .../android/ui/reader/subfilter/SubFilterViewModel.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt index 5aebfa050703..47af8a4c2479 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt @@ -290,11 +290,7 @@ class SubFilterViewModel @Inject constructor( fun onSubfilterPageUpdated(category: SubfilterCategory, count: Int) { val currentValue = _filtersMatchCount.value - - currentValue?.let { - it.put(category, count) - } - + currentValue?.put(category, count) _filtersMatchCount.postValue(currentValue) } From b298cdbca06de24997f1ebacebf3cffd17fa1b12 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 16:46:30 +0300 Subject: [PATCH 32/40] Analysis: Suppress false positive null safe mutable live data errors For these classes in this commit the 'NullSafeMutableLiveData' Lint error is suppressed are false positive. It is false positive because the nullability of the variable is already checked before it is assigned to the mutable live data field, but it is anyway ignored as being potentially null and thus reported. --- .../src/main/java/org/wordpress/android/ui/main/MeViewModel.kt | 2 ++ .../org/wordpress/android/ui/posts/PostListMainViewModel.kt | 2 ++ .../android/ui/reader/subfilter/SubFilterViewModel.kt | 2 ++ .../lists/widget/configuration/StatsColorSelectionViewModel.kt | 2 ++ .../widget/configuration/StatsDataTypeSelectionViewModel.kt | 2 ++ .../org/wordpress/android/viewmodel/pages/PagesViewModel.kt | 3 +++ 6 files changed, 13 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt index e2100b6ba643..9309fbc98a88 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.main +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map @@ -89,6 +90,7 @@ class MeViewModel _showScanLoginCode.value = Event(true) } + @SuppressLint("NullSafeMutableLiveData") fun onRecommendTheApp() { when (val state = _recommendUiState.value) { is ApiFetchedResult -> { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt index 4d8673a419b0..db5043af6a37 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.posts +import android.annotation.SuppressLint import android.content.Context import android.content.Intent import androidx.lifecycle.Lifecycle @@ -507,6 +508,7 @@ class PostListMainViewModel @Inject constructor( /** * Only the non-null variables will be changed in the current state */ + @SuppressLint("NullSafeMutableLiveData") private fun updateViewStateTriggerPagerChange( isFabVisible: Boolean? = null, isAuthorFilterVisible: Boolean? = null, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt index 47af8a4c2479..95624cd0550a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.reader.subfilter +import android.annotation.SuppressLint import android.os.Bundle import androidx.annotation.VisibleForTesting import androidx.lifecycle.LiveData @@ -288,6 +289,7 @@ class SubFilterViewModel @Inject constructor( changeSubfilter(getCurrentSubfilterValue(), false, mTagFragmentStartedWith) } + @SuppressLint("NullSafeMutableLiveData") fun onSubfilterPageUpdated(category: SubfilterCategory, count: Int) { val currentValue = _filtersMatchCount.value currentValue?.put(category, count) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt index 265e881415fb..d23614140e5b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsColorSelectionViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.configuration +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -30,6 +31,7 @@ class StatsColorSelectionViewModel private var appWidgetId: Int = -1 + @SuppressLint("NullSafeMutableLiveData") fun start( appWidgetId: Int ) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt index fb95ffdf4cf5..cde780aba3ee 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsDataTypeSelectionViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.configuration +import android.annotation.SuppressLint import androidx.annotation.StringRes import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -31,6 +32,7 @@ class StatsDataTypeSelectionViewModel private var appWidgetId: Int = -1 + @SuppressLint("NullSafeMutableLiveData") fun start( appWidgetId: Int ) { diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt index 929c970444b4..fbd0a62a422f 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.viewmodel.pages +import android.annotation.SuppressLint import android.content.ClipData import android.content.Context import android.content.Intent @@ -361,6 +362,7 @@ class PagesViewModel } } + @SuppressLint("NullSafeMutableLiveData") fun onSpecificPageRequested(remotePageId: Long) { if (isInitialized) { val page = pageMap[remotePageId] @@ -934,6 +936,7 @@ class PagesViewModel site.isWPCom && site.hasCapabilityEditOthersPages } + @SuppressLint("NullSafeMutableLiveData") private fun updateViewStateTriggerPagerChange( isAuthorFilterVisible: Boolean? = null, authorFilterSelection: AuthorFilterSelection? = null, From 7ee2401bc0a4f6197e314ee153d8ec62e31ab42e Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 26 May 2022 17:38:39 +0300 Subject: [PATCH 33/40] Build: Update lifecycle to 2.4.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ebcb64a30c62..d02d90a68d0f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ ext { androidxCoreVersion = '1.3.2' androidxArchCoreVersion = '2.0.0' fragmentVersion = '1.2.4' - lifecycleVersion = '2.2.0' + lifecycleVersion = '2.4.1' constraintLayoutVersion = '1.1.3' materialVersion = '1.2.1' preferenceVersion = '1.1.0' From 5626d1cf5a02c9ac4cc607e2b67bea008035677d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 10:29:43 +0300 Subject: [PATCH 34/40] Build: Remove duplicate lifecycle declaration and update to 2.4.1 As part of this update the below occurred: - The 'lifecycle-extensions' artifact and APIs got removed as it has been deprecated since '2.2.0' and it is no longer updated. The recommendation nowadays is to instead add dependencies for the specific lifecycle artifacts needed. - Update 'ViewModelProvider.Factory.create(...)' signature to a non-null 'ViewModel' generic as it is now defined as such by the Java factory interface. The above were the only breaking change. Apart from that everything else seems to be compiling and working as expected (did a quick smoke test). However, this update added 10 new 'NullSafeMutableLiveData' lint errors that will be fixed in subsequent commits. --- WordPress/build.gradle | 1 - .../android/ui/stats/refresh/StatsViewAllViewModelFactory.kt | 2 +- .../org/wordpress/android/ui/mysite/MySiteViewModelTest.kt | 2 +- build.gradle | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 44693f124b7d..9292e68d87f4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -334,7 +334,6 @@ dependencies { implementation "androidx.core:core:$androidxCoreVersion" implementation "androidx.core:core-ktx:$androidxCoreVersion" - implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion" implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation "androidx.fragment:fragment:$fragmentVersion" diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt index f34f5b0d128c..1440a8b1e041 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt @@ -69,7 +69,7 @@ class StatsViewAllViewModelFactory( private val dateSelector: StatsDateSelector, @StringRes private val titleResource: Int ) : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(StatsViewAllViewModel::class.java)) { @Suppress("UNCHECKED_CAST") return StatsViewAllViewModel( diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt index 8e00bf8db99a..b5d2b69b93bd 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt @@ -2857,7 +2857,7 @@ class MySiteViewModelTest : BaseUnitTest() { val viewModelStore = ViewModelStore() val viewModelProvider = ViewModelProvider(viewModelStore, object : ViewModelProvider.Factory { @Suppress("UNCHECKED_CAST") - override fun create(modelClass: Class): T = this@invokeOnCleared as T + override fun create(modelClass: Class): T = this@invokeOnCleared as T }) viewModelProvider.get(this@invokeOnCleared::class.java) viewModelStore.clear() diff --git a/build.gradle b/build.gradle index d02d90a68d0f..5e89cdbb4f8c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,13 +18,12 @@ ext { androidxCoreVersion = '1.3.2' androidxArchCoreVersion = '2.0.0' fragmentVersion = '1.2.4' - lifecycleVersion = '2.4.1' constraintLayoutVersion = '1.1.3' materialVersion = '1.2.1' preferenceVersion = '1.1.0' swipeToRefresh = '1.1.0' uCropVersion = '2.2.4' - lifecycleVersion = '2.2.0' + lifecycleVersion = '2.4.1' tracksVersion = '2.2.0' roomVersion = '2.3.0' From 7f8a613145cff21988fa5b1c4c663d2a068cf8b5 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 14:56:25 +0300 Subject: [PATCH 35/40] Analysis: Resolve null safe mutable live data for base list use case The 'data' mediator live data is set to null during the 'onCleared()'. As such, the 'data' itself needs to be declared as nullable. This use case's associated view model is updated accordingly. Also, this view model's associated fragment is treating this 'uiModel' live data value as nullable already. --- .../wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt | 2 +- .../android/ui/stats/refresh/lists/StatsListViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt index 54522e96bfdd..73bf0b230b37 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/BaseListUseCase.kt @@ -48,7 +48,7 @@ class BaseListUseCase( useCases.associateBy { it.type }.mapValues { entry -> entry.value.liveData } ) private val statsTypes = MutableLiveData>() - val data: MediatorLiveData = mergeAsyncNotNull(this, statsTypes, blockListData) { types, map -> + val data: MediatorLiveData = mergeAsyncNotNull(this, statsTypes, blockListData) { types, map -> val result = types.mapNotNull { if (map.containsKey(it)) { map[it] diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt index 4cd403560a21..25c59888d5a9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt @@ -83,7 +83,7 @@ abstract class StatsListViewModel( val listSelected = statsUseCase.listSelected - val uiModel: LiveData by lazy { + val uiModel: LiveData by lazy { statsUseCase.data.throttle(viewModelScope, distinct = true) } From a80fff2703e9ff7fc370b83970bac0076c071a10 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 15:19:47 +0300 Subject: [PATCH 36/40] Refactor: Optimize import for page parent and search view model --- .../android/viewmodel/pages/PageParentSearchViewModel.kt | 1 - .../org/wordpress/android/viewmodel/pages/PageParentViewModel.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt index 45a41d595a5a..8dee758c9016 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.launch import org.wordpress.android.R import org.wordpress.android.modules.UI_THREAD import org.wordpress.android.ui.pages.PageItem diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt index e3e82b498377..935c1e7d2e4b 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.isActive -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.wordpress.android.R import org.wordpress.android.R.string From f3c580ce6e20baca831a5e7fc902d079fa17c47b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 15:28:38 +0300 Subject: [PATCH 37/40] Analysis: Resolve null safe mutable live data for page parent search The 'searchPages' mutable live data is set to null during 'clearSearch()'. As such, the 'searchPages' itself needs to be declared as nullable. Also, this view model's associated search view model is treating this 'searchPages' live data value as nullable already and guarding against it accordingly. --- .../android/viewmodel/pages/PageParentSearchViewModel.kt | 2 +- .../wordpress/android/viewmodel/pages/PageParentViewModel.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt index 8dee758c9016..fc68326edf4e 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt @@ -37,7 +37,7 @@ class PageParentSearchViewModel pageParentViewModel.searchPages.removeObserver(searchObserver) } - private val searchObserver = Observer> { pageItems -> + private val searchObserver = Observer?> { pageItems -> if (pageItems != null) { loadFoundPages(pageItems) } else { diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt index 935c1e7d2e4b..7f1a36361d78 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentViewModel.kt @@ -56,8 +56,8 @@ class PageParentViewModel private val _saveParent = SingleLiveEvent() val saveParent: LiveData = _saveParent - private val _searchPages: MutableLiveData> = MutableLiveData() - val searchPages: LiveData> = _searchPages + private val _searchPages: MutableLiveData?> = MutableLiveData() + val searchPages: LiveData?> = _searchPages private var _lastSearchQuery = "" val lastSearchQuery: String From 46eeeea2f76122a037d03c481d315cd6ce67436d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 15:53:46 +0300 Subject: [PATCH 38/40] Analysis: Resolve null safe mutable live data for pages The 'searchPages' mutable live data is set to null during 'clearSearch()'. As such, the 'searchPages' itself needs to be declared as nullable. Also, this view model's associated search view model is treating this 'searchPages' live data value as nullable already and guarding against it accordingly. --- .../org/wordpress/android/viewmodel/pages/PagesViewModel.kt | 4 ++-- .../wordpress/android/viewmodel/pages/SearchListViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt index fbd0a62a422f..aefc07c35b24 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt @@ -134,8 +134,8 @@ class PagesViewModel private val _pages = MutableLiveData>() val pages: LiveData> = _pages - private val _searchPages: MutableLiveData>> = MutableLiveData() - val searchPages: LiveData>> = _searchPages + private val _searchPages: MutableLiveData>?> = MutableLiveData() + val searchPages: LiveData>?> = _searchPages private val _createNewPage = SingleLiveEvent() val createNewPage: LiveData = _createNewPage diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt index 1ce54d6afa75..130d05e06176 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt @@ -58,7 +58,7 @@ class SearchListViewModel pagesViewModel.searchPages.removeObserver(searchObserver) } - private val searchObserver = Observer>> { pages -> + private val searchObserver = Observer>?> { pages -> if (pages != null) { loadFoundPages(pages) From 54770fba7a97fe431dd0a2bdbdf577fe38a5d3d3 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 15:55:11 +0300 Subject: [PATCH 39/40] Analysis: Suppress null safe mutable live data for stats screens Suppress all 'NullSafeMutableLiveData' instead of changing this 'mergeNotNull(...)' implementation and as such 'showSnackbarMessage' field's signature. This seems to be the safest choice for now. --- .../org/wordpress/android/ui/stats/refresh/StatsViewModel.kt | 3 +++ .../ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt | 2 ++ .../ui/stats/refresh/lists/detail/StatsDetailViewModel.kt | 2 ++ .../stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt | 2 ++ .../refresh/lists/detail/TotalFollowersDetailViewModel.kt | 2 ++ .../ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt | 2 ++ 6 files changed, 13 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt index a5512a8ac68a..a7ce0c4f2269 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh +import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle import androidx.lifecycle.LiveData @@ -197,6 +198,7 @@ class StatsViewModel _isRefreshing.value = false } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() @@ -245,6 +247,7 @@ class StatsViewModel } } + @SuppressLint("NullSafeMutableLiveData") override fun onCleared() { super.onCleared() _showSnackbarMessage.value = null diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt index e17d77774a0d..55690392e850 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/InsightsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class InsightsDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt index 781140346985..82cddfae4ba1 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineDispatcher @@ -57,6 +58,7 @@ class StatsDetailViewModel statsPostProvider.clear() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt index 936e1945a793..f73ce4a26856 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalCommentsDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -50,6 +51,7 @@ class TotalCommentsDetailViewModel @Inject constructor( detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt index 2604c4512909..f0e2eee2d54b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalFollowersDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class TotalFollowersDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt index 1215ab6b727c..8fd1d4b91d7d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/TotalLikesDetailViewModel.kt @@ -1,5 +1,6 @@ package org.wordpress.android.ui.stats.refresh.lists.detail +import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -51,6 +52,7 @@ class TotalLikesDetailViewModel detailUseCase.onCleared() } + @SuppressLint("NullSafeMutableLiveData") fun onPullToRefresh() { _showSnackbarMessage.value = null statsSiteProvider.clear() From 22ac5b3cad4c378a43bd666efe8948bf9dc8d405 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 May 2022 16:33:24 +0300 Subject: [PATCH 40/40] Analysis: Suppress null safe mutable live data for pages Suppress this 'NullSafeMutableLiveData' instead of changing this 'MutableLiveData.postOnUi(...)' extension function and as such its signature seems to be the safest choice at the moment since this extension function is being utilized in extension places. --- .../java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt index aefc07c35b24..7fa265bd0ac9 100644 --- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt @@ -1036,6 +1036,7 @@ class PagesViewModel setValue(value) } + @SuppressLint("NullSafeMutableLiveData") private fun MutableLiveData.postOnUi(value: T) { val liveData = this launch {