@@ -271,12 +271,12 @@ class LineBlockFormatter(editor: AztecText, val headerStyle: LineBlockFormatter.
271271 fun insertMedia (drawable : Drawable ? , attributes : Attributes , onMediaTappedListener : OnMediaTappedListener ? ) {
272272 val span = AztecMediaSpan (editor.context, drawable, attributes, onMediaTappedListener)
273273
274- val spanAtEndOfWhichMediaIsAdded = editableText.getSpans(selectionStart, selectionEnd, AztecBlockSpan ::class .java)
274+ val spanBeforeMedia = editableText.getSpans(selectionStart, selectionEnd, AztecBlockSpan ::class .java)
275275 .firstOrNull {
276276 selectionStart == editableText.getSpanEnd(it)
277277 }
278278
279- val spanAtStartOfWhichMediaIsAdded = editableText.getSpans(selectionStart, selectionEnd, AztecBlockSpan ::class .java)
279+ val spanAfterMedia = editableText.getSpans(selectionStart, selectionEnd, AztecBlockSpan ::class .java)
280280 .firstOrNull {
281281 selectionStart == editableText.getSpanStart(it)
282282 }
@@ -287,12 +287,12 @@ class LineBlockFormatter(editor: AztecText, val headerStyle: LineBlockFormatter.
287287 editor.disableTextChangedListener()
288288 editableText.replace(selectionStart, selectionEnd, Constants .IMG_STRING )
289289
290- if (spanAtStartOfWhichMediaIsAdded != null ) {
291- editableText.setSpan(spanAtStartOfWhichMediaIsAdded , mediaStartIndex, editableText.getSpanEnd(spanAtStartOfWhichMediaIsAdded ), Spanned .SPAN_EXCLUSIVE_EXCLUSIVE )
290+ if (spanAfterMedia != null ) {
291+ editableText.setSpan(spanAfterMedia , mediaStartIndex, editableText.getSpanEnd(spanAfterMedia ), Spanned .SPAN_EXCLUSIVE_EXCLUSIVE )
292292 }
293293
294- if (spanAtEndOfWhichMediaIsAdded != null ) {
295- editableText.setSpan(spanAtEndOfWhichMediaIsAdded , editableText.getSpanStart(spanAtEndOfWhichMediaIsAdded ), mediaEndIndex, Spanned .SPAN_EXCLUSIVE_EXCLUSIVE )
294+ if (spanBeforeMedia != null ) {
295+ editableText.setSpan(spanBeforeMedia , editableText.getSpanStart(spanBeforeMedia ), mediaEndIndex, Spanned .SPAN_EXCLUSIVE_EXCLUSIVE )
296296 }
297297
298298 editor.removeInlineStylesFromRange(mediaStartIndex, mediaEndIndex)
0 commit comments