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

Handle empty array/invalid URL during discovery (#3747)

Browse source
This commit is contained in:
Joris Pelgröm 2023-08-01 18:57:05 +02:00 committed by GitHub
parent 0be1749f4c
commit 91fdba5706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/io/homeassistant/companion/android/onboarding/discovery/HomeAssistantSearcher.kt
View file

@ -8,6 +8,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import io.homeassistant.companion.android.common.data.HomeAssistantVersion
import okio.internal.commonToUtf8String
import java.net.MalformedURLException
import java.net.URL
import java.util.concurrent.locks.ReentrantLock
@ -95,15 +96,18 @@ class HomeAssistantSearcher constructor(
resolvedService?.let {
val baseUrl = it.attributes["base_url"]
val versionAttr = it.attributes["version"]
val version = versionAttr?.let { ver -> HomeAssistantVersion.fromString(ver.commonToUtf8String()) }
if (baseUrl != null && version != null) {
onInstanceFound(
HomeAssistantInstance(
val version = if (versionAttr?.isNotEmpty() == true) HomeAssistantVersion.fromString(versionAttr.commonToUtf8String()) else null
if (baseUrl?.isNotEmpty() == true && version != null) {
try {
val instance = HomeAssistantInstance(
it.serviceName,
URL(baseUrl.commonToUtf8String()),
version
)
)
onInstanceFound(instance)
} catch (e: MalformedURLException) {
Log.w(TAG, "Failed to create instance: ${baseUrl.commonToUtf8String()}")
}
}
}
lock.unlock()