Do not iterate in while when history cursor is outside of list range

Author: planarvoid

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

@@ -14,7 +14,10 @@ class AztecAttributes(attributes: Attributes = AttributesImpl()) : AttributesImp
                 addAttribute("", key, key, "string", value)
             } catch (e: ArrayIndexOutOfBoundsException) {
                 // https://github.com/wordpress-mobile/AztecEditor-Android/issues/705
-                AppLog.e(AppLog.T.EDITOR, "Error adding attribute with name: $key and value: $value")
+                AppLog.e(
+                    AppLog.T.EDITOR,
+                    "Error adding attribute with name: $key and value: $value"
+                )
                 logInternalState()
                 throw e
             }
@@ -64,21 +67,35 @@ class AztecAttributes(attributes: Attributes = AttributesImpl()) : AttributesImp
 
     @Synchronized
     override fun toString(): String {
-        val sb = StringBuilder()
+        return toMap().map { (key, value) ->
+            "$key=\"$value\""
+        }.joinToString(" ")
+    }
+
+    override fun hashCode(): Int {
+        return toMap().hashCode()
+    }
+
+    private fun toMap(): Map<String, String> {
+        val map = mutableMapOf<String, String>()
         try {
-            for (i in 0..this.length - 1) {
-                sb.append(this.getLocalName(i))
-                sb.append("=\"")
-                sb.append(this.getValue(i))
-                sb.append("\" ")
+            for (i in 0..<this.length) {
+                map[this.getLocalName(i)] = this.getValue(i)
             }
         } catch (e: ArrayIndexOutOfBoundsException) {
             // https://github.com/wordpress-mobile/AztecEditor-Android/issues/705
-            AppLog.e(AppLog.T.EDITOR, "IOOB occurred in toString. Dumping partial state:")
-            AppLog.e(AppLog.T.EDITOR, sb.trimEnd().toString())
+            AppLog.e(AppLog.T.EDITOR, "IOOB occurred in toMap. Dumping partial state:")
+            AppLog.e(AppLog.T.EDITOR, map.toString())
             throw e
         }
+        return map
+    }
 
-        return sb.trimEnd().toString()
+    override fun equals(other: Any?): Boolean {
+        if (other is AztecAttributes) {
+            return this.toMap() == other.toMap()
+        } else {
+            return super.equals(other)
+        }
     }
 }

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

@@ -25,6 +25,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
@@ -95,7 +96,11 @@ class ComposePlaceholderManager(
     fun Draw() {
         val density = LocalDensity.current
 
-        val values = composeViewState.collectAsState().value.values.filter { it.visible }.sortedBy { it.topMargin }
+        val values = composeViewState.map { map ->
+            map.values.filter { it.visible }.sortedBy { it.topMargin }
+        }.collectAsState(
+            emptyList()
+        ).value
 
         values.forEach { composeView ->
             Box(
@@ -420,11 +425,11 @@ class ComposePlaceholderManager(
             val heightSame = existingView.height == newHeight
             val topMarginSame = existingView.topMargin == newTopPadding
             val leftMarginSame = existingView.leftMargin == newLeftPadding
-            if (widthSame && heightSame && topMarginSame && leftMarginSame) {
+            val attrsSame = existingView.attrs == attrs
+            if (widthSame && heightSame && topMarginSame && leftMarginSame && attrsSame) {
                 return
             }
         }
-
         composeViewState.value = composeViewState.value.let { state ->
             val mutableState = state.toMutableMap()
             mutableState[uuid] = ComposeView(
@@ -604,9 +609,11 @@ class ComposePlaceholderManager(
         launch {
             positionToIdMutex.withLock {
                 composeViewState.value = composeViewState.value.let { state ->
-                    state.mapValues { (_, value) -> value.copy(
-                        visible = View.VISIBLE == visibility
-                    ) }
+                    state.mapValues { (_, value) ->
+                        value.copy(
+                            visible = View.VISIBLE == visibility
+                        )
+                    }
                 }
             }
         }