Merge pull request #701 from wordpress-mobile/issue/700-focus-on-html-switch

Don't steal focus on initial load of media

Author: daniloercoli

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

@@ -1025,7 +1025,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 private fun replaceImage(drawable: Drawable?) {
                     it.drawable = drawable
                     post {
-                        refreshText()
+                        refreshText(false)
                     }
                 }
             }
@@ -1058,7 +1058,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                 private fun replaceImage(drawable: Drawable?) {
                     it.drawable = drawable
                     post {
-                        refreshText()
+                        refreshText(false)
                     }
                 }
             }
@@ -1246,10 +1246,16 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     open fun refreshText() {
+        refreshText(true)
+    }
+
+    open fun refreshText(stealEditorFocus: Boolean) {
         disableTextChangedListener()
         val selStart = selectionStart
         val selEnd = selectionEnd
-        setFocusOnParentView()
+        if (stealEditorFocus) {
+            setFocusOnParentView()
+        }
         text = editableText
         setSelection(selStart, selEnd)
         enableTextChangedListener()

wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/extensions/VideoPressExtensions.kt

@@ -24,7 +24,7 @@ fun AztecText.updateVideoPressThumb(thumbURL: String, videoURL: String, videoPre
                 }
             }
             post {
-                refreshText()
+                refreshText(false)
             }
         }
 
@@ -41,4 +41,4 @@ fun AztecText.updateVideoPressThumb(thumbURL: String, videoURL: String, videoPre
         }
     }
     imageGetter?.loadImage(thumbURL, callbacks, this.maxImagesWidth, this.minImagesWidth)
-}
+}