Fix for onMediaDeleted called unnecessarily in API25.

Author: daniloercoli

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

@@ -88,8 +88,8 @@ import org.wordpress.aztec.util.AztecLog
 import org.wordpress.aztec.util.SpanWrapper
 import org.wordpress.aztec.util.coerceToHtmlText
 import org.wordpress.aztec.watchers.BlockElementWatcher
-import org.wordpress.aztec.watchers.DeleteMediaElementWatcherAPI26AndHigher
-import org.wordpress.aztec.watchers.DeleteMediaElementWatcherPreAPI26
+import org.wordpress.aztec.watchers.DeleteMediaElementWatcherAPI25AndHigher
+import org.wordpress.aztec.watchers.DeleteMediaElementWatcherPreAPI25
 import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
 import org.wordpress.aztec.watchers.EndOfParagraphMarkerAdder
 import org.wordpress.aztec.watchers.FullWidthImageElementWatcher
@@ -446,10 +446,10 @@ class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlT
         EndOfBufferMarkerAdder.install(this)
         ZeroIndexContentWatcher.install(this)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            DeleteMediaElementWatcherAPI26AndHigher.install(this)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            DeleteMediaElementWatcherAPI25AndHigher.install(this)
         } else {
-            DeleteMediaElementWatcherPreAPI26.install(this)
+            DeleteMediaElementWatcherPreAPI25.install(this)
         }
 
         // History related logging has to happen before the changes in [ParagraphCollapseRemover]

…leteMediaElementWatcherAPI26AndHigher.kt …leteMediaElementWatcherAPI25AndHigher.ktaztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI26AndHigher.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI25AndHigher.kt aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI26AndHigher.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherAPI25AndHigher.kt

@@ -6,7 +6,7 @@ import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.spans.AztecMediaSpan
 import java.lang.ref.WeakReference
 
-class DeleteMediaElementWatcherAPI26AndHigher(aztecText: AztecText) : TextWatcher {
+class DeleteMediaElementWatcherAPI25AndHigher(aztecText: AztecText) : TextWatcher {
     private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
     private var deleted = false
     private var queueHasBeenPopulatedInThisTimeframe = false
@@ -55,7 +55,7 @@ class DeleteMediaElementWatcherAPI26AndHigher(aztecText: AztecText) : TextWatche
 
     companion object {
         fun install(text: AztecText) {
-            text.addTextChangedListener(DeleteMediaElementWatcherAPI26AndHigher(text))
+            text.addTextChangedListener(DeleteMediaElementWatcherAPI25AndHigher(text))
         }
     }
 }

…ers/DeleteMediaElementWatcherPreAPI26.kt …ers/DeleteMediaElementWatcherPreAPI25.ktaztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherPreAPI26.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherPreAPI25.kt aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherPreAPI26.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/DeleteMediaElementWatcherPreAPI25.kt

@@ -6,7 +6,7 @@ import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.spans.AztecMediaSpan
 import java.lang.ref.WeakReference
 
-class DeleteMediaElementWatcherPreAPI26(aztecText: AztecText) : TextWatcher {
+class DeleteMediaElementWatcherPreAPI25(aztecText: AztecText) : TextWatcher {
     private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
 
     override fun beforeTextChanged(text: CharSequence, start: Int, count: Int, after: Int) {
@@ -32,7 +32,7 @@ class DeleteMediaElementWatcherPreAPI26(aztecText: AztecText) : TextWatcher {
 
     companion object {
         fun install(text: AztecText) {
-            text.addTextChangedListener(DeleteMediaElementWatcherPreAPI26(text))
+            text.addTextChangedListener(DeleteMediaElementWatcherPreAPI25(text))
         }
     }
 }