Merge pull request #621 from wordpress-mobile/issue/530-API25-intra-word-space-formatting-disappears

Fix formatting disappears on API25 when inserting space before formatted text

Author: 0nko

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/buckets/API25Bucket.kt

@@ -0,0 +1,13 @@
+package org.wordpress.aztec.watchers.event.buckets
+
+import org.wordpress.aztec.watchers.event.sequence.known.space.API25InWordSpaceInsertionEvent
+
+class API25Bucket : Bucket() {
+    init {
+        // constructor - here add all identified sequences for this bucket
+        userOperations.add(API25InWordSpaceInsertionEvent())
+        //mUserOperations.add(new ...);
+        //mUserOperations.add(new ...);
+        //mUserOperations.add(new ...);
+    }
+}

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/buckets/API26Bucket.kt

@@ -1,11 +1,11 @@
 package org.wordpress.aztec.watchers.event.buckets
 
-import org.wordpress.aztec.watchers.event.sequence.known.space.API26InWordSpaceInsertionEvent
+import org.wordpress.aztec.watchers.event.sequence.known.space.API25InWordSpaceInsertionEvent
 
 class API26Bucket : Bucket() {
     init {
         // constructor - here add all identified sequences for this bucket
-        userOperations.add(API26InWordSpaceInsertionEvent())
+        userOperations.add(API25InWordSpaceInsertionEvent())
         //mUserOperations.add(new ...);
         //mUserOperations.add(new ...);
         //mUserOperations.add(new ...);

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/ObservationQueue.kt

@@ -2,6 +2,7 @@ package org.wordpress.aztec.watchers.event.sequence
 
 import android.os.Build
 import org.wordpress.aztec.watchers.event.IEventInjector
+import org.wordpress.aztec.watchers.event.buckets.API25Bucket
 import org.wordpress.aztec.watchers.event.buckets.API26Bucket
 import org.wordpress.aztec.watchers.event.buckets.Bucket
 import org.wordpress.aztec.watchers.event.text.TextWatcherEvent
@@ -12,6 +13,8 @@ class ObservationQueue(val injector: IEventInjector) : EventSequence<TextWatcher
     init {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             buckets.add(API26Bucket())
+        } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) {
+            buckets.add(API25Bucket())
         }
         /*
             remember to add here any other buckets and init logic as suitable, depending on the context

…/space/API26InWordSpaceInsertionEvent.kt …/space/API25InWordSpaceInsertionEvent.ktaztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API26InWordSpaceInsertionEvent.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API25InWordSpaceInsertionEvent.kt aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API26InWordSpaceInsertionEvent.kt renamed to aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API25InWordSpaceInsertionEvent.kt

@@ -11,7 +11,7 @@ import org.wordpress.aztec.watchers.event.text.TextWatcherEvent
 /*
  This case implements the behavior observed in https://github.com/wordpress-mobile/AztecEditor-Android/issues/555
  */
-class API26InWordSpaceInsertionEvent : UserOperationEvent() {
+class API25InWordSpaceInsertionEvent : UserOperationEvent() {
     private val SPACE = ' '
     private val SPACE_STRING = "" + SPACE
     private val MAXIMUM_TIME_BETWEEN_EVENTS_IN_PATTERN_MS = 50
@@ -35,7 +35,7 @@ class API26InWordSpaceInsertionEvent : UserOperationEvent() {
         val builderStep4 = TextWatcherEventInsertText.Builder()
         val step4 = builderStep4.build()
 
-        // add each of the steps that make up for the identified API26InWordSpaceInsertionEvent here
+        // add each of the steps that make up for the identified API25InWordSpaceInsertionEvent here
         clear()
         addSequenceStep(step1)
         addSequenceStep(step2)