Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix websocket stays subscribed after widget edit due to multiple instances #2753

Merged
merged 2 commits into from
Aug 3, 2022
Merged

Fix websocket stays subscribed after widget edit due to multiple instances #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d3dc72
Fix websocket stays subscribed after widget edit due to multiple inst…
jpelgrom Aug 3, 2022
a350ffc
Use companion object to prevent unnecessary updates
jpelgrom Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/src/main/java/io/homeassistant/companion/android/widgets/BaseWidgetProvider.kt
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.Bundle
import android.util.Log
import android.widget.RemoteViews
Expand Down Expand Up @@ -70,14 +71,20 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {

fun onScreenOn(context: Context) {
mainScope = CoroutineScope(Dispatchers.Main + Job())
if (entityUpdates == null) {
if (!isSubscribed()) {
mainScope.launch {
if (!integrationUseCase.isRegistered()) {
return@launch
}
updateAllWidgets(context)
if (getAllWidgetIds(context).isNotEmpty()) {
context.applicationContext.registerReceiver(
this@BaseWidgetProvider,
IntentFilter(Intent.ACTION_SCREEN_OFF)
)

entityUpdates = integrationUseCase.getEntityUpdates()
setSubscribed(entityUpdates != null)
entityUpdates?.collect {
onEntityStateChanged(context, it)
}
Expand All @@ -89,6 +96,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
private fun onScreenOff() {
mainScope.cancel()
entityUpdates = null
setSubscribed(false)
}

private suspend fun updateAllWidgets(
Expand Down Expand Up @@ -125,6 +133,8 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
}
}

abstract fun isSubscribed(): Boolean
abstract fun setSubscribed(subscribed: Boolean)
abstract fun getWidgetProvider(context: Context): ComponentName
abstract suspend fun getWidgetRemoteViews(context: Context, appWidgetId: Int, suggestedEntity: Entity<Map<String, Any>>? = null): RemoteViews
abstract suspend fun getAllWidgetIds(context: Context): List<Int>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/io/homeassistant/companion/android/widgets/entity/EntityWidget.kt
View file
Open in desktop
Expand Up @@ -42,11 +42,19 @@ class EntityWidget : BaseWidgetProvider() {
internal const val EXTRA_TEXT_COLOR = "EXTRA_TEXT_COLOR"

private data class ResolvedText(val text: CharSequence?, val exception: Boolean = false)

private var isSubscribed = false
}

@Inject
lateinit var staticWidgetDao: StaticWidgetDao

override fun isSubscribed(): Boolean = isSubscribed

override fun setSubscribed(subscribed: Boolean) {
isSubscribed = subscribed
}

override fun getWidgetProvider(context: Context): ComponentName =
ComponentName(context, EntityWidget::class.java)

Expand Down
8 changes: 8 additions & 0 deletions ...omeassistant/companion/android/widgets/media_player_controls/MediaPlayerControlsWidget.kt
View file
Open in desktop
Expand Up @@ -64,6 +64,8 @@ class MediaPlayerControlsWidget : BaseWidgetProvider() {
internal const val EXTRA_SHOW_SKIP = "EXTRA_INCLUDE_SKIP"
internal const val EXTRA_SHOW_SEEK = "EXTRA_INCLUDE_SEEK"
internal const val EXTRA_BACKGROUND_TYPE = "EXTRA_BACKGROUND_TYPE"

private var isSubscribed = false
}

@Inject
Expand All @@ -72,6 +74,12 @@ class MediaPlayerControlsWidget : BaseWidgetProvider() {
@Inject
lateinit var mediaPlayCtrlWidgetDao: MediaPlayerControlsWidgetDao

override fun isSubscribed(): Boolean = isSubscribed

override fun setSubscribed(subscribed: Boolean) {
isSubscribed = subscribed
}

override fun getWidgetProvider(context: Context): ComponentName =
ComponentName(context, MediaPlayerControlsWidget::class.java)

Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/io/homeassistant/companion/android/widgets/template/TemplateWidget.kt
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@ class TemplateWidget : BaseWidgetProvider() {
internal const val EXTRA_TEXT_SIZE = "EXTRA_TEXT_SIZE"
internal const val EXTRA_BACKGROUND_TYPE = "EXTRA_BACKGROUND_TYPE"
internal const val EXTRA_TEXT_COLOR = "EXTRA_TEXT_COLOR"

private var isSubscribed = false
}

@Inject
Expand All @@ -47,6 +49,12 @@ class TemplateWidget : BaseWidgetProvider() {
}
}

override fun isSubscribed(): Boolean = isSubscribed

override fun setSubscribed(subscribed: Boolean) {
isSubscribed = subscribed
}

override fun getWidgetProvider(context: Context): ComponentName =
ComponentName(context, TemplateWidget::class.java)

Expand Down