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

Update shortcut tile add/remove + destroy handling (#3974)

Browse source 
- Updates the shortcut tile's handling of add/remove event + destroying the service, just like the camera tile, to prevent the service scope being cancelled while the app is still storing tile added/removed
 - (this service already didn't overwrite existing tile data when onTileAddEvent was called again)
This commit is contained in:
Joris Pelgröm 2023-10-28 17:14:55 +02:00 committed by GitHub
parent d143da9ea3
commit 73c928d6e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wear/src/main/java/io/homeassistant/companion/android/tiles/ShortcutsTile.kt
View file

@ -42,7 +42,8 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.guava.future import kotlinx.coroutines.guava.future
import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import java.nio.ByteBuffer import java.nio.ByteBuffer
import javax.inject.Inject import javax.inject.Inject
import kotlin.math.min import kotlin.math.min
@ -146,8 +147,8 @@ class ShortcutsTile : TileService() {
.build() .build()
} }
override fun onTileAddEvent(requestParams: EventBuilders.TileAddEvent) { override fun onTileAddEvent(requestParams: EventBuilders.TileAddEvent): Unit = runBlocking {
serviceScope.launch { withContext(Dispatchers.IO) {
/** /**
* When the app is updated from an older version (which only supported a single Shortcut Tile), * When the app is updated from an older version (which only supported a single Shortcut Tile),
* and the user is adding a new Shortcuts Tile, we can't tell for sure if it's the 1st or 2nd Tile. * and the user is adding a new Shortcuts Tile, we can't tell for sure if it's the 1st or 2nd Tile.
@ -167,8 +168,8 @@ class ShortcutsTile : TileService() {
} }
} }
override fun onTileRemoveEvent(requestParams: EventBuilders.TileRemoveEvent) { override fun onTileRemoveEvent(requestParams: EventBuilders.TileRemoveEvent): Unit = runBlocking {
serviceScope.launch { withContext(Dispatchers.IO) {
wearPrefsRepository.removeTileShortcuts(requestParams.tileId) wearPrefsRepository.removeTileShortcuts(requestParams.tileId)
} }
} }