Merge branch 'trunk' into issue/menus-beta-pill

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/inappupdate/InAppUpdateManagerImpl.kt

@@ -1,6 +1,7 @@
 package org.wordpress.android.inappupdate
 
 import android.annotation.SuppressLint
+import androidx.core.content.edit
 import android.app.Activity
 import android.content.Context
 import android.util.Log
@@ -190,19 +191,17 @@ class InAppUpdateManagerImpl(
 
     private fun saveLastUpdateRequestInfo(appUpdateInfo: AppUpdateInfo) {
         val sharedPref = applicationContext.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
-        sharedPref.edit().apply {
+        sharedPref.edit {
             putInt(KEY_LAST_APP_UPDATE_CHECK_VERSION, getAvailableUpdateAppVersion(appUpdateInfo))
             putLong(KEY_LAST_APP_UPDATE_CHECK_TIME, currentTimeProvider.invoke())
-            apply()
         }
     }
 
     private fun resetLastUpdateRequestInfo() {
         val sharedPref = applicationContext.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
-        sharedPref.edit().apply {
+        sharedPref.edit {
             putInt(KEY_LAST_APP_UPDATE_CHECK_VERSION, -1)
             putLong(KEY_LAST_APP_UPDATE_CHECK_TIME, -1L)
-            apply()
         }
     }
 

WordPress/src/main/java/org/wordpress/android/localcontentmigration/LocalMigrationResult.kt

@@ -57,7 +57,8 @@ fun <T : LocalContentEntityData, E : LocalMigrationError> LocalMigrationResult<T
  */
 inline fun <T : Any?, U : LocalContentEntityData, E : LocalMigrationError> Iterable<T>.foldAllToSingleResult(
     transform: (T) -> LocalMigrationResult<U, E>,
-) = fold(EmptyResult) { current: LocalMigrationResult<LocalContentEntityData, LocalMigrationError>, item ->
+): LocalMigrationResult<LocalContentEntityData, LocalMigrationError> =
+    fold(EmptyResult) { current: LocalMigrationResult<LocalContentEntityData, LocalMigrationError>, item ->
     when (val result = transform(item)) {
         is Failure -> return result
         else -> current

WordPress/src/main/java/org/wordpress/android/networking/restapi/WpComApiClientProvider.kt

@@ -22,7 +22,7 @@ class WpComApiClientProvider @Inject constructor() {
 
         return WpComApiClient(
             requestExecutor = WpRequestExecutor(httpClient = WpHttpClient.CustomOkHttpClient(okHttpClient)),
-            authProvider = WpAuthenticationProvider.staticWithAuth(WpAuthentication.Bearer(token = accessToken!!)
+            authProvider = WpAuthenticationProvider.staticWithAuth(WpAuthentication.Bearer(token = accessToken)
             )
         )
     }

WordPress/src/main/java/org/wordpress/android/support/he/ui/HESupportViewModel.kt

@@ -1,5 +1,6 @@
 package org.wordpress.android.support.he.ui
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.net.Uri
 import androidx.lifecycle.viewModelScope
@@ -316,6 +317,7 @@ class HESupportViewModel @Inject constructor(
         )
     }
 
+    @SuppressLint("Recycle") // False positive: descriptor is closed via .use {}
     @Suppress("TooGenericExceptionCaught")
     private suspend fun getFileSize(uri: Uri): Long? = withContext(ioDispatcher) {
         try {

WordPress/src/main/java/org/wordpress/android/support/he/util/TempAttachmentsUtil.kt

@@ -119,7 +119,7 @@ class TempAttachmentsUtil @Inject constructor(
                 AppLog.d(AppLog.T.SUPPORT, "Download response code: $responseCode")
 
                 if (response.isSuccessful) {
-                    response.body?.byteStream()?.use { input ->
+                    response.body.byteStream().use { input ->
                         tempFile.outputStream().use { output ->
                             input.copyTo(output)
                         }

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazecampaigns/campaignlisting/CampaignListingUIModelMapper.kt

@@ -17,7 +17,7 @@ class CampaignListingUIModelMapper @Inject constructor(
 
     private fun mapToCampaignModel(campaignModel:BlazeCampaignModel): CampaignModel {
         return CampaignModel(
-            id = campaignModel.campaignId.toString(),
+            id = campaignModel.campaignId,
             title = UiString.UiStringText(campaignModel.title),
             status = CampaignStatus.fromString(campaignModel.uiStatus),
             featureImageUrl = campaignModel.imageUrl,

WordPress/src/main/java/org/wordpress/android/ui/debug/DebugSettingsViewModel.kt

@@ -140,7 +140,7 @@ class DebugSettingsViewModel
         return RemoteFieldConfigDefaults.remoteFieldConfigDefaults.mapNotNull { remoteField ->
             val remoteConfig = remoteConfigFields.find { remoteField.key == it.key }
             remoteConfig?.let {
-                Field(remoteField.key, remoteConfig.value.toString(), remoteConfig.source.toString())
+                Field(remoteField.key, remoteConfig.value, remoteConfig.source.toString())
             }
         }.sortedBy { it.remoteFieldKey }
     }

WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalBrandingUtil.kt

@@ -119,22 +119,18 @@ class JetpackFeatureRemovalBrandingUtil @Inject constructor(
 
     private fun getQuantityUiString(interval: Pluralisable): UiStringPluralRes {
         return when (interval) {
-            is Weeks -> (interval as? Weeks)?.run {
-                UiStringPluralRes(
-                    zeroRes = otherRes,
-                    oneRes = oneRes,
-                    otherRes = otherRes,
-                    count = number.toInt(),
-                )
-            } ?: error("Pluralisable interval should be of type Weeks")
-            is Days -> (interval as? Days)?.run {
-                UiStringPluralRes(
-                    zeroRes = otherRes,
-                    oneRes = oneRes,
-                    otherRes = otherRes,
-                    count = number.toInt(),
-                )
-            } ?: error("Pluralisable interval should be of type Days")
+            is Weeks -> UiStringPluralRes(
+                zeroRes = interval.otherRes,
+                oneRes = interval.oneRes,
+                otherRes = interval.otherRes,
+                count = interval.number.toInt(),
+            )
+            is Days -> UiStringPluralRes(
+                zeroRes = interval.otherRes,
+                oneRes = interval.oneRes,
+                otherRes = interval.otherRes,
+                count = interval.number.toInt(),
+            )
         }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/media/VideoLoader.kt

@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.media
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
@@ -61,6 +62,7 @@ class VideoLoader
         }
     }
 
+    @SuppressLint("Recycle") // False positive: cursor is closed via .use {}
     private fun getSizeFromContentUri(contentUri: Uri) =
         appContext.contentResolver.query(contentUri, null, null, null, null, null).use { cursor ->
             cursor?.moveToFirst()?.takeIf { true }?.let {

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt

@@ -124,7 +124,7 @@ class MediaPickerViewModel @Inject constructor(
                 filter = domainModel?.filter,
                 searchExpanded = searchExpanded
             ),
-            !domainModel?.domainItems.isNullOrEmpty() && domainModel?.isLoading == true,
+            !domainModel?.domainItems.isNullOrEmpty() && domainModel.isLoading == true,
             buildBrowseMenuUiModel(softAskRequest, searchExpanded),
             progressDialogUiModel ?: Hidden,
             showPartialAccessPrompt ?: false,