From ba2d005b2afd3f1c669acdd38812ee130063a3bf Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 24 Mar 2023 15:49:09 -0400 Subject: [PATCH] Fix search result styling for formatting and query highlighting. --- .../org/thoughtcrime/securesms/search/SearchRepository.java | 2 +- .../main/java/org/thoughtcrime/securesms/util/SearchUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java index ddc45817ec..0df0b20b32 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java @@ -321,7 +321,7 @@ public class SearchRepository { BodyRangeList.Builder builder = BodyRangeList.newBuilder(); for (BodyRangeList.BodyRange range : bodyRanges.getRangesList()) { int adjustedStart = range.getStart() - startIndex + startOffset; - if (adjustedStart >= 0 && adjustedStart + range.getLength() <= cleanSnippet.length()) { + if (adjustedStart >= 0 && adjustedStart + range.getLength() <= bodySnippet.length()) { builder.addRanges(range.toBuilder().setStart(adjustedStart).build()); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java index ee2574c7e4..9f8e7b21d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java @@ -70,12 +70,12 @@ public class SearchUtil { throw new InvalidParameterException("match mode must be STRICT or MATCH_ALL: " + matchMode); } - CharacterStyle[] styles = styleFactory.createStyles(); for (Pair range : ranges) { + CharacterStyle[] styles = styleFactory.createStyles(); for (CharacterStyle style : styles) { List annotations = SpoilerAnnotation.getSpoilerAnnotations(spanned, range.first(), range.second()); if (annotations.isEmpty()) { - spanned.setSpan(style, range.first(), range.second(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); + spanned.setSpan(style, range.first(), range.second(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } } }