tor-browser

commit 4df036cf42ecc025e76a1ec10ec6c5b634710545
parent 7e9a95716cce4f683794501f3c8dc62fba2c4e08
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date:   Wed, 29 Oct 2025 14:29:57 +0000

Bug 1997101 - Convert getRegistrableDomainIndexRange() to block body and widen to Spanned. r=android-reviewers,mcarare

warning: Return in function with expression body and without explicit return type.
Use block body '{...}' or add an explicit return type. This will become an error
in language version 2.4. See https://youtrack.jetbrains.com/issue/KTLC-288.

Differential Revision: https://phabricator.services.mozilla.com/D270512

Diffstat:
M
mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/CharSequence.kt
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/CharSequence.kt b/mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/CharSequence.kt
@@ -4,7 +4,7 @@
 
 package mozilla.components.support.ktx.kotlin
 
-import android.text.SpannableString
+import android.text.Spanned
 import mozilla.components.support.base.utils.MAX_URI_LENGTH
 import mozilla.components.support.ktx.util.RegistrableDomainSpan
 
@@ -20,12 +20,10 @@ fun CharSequence.trimmed(): CharSequence {
  * Extract the start and end indexes of the [RegistrableDomainSpan] marker if present
  * in this string representing an URL.
  */
-fun CharSequence.getRegistrableDomainIndexRange() = when (this is SpannableString) {
-    true -> {
-        val domainSpan = getSpans(0, length, RegistrableDomainSpan::class.java)
-            .firstOrNull() ?: return null
+fun CharSequence.getRegistrableDomainIndexRange(): Pair<Int, Int>? {
+    val spanned = this as? Spanned ?: return null
+    val domainSpan = spanned.getSpans(0, spanned.length, RegistrableDomainSpan::class.java)
+        .firstOrNull() ?: return null
 
-        getSpanStart(domainSpan) to getSpanEnd(domainSpan)
-    }
-    else -> null
+    return spanned.getSpanStart(domainSpan) to spanned.getSpanEnd(domainSpan)
 }