lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:MM2-0/Kvaesitso

Browse Source
This commit is contained in:
MM20 2025-02-10 20:11:28 +01:00
commit bbb50e6e5e
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
View File

@ -74,7 +74,9 @@ class LocationSearchSettings internal constructor(
fun setOverpassUrl(overpassUrl: String?) { fun setOverpassUrl(overpassUrl: String?) {
var url = overpassUrl var url = overpassUrl
if (url != null) { if (url.isNullOrBlank()) {
url = DefaultOverpassUrl
} else {
if (!url.startsWith("http://") && !url.startsWith("https://")) { if (!url.startsWith("http://") && !url.startsWith("https://")) {
url = "https://$url" url = "https://$url"
} }
@ -95,7 +97,9 @@ class LocationSearchSettings internal constructor(
fun setTileServer(tileServer: String?) { fun setTileServer(tileServer: String?) {
var url = tileServer var url = tileServer
if (url != null) { if (url.isNullOrBlank()) {
url = DefaultTileServerUrl
} else {
if (!url.startsWith("http://") && !url.startsWith("https://")) { if (!url.startsWith("http://") && !url.startsWith("https://")) {
url = "https://$url" url = "https://$url"
} }
@ -136,8 +140,8 @@ class LocationSearchSettings internal constructor(
} }
companion object { companion object {
const val DefaultTileServerUrl = "https://tile.openstreetmap.org" const val DefaultTileServerUrl = "https://tile.openstreetmap.org/\${z}/\${x}/\${y}.png"
const val DefaultOverpassUrl = "https://overpass-api.de/" const val DefaultOverpassUrl = "https://overpass-api.de"
} }
} }