From 12d2999d59dcee9833d2d1ca3a83ef4951143fa0 Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Tue, 6 Jun 2023 12:09:23 +0300
Subject: [PATCH] Bug 1672252 - Ignore case when appending Juno Onboarding
 privacy link

Due to a difference of lowercase/uppercase letters in the message
shown in Juno Onboarding when displaying the privacy notice link
and having talkback enabled, the app crashed because it could not
find the starting index of the required text. This patch will not
add the link text if the description text does not contain the link
text.
---
 .../java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt
index 71b5f0db6a..1ad5ca6d7e 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt
@@ -171,7 +171,7 @@ private fun DescriptionText(
     description: String,
     linkTextState: LinkTextState?,
 ) {
-    if (linkTextState != null) {
+    if (linkTextState != null && description.contains(linkTextState.text, ignoreCase = true)) {
         LinkText(
             text = description,
             linkTextState = linkTextState,
@@ -198,7 +198,7 @@ private fun LinkText(
     linkTextState: LinkTextState,
 ) {
     val annotatedString = buildAnnotatedString {
-        val startIndex = text.indexOf(linkTextState.text)
+        val startIndex = text.indexOf(linkTextState.text, ignoreCase = true)
         val endIndex = startIndex + linkTextState.text.length
         append(text)
         addStyle(