Use concurrent linked queue when deleting media

Author: planarvoid

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecMediaSpan.kt

@@ -100,6 +100,6 @@ abstract class AztecMediaSpan(context: Context, drawable: Drawable?, override va
         onMediaDeletedListener?.onMediaDeleted(attributes)
     }
     fun beforeMediaDeleted() {
-        onMediaDeletedListener?.onMediaDeleted(attributes)
+        onMediaDeletedListener?.beforeMediaDeleted(attributes)
     }
 }

aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI25AndHigher.kt

@@ -5,12 +5,13 @@ import android.text.TextWatcher
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.spans.AztecMediaSpan
 import java.lang.ref.WeakReference
+import java.util.concurrent.ConcurrentLinkedQueue
 
 class DeleteMediaElementWatcherAPI25AndHigher(aztecText: AztecText) : TextWatcher {
     private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
     private var deleted = false
     private var queueHasBeenPopulatedInThisTimeframe = false
-    private var deletedSpans = ArrayList<AztecMediaSpan>()
+    private val deletedSpans = ConcurrentLinkedQueue<AztecMediaSpan>()
 
     override fun beforeTextChanged(text: CharSequence, start: Int, count: Int, after: Int) {
         if (aztecTextRef.get()?.isTextChangedListenerDisabled() != false) {
@@ -29,23 +30,18 @@ class DeleteMediaElementWatcherAPI25AndHigher(aztecText: AztecText) : TextWatche
             aztecTextRef.get()?.text?.getSpans(start, start + count, AztecMediaSpan::class.java)
                     ?.forEach {
                         deletedSpans.add(it)
+                        if (!queueHasBeenPopulatedInThisTimeframe) {
+                            it.beforeMediaDeleted()
+                        }
                     }
-
-            if (!queueHasBeenPopulatedInThisTimeframe) {
-                deletedSpans.forEach { it.beforeMediaDeleted() }
-            }
             // only call the onMediaDeleted callback if we are sure the ObservationQueue has not been filled with
             // platform-only events in a short time. These platform-originated events shall not be confused with
             // real user deletions.
-            aztecTextRef.get()?.postDelayed( object : Runnable {
-                override fun run() {
-                    if (!queueHasBeenPopulatedInThisTimeframe) {
-                        deletedSpans.forEach { it.onMediaDeleted() }
-                    }
-                    // reset flag
-                    deletedSpans.clear()
-                    queueHasBeenPopulatedInThisTimeframe = false
+            aztecTextRef.get()?.postDelayed({
+                while (!queueHasBeenPopulatedInThisTimeframe && deletedSpans.isNotEmpty()) {
+                    deletedSpans.poll().onMediaDeleted()
                 }
+                queueHasBeenPopulatedInThisTimeframe = false
             }, 500)
         }
     }