Enable better file uploading on Android #13132
Merged
+47
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
Contributor
✅ PR preview is ready!
|
lukasmasuch
added
security-assessment-completed
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug where file uploads fail on Android due to WebSocket disconnection when selecting files. The solution implements a request queue that stores file URL requests made while disconnected and processes them when the connection is re-established.
Key Changes
- Adds a queue mechanism to handle file URL requests during WebSocket disconnections
- Processes queued requests automatically when connection is restored
- Updates tests to verify queuing and processing behavior
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| frontend/app/src/App.tsx | Implements pendingFileURLRequests queue, modifies requestFileURLs to queue when disconnected, adds processPendingFileURLRequests method to process queue on reconnection |
| frontend/app/src/App.test.tsx | Updates existing test description and adds new test case for verifying queued requests are processed on reconnection |
Comments suppressed due to low confidence (1)
frontend/app/src/App.tsx:817
- The
pendingFileURLRequestsqueue is never cleared when the connection is permanently lost. While this may not be a significant issue in production (as the page would typically be refreshed), it's good practice to clear the queue on permanent disconnection to prevent unbounded memory growth.
Recommended fix: Clear the queue when transitioning to DISCONNECTED_FOREVER state in handleConnectionStateChanged:
} else {
// If we're starting from the CONNECTED state and going to any other
// state, we must be disconnecting.
if (this.state.connectionState === ConnectionState.CONNECTED) {
this.hostCommunicationMgr.sendMessageToHost({
type: "WEBSOCKET_DISCONNECTED",
attemptingToReconnect:
newState !== ConnectionState.DISCONNECTED_FOREVER,
})
}
// Clear pending file requests on permanent disconnection
if (newState === ConnectionState.DISCONNECTED_FOREVER) {
this.pendingFileURLRequests = []
}
if (this.sessionInfo.isSet) {
this.sessionInfo.disconnect()
}
} } else {
// If we're starting from the CONNECTED state and going to any other
// state, we must be disconnecting.
if (this.state.connectionState === ConnectionState.CONNECTED) {
this.hostCommunicationMgr.sendMessageToHost({
type: "WEBSOCKET_DISCONNECTED",
attemptingToReconnect:
newState !== ConnectionState.DISCONNECTED_FOREVER,
})
}
if (this.sessionInfo.isSet) {
this.sessionInfo.disconnect()
}
}
lukasmasuch
commented
Nov 26, 2025
| * See: https://github.com/streamlit/streamlit/issues/11419 | ||
| */ | ||
| export const WEBSOCKET_TIMEOUT_MS = 15 * 1000 | ||
| export const WEBSOCKET_TIMEOUT_MS = isAndroidDevice() ? 60 * 1000 : 15 * 1000 |
Collaborator
Author
There was a problem hiding this comment.
60 seconds should be a lot less annoying for uploading files compared to 15 seconds timeout.
lukasmasuch
changed the title
sfc-gh-lwilby
approved these changes
Nov 26, 2025
Collaborator
sfc-gh-lwilby
left a comment
sfc-gh-lwilby
left a comment
There was a problem hiding this comment.
This looks like a good mitigation. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Use a higher websocket timeout on Android and better error message to improve file uploading on Android. Currently, this doesn't work if the user needs more than 15 seconds to choose a file since the websocket connection disconnects.
From my research, a proper fix for this would be quite complicate.
I manually verified on Android that this change works and makes it a lot more convenient to choose files.
GitHub Issue Link (if applicable)
Testing Plan
Contribution License Agreement
By submitting this pull request you agree that all contributions to this project are made under the Apache 2.0 license.