mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-06 17:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure thread safety around NsdManager. (#664)

Browse source
This commit is contained in:
Justin Bassett 2020-07-13 09:09:56 -04:00 committed by GitHub
parent 397641cd47
commit cc70c1a6ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import android.net.nsd.NsdManager
import android.net.nsd.NsdServiceInfo
import android.util.Log
import java.net.URL
import java.util.concurrent.locks.ReentrantLock
import okio.internal.commonToUtf8String
class HomeAssistantSearcher constructor(
@ -15,6 +16,8 @@ class HomeAssistantSearcher constructor(
private const val SERVICE_TYPE = "_home-assistant._tcp"
private const val TAG = "HomeAssistantSearcher"
private val lock = ReentrantLock()
}
private var isSearching = false
@ -40,10 +43,12 @@ class HomeAssistantSearcher constructor(
override fun onServiceFound(foundService: NsdServiceInfo) {
Log.i(TAG, "Service discovery found HA: $foundService")
lock.lock()
nsdManager.resolveService(foundService, object : NsdManager.ResolveListener {
override fun onResolveFailed(failedService: NsdServiceInfo?, errorCode: Int) {
discoveryView.onScanError()
// discoveryView.onScanError()
Log.w(TAG, "Failed to resolve service: $failedService, error: $errorCode")
lock.unlock()
}
override fun onServiceResolved(resolvedService: NsdServiceInfo?) {
@ -61,6 +66,7 @@ class HomeAssistantSearcher constructor(
)
}
}
lock.unlock()
}
})
}