Improve behaviour of removeImage

Author: planarvoid

aztec/src/test/kotlin/org/wordpress/aztec/ImageBlockTest.kt

@@ -11,6 +11,7 @@ import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.wordpress.aztec.source.SourceViewEditText
 import org.wordpress.aztec.toolbar.AztecToolbar
+import org.xml.sax.Attributes
 
 @RunWith(RobolectricTestRunner::class)
 class ImageBlockTest {
@@ -211,4 +212,70 @@ class ImageBlockTest {
 
         Assert.assertEquals("<p>Line 1</p><img id=\"1234\" /><p>Line 2</p><p>Line 3</p>", editText.toHtml())
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun addAndRemoveImage() {
+        val initialHtml = "<p>Line 1</p><p>Line 2</p>"
+        editText.fromHtml(initialHtml)
+
+        editText.setSelection(editText.editableText.indexOf("1") + 2)
+        val attributes = AztecAttributes()
+        attributes.setValue("id", "1234")
+        editText.insertImage(null, attributes)
+
+        Assert.assertEquals("<p>Line 1</p><img id=\"1234\" /><p>Line 2</p>", editText.toHtml())
+
+        editText.removeMedia(object : AztecText.AttributePredicate {
+            override fun matches(attrs: Attributes): Boolean {
+                return attrs.getValue("id") == "1234"
+            }
+        })
+
+        Assert.assertEquals(initialHtml, editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun addAndRemoveImageAtTheBeginning() {
+        val initialHtml = "Line 1"
+        editText.fromHtml(initialHtml)
+
+        editText.setSelection(0)
+        val attributes = AztecAttributes()
+        attributes.setValue("id", "1234")
+        editText.insertImage(null, attributes)
+
+        Assert.assertEquals("<img id=\"1234\" />Line 1", editText.toHtml())
+
+        editText.removeMedia(object : AztecText.AttributePredicate {
+            override fun matches(attrs: Attributes): Boolean {
+                return attrs.getValue("id") == "1234"
+            }
+        })
+
+        Assert.assertEquals(initialHtml, editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun addAndRemoveImageAtTheBeginningOfPlaceholder() {
+        val initialHtml = "<p>Line 1</p>"
+        editText.fromHtml(initialHtml)
+
+        editText.setSelection(0)
+        val attributes = AztecAttributes()
+        attributes.setValue("id", "1234")
+        editText.insertImage(null, attributes)
+
+        Assert.assertEquals("<img id=\"1234\" /><p>Line 1</p>", editText.toHtml())
+
+        editText.removeMedia(object : AztecText.AttributePredicate {
+            override fun matches(attrs: Attributes): Boolean {
+                return attrs.getValue("id") == "1234"
+            }
+        })
+
+        Assert.assertEquals(initialHtml, editText.toHtml())
+    }
 }

media-placeholders/src/main/java/org/wordpress/aztec/placeholders/ImageWithCaptionAdapter.kt

@@ -82,7 +82,15 @@ class ImageWithCaptionAdapter(
         private const val SRC_ATTRIBUTE = "src"
 
         suspend fun insertImageWithCaption(placeholderManager: PlaceholderManager, src: String, caption: String) {
-            placeholderManager.insertItem(ADAPTER_TYPE, SRC_ATTRIBUTE to src, CAPTION_ATTRIBUTE to caption)
+//            placeholderManager.insertItem(ADAPTER_TYPE, SRC_ATTRIBUTE to src, CAPTION_ATTRIBUTE to caption)
+            placeholderManager.insertOrUpdateItem(ADAPTER_TYPE) { currentAttributes, type ->
+                if (currentAttributes == null || type != ADAPTER_TYPE) {
+                    mapOf(SRC_ATTRIBUTE to src, CAPTION_ATTRIBUTE to caption)
+                } else {
+                    val currentCaption = currentAttributes[CAPTION_ATTRIBUTE]
+                    mapOf(SRC_ATTRIBUTE to src, CAPTION_ATTRIBUTE to "$caption - $currentCaption")
+                }
+            }
         }
     }
 }