Add Stock photo caption and include it when uploading a photo

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

@@ -37,7 +37,8 @@ data class MediaItem(
         data class StockMediaIdentifier(
             val url: String?,
             val name: String?,
-            val title: String?
+            val title: String?,
+            val caption: String?
         ) : Identifier(STOCK_MEDIA_IDENTIFIER)
 
         data class GifMediaIdentifier(
@@ -62,6 +63,7 @@ data class MediaItem(
                     parcel.writeString(this.url)
                     parcel.writeString(this.name)
                     parcel.writeString(this.title)
+                    parcel.writeString(this.caption)
                 }
                 is GifMediaIdentifier -> {
                     parcel.writeParcelable(this.largeImageUri.uri, flags)
@@ -93,7 +95,12 @@ data class MediaItem(
                             LocalId(parcel.readInt())
                         }
                         STOCK_MEDIA_IDENTIFIER -> {
-                            StockMediaIdentifier(parcel.readString(), parcel.readString(), parcel.readString())
+                            StockMediaIdentifier(
+                                    parcel.readString(),
+                                    parcel.readString(),
+                                    parcel.readString(),
+                                    parcel.readString()
+                            )
                         }
                         GIF_MEDIA_IDENTIFIER -> {
                             GifMediaIdentifier(

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

@@ -27,7 +27,7 @@ class StockMediaInsertUseCase(
         emit(InsertModel.Progress(actionTitle))
         val result = stockMediaStore.performUploadStockMedia(site, identifiers.mapNotNull { identifier ->
             (identifier as? StockMediaIdentifier)?.let {
-                StockMediaUploadItem(it.name, it.title, it.url)
+                StockMediaUploadItem(it.name, it.title, it.url, it.caption)
             }
         })
         emit(when {

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

@@ -80,7 +80,7 @@ class StockMediaDataSource
                 .mapNotNull {
                     it.url?.let { url ->
                         MediaItem(
-                                StockMediaIdentifier(it.url, it.name, it.title),
+                                StockMediaIdentifier(it.url, it.name, it.title, it.caption),
                                 url,
                                 it.name,
                                 IMAGE,

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

@@ -30,13 +30,15 @@ class StockMediaInsertUseCaseTest : BaseUnitTest() {
     private val title = "title"
     private val name = "name"
     private val thumbnail = "image.jpg"
+    private val caption = "caption"
     private val stockMediaItem = StockMediaItem(
             "id",
             name,
             title,
             url,
             "123",
-            thumbnail
+            thumbnail,
+            caption
     )
 
     @Before
@@ -46,7 +48,7 @@ class StockMediaInsertUseCaseTest : BaseUnitTest() {
 
     @Test
     fun `uploads media on insert`() = test {
-        val itemToInsert = Identifier.StockMediaIdentifier(url, name, title)
+        val itemToInsert = Identifier.StockMediaIdentifier(url, name, title, caption)
         val insertedMediaModel = MediaModel()
         val mediaId: Long = 10
         insertedMediaModel.mediaId = mediaId
@@ -60,6 +62,6 @@ class StockMediaInsertUseCaseTest : BaseUnitTest() {
         (result[1] as InsertModel.Success).apply {
             assertThat(this.identifiers).containsExactly(RemoteId(mediaId))
         }
-        verify(stockMediaStore).performUploadStockMedia(site, listOf(StockMediaUploadItem(name, title, url)))
+        verify(stockMediaStore).performUploadStockMedia(site, listOf(StockMediaUploadItem(name, title, url, caption)))
     }
 }

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

@@ -37,13 +37,15 @@ class StockMediaDataSourceTest : BaseUnitTest() {
     private val title = "title"
     private val name = "name"
     private val thumbnail = "image.jpg"
+    private val caption = "caption"
     private val stockMediaItem = StockMediaItem(
             "id",
             name,
             title,
             url,
             "123",
-            thumbnail
+            thumbnail,
+            caption
     )
 
     @Before
@@ -87,7 +89,7 @@ class StockMediaDataSourceTest : BaseUnitTest() {
             assertThat(this.data).hasSize(1)
             assertThat(this.data).containsExactly(
                     MediaItem(
-                            StockMediaIdentifier(url, name, title),
+                            StockMediaIdentifier(url, name, title, caption),
                             url,
                             name,
                             IMAGE,

build.gradle

@@ -136,7 +136,7 @@ ext {
     androidxWorkVersion = "2.4.0"
 
     daggerVersion = '2.29.1'
-    fluxCVersion = '1.9.0'
+    fluxCVersion = '5d6f6ce247a0ca6a99fc2d069f6461a20d3c668d'
 
     appCompatVersion = '1.0.2'
     coreVersion = '1.2.0'