Skip to content

fix(android): check pending notification before WebSocket connection guard #7048

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

Open
deepak0x wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(android): check pending notification before WebSocket connection guard #7048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions app/sagas/state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ const appHasComeBackToForeground = function* appHasComeBackToForeground() {
if (appRoot !== RootEnum.ROOT_INSIDE) {
return;
}
// Check for pending notification BEFORE connection check.
// This ensures notification taps during WebSocket reconnection are not lost.
// checkPendingNotification() dispatches deepLinkingOpen, and the deepLinking
// saga already waits for LOGIN.SUCCESS before navigating to the room.
checkPendingNotification().catch((e) => {
log('[state.js] Error checking pending notification:', e);
});
const isReady = yield isAuthAndConnected();
if (!isReady) {
return;
Expand All @@ -27,10 +34,6 @@ const appHasComeBackToForeground = function* appHasComeBackToForeground() {
const server = yield select(state => state.server.server);
yield localAuthenticate(server);
checkAndReopen();
// Check for pending notification when app comes to foreground (Android - notification tap while in background)
checkPendingNotification().catch((e) => {
log('[state.js] Error checking pending notification:', e);
});
return yield setUserPresenceOnline();
} catch (e) {
log(e);
Expand Down