Merge branch 'feature/implement-merging-of-placeholders' into feature/implement-delete-or-update

Author: planarvoid

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -2161,15 +2161,18 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         lineBlockFormatter.insertVideo(shouldAddMediaInline, drawable, attributes, onVideoTappedListener, onMediaDeletedListener)
     }
 
-    fun removeMedia(predicate: (Attributes) -> Boolean) {
+    fun removeMedia(notifyContentChange: Boolean = true, predicate: (Attributes) -> Boolean) {
         removeMedia(object : AttributePredicate {
             override fun matches(attrs: Attributes): Boolean {
                 return predicate(attrs)
             }
-        })
+        }, notifyContentChange)
     }
 
-    fun removeMedia(attributePredicate: AttributePredicate) {
+    fun removeMedia(attributePredicate: AttributePredicate, notifyContentChange: Boolean = true) {
+        if (!notifyContentChange) {
+            disableTextChangedListener()
+        }
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
                 .filter {
                     attributePredicate.matches(it.attributes)
@@ -2217,6 +2220,9 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     }
                     mediaSpan.onMediaDeleted()
                 }
+        if (!notifyContentChange) {
+            enableTextChangedListener()
+        }
     }
 
     interface AttributePredicate {

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

@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable
 import android.text.Editable
 import android.text.Layout
 import android.text.Spanned
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewTreeObserver
@@ -110,7 +111,15 @@ class PlaceholderManager(
      * @param updateItem function to update current parameters with new params
      */
     suspend fun insertOrUpdateItem(type: String, shouldMergeItem: (currentItemType: String) -> Boolean = { true }, updateItem: (currentAttributes: Map<String, String>?, currentType: String?) -> Map<String, String>) {
-        val from = (aztecText.selectionStart - 1).coerceAtLeast(0)
+        val previousIndex = (aztecText.selectionStart - 1).coerceAtLeast(0)
+        val indexBeforePrevious = (aztecText.selectionStart - 2).coerceAtLeast(0)
+        val from = if (aztecText.editableText[previousIndex] == Constants.IMG_CHAR) {
+            previousIndex
+        } else if (aztecText.editableText[previousIndex] == '\n') {
+            indexBeforePrevious
+        } else {
+            aztecText.selectionStart
+        }
         val editableText = aztecText.editableText
         val currentItem = editableText.getSpans(
                 from,
@@ -141,7 +150,9 @@ class PlaceholderManager(
             currentAttributes[name] = value
         }
         val updatedAttributes = updateItem(currentAttributes, currentType)
-        removeItem(uuid)
+        removeItem(false) { aztecAttributes ->
+            aztecAttributes.getValue(UUID_ATTRIBUTE) == uuid
+        }
         val attrs = AztecAttributes().apply {
             updatedAttributes.forEach { (key, value) ->
                 setValue(key, value)
@@ -188,8 +199,8 @@ class PlaceholderManager(
      * Call this method to remove a placeholder from both the AztecText and the overlaying layer programmatically.
      * @param predicate determines whether a span should be removed
      */
-    fun removeItem(predicate: (Attributes) -> Boolean) {
-        aztecText.removeMedia { predicate(it) }
+    fun removeItem(notifyContentChange: Boolean = true, predicate: (Attributes) -> Boolean) {
+        aztecText.removeMedia(notifyContentChange) { predicate(it) }
     }
 
     /**
@@ -210,9 +221,13 @@ class PlaceholderManager(
      * Call this method to reload all the placeholders
      */
     suspend fun reloadAllPlaceholders() {
-        positionToIdMutex.withLock {
-            positionToId.forEach {
-                insertContentOverSpanWithId(it.uuid)
+        val tempPositionToId = positionToId.toList()
+        tempPositionToId.forEach { placeholder ->
+            val isValid = positionToIdMutex.withLock {
+                positionToId.contains(placeholder)
+            }
+            if (isValid) {
+                insertContentOverSpanWithId(placeholder.uuid)
             }
         }
     }