Fix race condition sitemap vs events (#3639)

Fixes #3637 Signed-off-by: Arne Seime <arne.seime@gmail.com>
openhab · Apr 11, 2024 · b6c3b63 · b6c3b63
1 parent 01dad85
commit b6c3b63
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/activity/PageConnectionHolderFragment.kt b/mobile/src/main/java/org/openhab/habdroid/ui/activity/PageConnectionHolderFragment.kt
@@ -423,12 +423,14 @@ class PageConnectionHolderFragment : Fragment(), CoroutineScope {
                         callback.onWidgetUpdated(url, updatedWidget)
                         return
                     }
+                } else if (lastWidgetList != null) {
+                    // Either we didn't find the widget (possibly because the server didn't give us invisible widgets),
+                    // or we couldn't update it because we couldn't trust the data, so reload the page.
+                    // If we didn't have a widget list yet, simply ignore the event - we probably got it while loading the list,
+                    // and if we have no list it's expected to be unable to find the widget.
+                    cancel()
+                    load()
                 }
-
-                // Either we didn't find the widget (possibly because the server didn't give us invisible widgets),
-                // or we couldn't update it because we couldn't trust the data, so reload the page
-                cancel()
-                load()
             } catch (e: JSONException) {
                 Log.w(TAG, "Could not parse SSE event ('$payload')", e)
             }