PM-15976 - App crashes when non-english language user tries to create account (#4460)

phil-livefront · web-flow · commit d405a0d04b13 · 2024-12-13T16:24:35.000Z
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/Text.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/Text.kt
@@ -199,6 +199,12 @@ fun createClickableAnnotatedString(
                     mainString.lastIndexOf(text, ignoreCase = true)
                 }
             }
+
+            // Skip adding the link if the text to highlight is not found in the main string.
+            // This can happen if the highlighted text is correctly translated, but the main string
+            // is not yet translated, causing the startIndex to be -1.
+            if (startIndex < 0) continue
+
             val endIndex = startIndex + highlight.textToHighlight.length
             val link = LinkAnnotation.Clickable(
                 tag = highlight.textToHighlight,

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,12 @@ fun createClickableAnnotatedString(`
`199`	`199`	`mainString.lastIndexOf(text, ignoreCase = true)`
`200`	`200`	`}`
`201`	`201`	`}`
	`202`	`+`
	`203`	`+ // Skip adding the link if the text to highlight is not found in the main string.`
	`204`	`+ // This can happen if the highlighted text is correctly translated, but the main string`
	`205`	`+ // is not yet translated, causing the startIndex to be -1.`
	`206`	`+ if (startIndex < 0) continue`
	`207`	`+`
`202`	`208`	`val endIndex = startIndex + highlight.textToHighlight.length`
`203`	`209`	`val link = LinkAnnotation.Clickable(`
`204`	`210`	`tag = highlight.textToHighlight,`