Skip to content

Commit 9a00b4d

Browse files
fix: getting safe image range
1 parent c804d18 commit 9a00b4d

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
187187
spannable.replace(start, originalEnd, "\uFFFC")
188188
}
189189

190-
val imageEnd = start + 1;
190+
val (imageStart, imageEnd) = spannable.getSafeSpanBoundaries(start, start + 1)
191191
val uri = Uri.fromFile(File(src))
192192

193193
val span = EnrichedImageSpan(view.context, uri, width.toInt(), height.toInt())
194-
spannable.setSpan(span, start, imageEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
194+
spannable.setSpan(span, imageStart, imageEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
195195
}
196196

197197
fun startMention(indicator: String) {

android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import android.content.res.Resources;
44
import android.graphics.Bitmap;
55
import android.graphics.BitmapFactory;
6-
import android.graphics.Color;
76
import android.graphics.drawable.BitmapDrawable;
8-
import android.graphics.drawable.ColorDrawable;
97
import android.graphics.drawable.Drawable;
108
import android.text.Editable;
119
import android.text.Layout;
@@ -15,6 +13,7 @@
1513
import android.text.TextUtils;
1614
import android.text.style.AlignmentSpan;
1715
import android.text.style.ParagraphStyle;
16+
import android.util.Log;
1817

1918
import com.swmansion.enriched.spans.EnrichedBlockQuoteSpan;
2019
import com.swmansion.enriched.spans.EnrichedBoldSpan;
@@ -735,7 +734,7 @@ private static BitmapDrawable prepareDrawableForImage(String src) {
735734
}
736735
} catch (Exception e) {
737736
// Failed to load file
738-
android.util.Log.e("EnrichedParser", "Failed to load image from path: " + cleanPath, e);
737+
Log.e("EnrichedParser", "Failed to load image from path: " + cleanPath, e);
739738
}
740739

741740
return drawable;

0 commit comments

Comments
 (0)