Merge pull request #928 from wordpress-mobile/gutenberg/issue/1663-heading-block

[Gutenberg] Account for the end of buffer marker

Author: khaykov

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

@@ -632,8 +632,9 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
 
         val emptyEditTextBackspaceDetector = InputFilter { source, start, end, dest, dstart, dend ->
             if (selectionStart == 0 && selectionEnd == 0
-                    && end == 0 && start == 0
+                    && start == 0
                     && dstart == 0 && dend == 0
+                    && isCleanStringEmpty(source)
                     && !isHandlingBackspaceEvent) {
                 isHandlingBackspaceEvent = true
 
@@ -654,6 +655,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         }
     }
 
+    private fun isCleanStringEmpty(text: CharSequence): Boolean {
+        if ( isInGutenbergMode ) {
+            return (text.count() == 1 && text[0] == Constants.END_OF_BUFFER_MARKER)
+        } else {
+            return text.count() == 0
+        }
+    }
+
     private fun handleBackspaceAndEnter(event: KeyEvent): Boolean {
         if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER) {
             // Check if the external listener has consumed the enter pressed event