Skip to content

Makes DialogCollator handle redundant scheduleUpdate calls. #1298

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

Merged
merged 2 commits into from
Apr 30, 2025
Merged

Makes DialogCollator handle redundant scheduleUpdate calls. #1298

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
98f4bb6
Prepare release v1.16.1
rjrjr Apr 30, 2025
c30044e
Makes `DialogCollator` handle redundant `scheduleUpdate` calls.
rjrjr Apr 30, 2025
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android.useAndroidX=true
systemProp.org.gradle.internal.publish.checksums.insecure=true

GROUP=com.squareup.workflow1
VERSION_NAME=1.16.0
VERSION_NAME=1.16.1-SNAPSHOT

POM_DESCRIPTION=Square Workflow

Expand Down
7 changes: 5 additions & 2 deletions ...flow-ui/core-android/src/main/java/com/squareup/workflow1/ui/navigation/DialogCollator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,13 @@ internal class DialogCollator {
onSessionsUpdated: (List<DialogSession>) -> Unit
) {
check(expectedUpdates > 0) {
"Each update() call must be preceded by a call to ViewEnvironment.establishDialogCollator, " +
"but expectedUpdates is $expectedUpdates"
"Each scheduleUpdates() call must be preceded by a call to" +
" ViewEnvironment.establishDialogCollator, but expectedUpdates is $expectedUpdates"
}

// Under nested ComposeView instances we may get redundant updates from the
// same caller. Just throw away the upstream ones.
this.allUpdates.removeAll { it.id == id }
this.allUpdates.add(IdAndUpdates(id, updates, onSessionsUpdated))
if (--expectedUpdates == 0) doUpdate()
}
Expand Down
Loading