Merge release notes for Release/16.2 into develop

WordPress/metadata/PlayStoreStrings.po

@@ -27,6 +27,18 @@ msgid ""
 "\n"
 msgstr ""
 
+msgctxt "release_note_short_162"
+msgid ""
+"16.2:\n"
+"Block editor: We’ve improved the overall performance, which you may notice when you start a new post. The Image block now has better support for uploading multiple images.\n"
+"\n"
+"More updates: Your app uses a new Media Picker when you select files. We also fixed a bug on pure self-hosted sites on HTTP that affected featured images in the Posts List.\n"
+msgstr ""
+
+msgctxt "release_note_short_161"
+msgid ""
+msgstr ""
+
 #. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"

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

@@ -354,7 +354,7 @@ class MediaPickerViewModel @Inject constructor(
                     _domainModel.value = domainModel
                 }
             }
-            if (permissionsHandler.hasStoragePermission()) {
+            if (!mediaPickerSetup.requiresStoragePermissions || permissionsHandler.hasStoragePermission()) {
                 launch(bgDispatcher) {
                     loadActions.send(LoadAction.Start())
                 }

WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt

@@ -2,11 +2,13 @@ package org.wordpress.android.ui.mediapicker
 
 import android.content.Context
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.inOrder
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.flow
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -55,6 +57,7 @@ import org.wordpress.android.ui.mediapicker.insert.MediaInsertHandler
 import org.wordpress.android.ui.mediapicker.insert.MediaInsertHandlerFactory
 import org.wordpress.android.ui.mediapicker.loader.MediaLoader
 import org.wordpress.android.ui.mediapicker.loader.MediaLoader.DomainModel
+import org.wordpress.android.ui.mediapicker.loader.MediaLoader.LoadAction
 import org.wordpress.android.ui.mediapicker.loader.MediaLoaderFactory
 import org.wordpress.android.ui.photopicker.PermissionsHandler
 import org.wordpress.android.ui.utils.UiString
@@ -83,6 +86,7 @@ class MediaPickerViewModelTest : BaseUnitTest() {
     @Mock lateinit var mediaStore: MediaStore
     private lateinit var viewModel: MediaPickerViewModel
     private var uiStates = mutableListOf<MediaPickerUiState>()
+    private lateinit var actions: Channel<LoadAction>
     private var navigateEvents = mutableListOf<Event<MediaNavigationEvent>>()
     private val singleSelectMediaPickerSetup = buildMediaPickerSetup(false, setOf(IMAGE))
     private val multiSelectMediaPickerSetup = buildMediaPickerSetup(true, setOf(IMAGE, VIDEO))
@@ -542,12 +546,14 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertThat(iconClickEvents).hasSize(1)
         assertThat(iconClickEvents[0].action is SwitchMediaPicker).isTrue()
         val updatedMediaPickerSetup = (iconClickEvents[0].action as SwitchMediaPicker).mediaPickerSetup
-        assertThat(updatedMediaPickerSetup).isEqualTo(mediaPickerSetup.copy(
-                primaryDataSource = WP_LIBRARY,
-                availableDataSources = setOf(),
-                systemPickerEnabled = false,
-                cameraSetup = HIDDEN
-        ))
+        assertThat(updatedMediaPickerSetup).isEqualTo(
+                mediaPickerSetup.copy(
+                        primaryDataSource = WP_LIBRARY,
+                        availableDataSources = setOf(),
+                        systemPickerEnabled = false,
+                        cameraSetup = HIDDEN
+                )
+        )
     }
 
     @Test
@@ -574,12 +580,14 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertThat(iconClickEvents).hasSize(1)
         assertThat(iconClickEvents[0].action is SwitchMediaPicker).isTrue()
         val updatedMediaPickerSetup = (iconClickEvents[0].action as SwitchMediaPicker).mediaPickerSetup
-        assertThat(updatedMediaPickerSetup).isEqualTo(mediaPickerSetup.copy(
-                primaryDataSource = STOCK_LIBRARY,
-                availableDataSources = setOf(),
-                defaultSearchView = true,
-                systemPickerEnabled = false
-        ))
+        assertThat(updatedMediaPickerSetup).isEqualTo(
+                mediaPickerSetup.copy(
+                        primaryDataSource = STOCK_LIBRARY,
+                        availableDataSources = setOf(),
+                        defaultSearchView = true,
+                        systemPickerEnabled = false
+                )
+        )
     }
 
     @Test
@@ -637,6 +645,39 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertPhotoListUiStateData()
     }
 
+    @Test
+    fun `does not start loading without storage permissions`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = true),
+                hasStoragePermissions = false
+        )
+
+        assertThat(actions.poll()).isNull()
+    }
+
+    @Test
+    fun `starts loading with storage permissions`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = true),
+                hasStoragePermissions = true
+        )
+
+        assertThat(actions.poll()).isEqualTo(LoadAction.Start(null))
+    }
+
+    @Test
+    fun `starts loading when storage permissions not necessary`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = false),
+                hasStoragePermissions = false
+        )
+
+        assertThat(actions.poll()).isEqualTo(LoadAction.Start(null))
+    }
+
     private fun selectItem(position: Int) {
         when (val item = itemOnPosition(position)) {
             is PhotoItem -> item.toggleAction.toggle()
@@ -733,17 +774,21 @@ class MediaPickerViewModelTest : BaseUnitTest() {
     ) {
         whenever(permissionsHandler.hasStoragePermission()).thenReturn(hasStoragePermissions)
         whenever(mediaLoaderFactory.build(mediaPickerSetup, site)).thenReturn(mediaLoader)
-        whenever(mediaLoader.loadMedia(any())).thenReturn(flow {
-            if (null != domainModel) {
-                emit(
-                        DomainModel(
-                                domainModel,
-                                filter = filter,
-                                hasMore = hasMore
-                        )
-                )
+        doAnswer {
+            actions = it.getArgument(0)
+            return@doAnswer flow {
+                if (null != domainModel) {
+                    emit(
+                            DomainModel(
+                                    domainModel,
+                                    filter = filter,
+                                    hasMore = hasMore
+                            )
+                    )
+                }
             }
-        })
+        }.whenever(mediaLoader).loadMedia(any())
+
         whenever(mediaInsertHandlerFactory.build(mediaPickerSetup, site)).thenReturn(mediaInsertHandler)
 
         viewModel.start(listOf(), mediaPickerSetup, null, site)
@@ -825,12 +870,13 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         canMultiselect: Boolean,
         allowedTypes: Set<MediaType>,
         cameraSetup: CameraSetup = HIDDEN,
-        editingEnabled: Boolean = true
+        editingEnabled: Boolean = true,
+        requiresStoragePermissions: Boolean = true
     ) = MediaPickerSetup(
             primaryDataSource = DEVICE,
             availableDataSources = setOf(),
             canMultiselect = canMultiselect,
-            requiresStoragePermissions = true,
+            requiresStoragePermissions = requiresStoragePermissions,
             allowedTypes = allowedTypes,
             cameraSetup = cameraSetup,
             systemPickerEnabled = true,