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

Potential fix for #3637 / race condition sitemap vs events #3639

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Potential fix for #3637 / race condition sitemap vs events #3639

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f3c831
Potential fix for #3637 - handle race condition between sitemap loadi…
seime Apr 10, 2024
c443cc2
Updated according to review
seime Apr 10, 2024
042a971
Updated according to review
seime Apr 10, 2024
2799ca9
Manually fixing space
seime Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions mobile/src/main/java/org/openhab/habdroid/ui/activity/PageConnectionHolderFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,15 @@ class PageConnectionHolderFragment : Fragment(), CoroutineScope {
}
}
seime marked this conversation as resolved.
Show resolved Hide resolved

// 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()
if(lastWidgetList == null) {
Log.d(TAG, "Ignoring update event as lastWidgetList is null - sitemap not fully loaded?");
return;
} else {
// 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)
}
Expand Down