mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 02:45:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash on empty URL strings (#3846)

Browse source 
defensive url parsing
This commit is contained in:
Guillermo Orellana 2023-09-06 14:32:45 +02:00 committed by GitHub
parent 54d59828bc
commit 6c54aa84b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/src/main/java/io/homeassistant/companion/android/database/server/ServerConnectionInfo.kt
View file

@ -8,7 +8,6 @@ import com.fasterxml.jackson.core.JsonProcessingException
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import io.homeassistant.companion.android.common.data.wifi.WifiHelper
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import java.net.URL
@ -43,34 +42,34 @@ data class ServerConnectionInfo(
return arrayOf()
}
val retVal = ArrayList<URL>()
val retVal = mutableListOf<URL?>()
// If we are local then add the local URL in the first position, otherwise no reason to try
if (isInternal() || prioritizeInternal) {
internalUrl?.let {
retVal.add(
it.toHttpUrl().newBuilder()
.addPathSegments("api/webhook/$webhookId")
.build()
.toUrl()
it.toHttpUrlOrNull()?.newBuilder()
?.addPathSegments("api/webhook/$webhookId")
?.build()
?.toUrl()
)
}
}
cloudhookUrl?.let {
retVal.add(it.toHttpUrl().toUrl())
retVal.add(it.toHttpUrlOrNull()?.toUrl())
}
externalUrl.let {
retVal.add(
it.toHttpUrl().newBuilder()
.addPathSegments("api/webhook/$webhookId")
.build()
.toUrl()
it.toHttpUrlOrNull()?.newBuilder()
?.addPathSegments("api/webhook/$webhookId")
?.build()
?.toUrl()
)
}
return retVal.toTypedArray()
return retVal.filterNotNull().toTypedArray()
}
fun getUrl(isInternal: Boolean? = null, force: Boolean = false): URL? {