mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-04 23:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save the last response so we can properly unsubscribe from events when the response ID has changed (#2781)

Browse source 
* Save the last response so we can properly unsubscribe from events when the ID has changed

* Apply code review suggestion

* Clean up last response after unsubscribing

* Only save the ID instead of the entire response
This commit is contained in:
Daniel Shokouhi 2022-08-13 17:38:50 -07:00 committed by GitHub
parent 5e11df521c
commit 280c325ca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/src/main/java/io/homeassistant/companion/android/common/data/websocket/impl/WebSocketRepositoryImpl.kt
View file

@ -87,6 +87,7 @@ class WebSocketRepositoryImpl @Inject constructor(
private val notificationMutex = Mutex()
private var notificationFlow: Flow<Map<String, Any>>? = null
private var notificationProducerScope: ProducerScope<Map<String, Any>>? = null
private var lastResponseID = mutableMapOf<String, Long?>()
override fun getConnectionState(): WebSocketState? = connectionState
@ -188,6 +189,7 @@ class WebSocketRepositoryImpl @Inject constructor(
"event_type" to eventType
)
)
lastResponseID[eventType] = response?.id
if (response == null) {
Log.e(TAG, "Unable to register for events of type $eventType")
return null
@ -201,9 +203,10 @@ class WebSocketRepositoryImpl @Inject constructor(
sendMessage(
mapOf(
"type" to "unsubscribe_events",
"subscription" to response.id
"subscription" to lastResponseID[eventType]!!
)
)
lastResponseID.remove(eventType)
}
eventSubscriptionProducerScope.remove(eventType)
eventSubscriptionFlow.remove(eventType)
@ -395,13 +398,14 @@ class WebSocketRepositoryImpl @Inject constructor(
delay(10000)
if (connect()) {
eventSubscriptionFlow.forEach { (eventType, _) ->
val resp = sendMessage(
val response = sendMessage(
mapOf(
"type" to "subscribe_events",
"event_type" to eventType
)
)
if (resp == null) {
lastResponseID[eventType] = response?.id
if (response == null) {
Log.e(TAG, "Issue re-registering event subscriptions")
}
}