Skip to content

fix(auth): handle system back press in phone auth flow #2418

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

Closed
just1and0 wants to merge 2 commits into from
Closed

fix(auth): handle system back press in phone auth flow #2418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
563cb21
fix(auth): handle system back press in phone auth flow
just1and0 Jul 23, 2026
16be592
fix(auth): handle system back press in phone auth flow
just1and0 Jul 23, 2026
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
4 changes: 4 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/screens/phone/PhoneAuthScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package com.firebase.ui.auth.ui.screens.phone

import android.content.Context
import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.activity.compose.LocalActivity
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand Down Expand Up @@ -340,6 +341,8 @@ fun PhoneAuthScreen(
}
)

BackHandler { onCancel() }

@gemini-code-assist gemini-code-assist Bot Jul 23, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

To prevent race conditions or inconsistent states, the back button should be disabled while an authentication operation is in progress (isLoading is true). If the user is allowed to navigate back or cancel while a network request is active, the background task might still succeed or fail later, leading to unexpected state transitions (e.g., suddenly logging in the user or showing an error dialog after they have already navigated away).

Suggested change
BackHandler { onCancel() }
BackHandler(enabled = !isLoading) { onCancel() }


if (content != null) {
content(state)
} else {
Expand Down Expand Up @@ -372,6 +375,7 @@ private fun DefaultPhoneAuthContent(
}

PhoneAuthStep.EnterVerificationCode -> {
BackHandler { state.onChangeNumberClick() }

@gemini-code-assist gemini-code-assist Bot Jul 23, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Similarly, the back handler on the verification code screen should be disabled while a verification request is in progress (state.isLoading is true). This prevents the user from returning to the phone number entry screen while the code is actively being verified, which could otherwise lead to a race condition if the verification completes successfully in the background.

Suggested change
BackHandler { state.onChangeNumberClick() }
BackHandler(enabled = !state.isLoading) { state.onChangeNumberClick() }

EnterVerificationCodeUI(
configuration = configuration,
isLoading = state.isLoading,
Expand Down
Loading