Skip to content

Commit e2c5007

Browse files
committed
Got rid of stripUrl
Signed-off-by: Arnau Mora <arnyminerz@proton.me>
1 parent baa1000 commit e2c5007

File tree

3 files changed

+1
-37
lines changed

3 files changed

+1
-37
lines changed

app/src/main/java/at/bitfire/icsdroid/UriUtils.kt

-21
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,4 @@ object UriUtils {
3232

3333
return false
3434
}
35-
36-
/**
37-
* Strips the URL from a string. For example, the following string:
38-
* ```
39-
* "This is a URL: https://example.com"
40-
* ```
41-
* will return:
42-
* ```
43-
* "https://example.com"
44-
* ```
45-
* _Quotes are not included_
46-
* @return The URL found in the string
47-
* @throws IllegalArgumentException if no URL is found in the string
48-
*/
49-
fun String.stripUrl(): String? {
50-
// schema host port path query
51-
return ("([a-zA-Z]+://)" + "([\\w\\-.]+)" + "(:\\d+)?" + "([\\w\\-./]+)?" + "(\\?[\\w.&=*]*)?")
52-
.toRegex()
53-
.find(this)
54-
?.value
55-
}
5635
}

app/src/main/java/at/bitfire/icsdroid/ui/views/AddCalendarActivity.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.compose.ui.platform.LocalContext
2121
import androidx.core.view.WindowCompat
2222
import at.bitfire.icsdroid.HttpClient
2323
import at.bitfire.icsdroid.R
24-
import at.bitfire.icsdroid.UriUtils.stripUrl
2524
import at.bitfire.icsdroid.calendar.LocalCalendar
2625
import at.bitfire.icsdroid.model.CreateSubscriptionModel
2726
import at.bitfire.icsdroid.model.CredentialsModel
@@ -88,7 +87,7 @@ class AddCalendarActivity : AppCompatActivity() {
8887
try {
8988
(data ?: getStringExtra(Intent.EXTRA_TEXT))
9089
?.toString()
91-
?.stripUrl()
90+
?.trim()
9291
?.let(subscriptionSettingsModel::setUrl)
9392
?.also {
9493
createSubscriptionModel.checkUrlIntroductionPage(

app/src/test/kotlin/at/bitfire/icsdroid/UrlUtilsTest.kt

-14
This file was deleted.

0 commit comments

Comments
 (0)