Work as per the bugs mentioned in ticket

[Jignesh-dimagi]

Product Description

No visible changes only app behavior changes when back pressed

Technical Summary

https://dimagi.atlassian.net/browse/CCCT-961

Feature Flag

This is bug fix

Safety Assurance

Safety story

Tested on staging variant

QA Plan

Test the flow while verifying the secondary phone

Labels and Review

• Do we need to enhance the manual QA test coverage ? If yes, the "QA Note" label is set correctly
• Does the PR introduce any major changes worth communicating ? If yes, the "Release Note" label is set and a "Release Note" is specified in PR description.
• Risk label is set correctly
• The set of people pinged as reviewers is appropriate for the level of risk of the change

[coderabbitai]

📝 Walkthrough

Walkthrough

The changes modify navigation behavior and back stack management in the ConnectID flow of the application. In the navigation graph XML, two actions from the connectid_message dialog now pop the back stack up to and including the connectid_signup_fragment, altering how the navigation stack is cleared during transitions. In both the ConnectIDSecondaryPhoneNumber and ConnectIdPhoneVerificationFragmnet classes, the app bar's back button handler is updated to check for a previous back stack entry before attempting to pop; if none exists, the activity is finished instead. Additionally, in the ConnectIdMessageFragment, the fragment is set to be non-cancelable, preventing dismissal via user actions such as tapping outside the dialog or pressing the back button.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant ConnectIdMessageFragment
    participant NavController
    participant Activity

    User->>ConnectIdMessageFragment: Attempts to dismiss dialog (e.g., tap outside/back)
    ConnectIdMessageFragment->>ConnectIdMessageFragment: setCancelable(false)
    Note right of ConnectIdMessageFragment: Dialog cannot be dismissed by user

    User->>AppBarBackButton: Presses back
    AppBarBackButton->>NavController: Check if previous back stack entry exists
    alt Back stack entry exists
        NavController->>NavController: popBackStack()
    else No back stack entry
        AppBarBackButton->>Activity: finish()
    end

Loading

Possibly related PRs

• Pm 7615 #3011: Modifies navigation actions in the same navigation graph XML file, involving related navigation components and flows.

Suggested labels

cross requested, skip-integration-tests

Suggested reviewers

• OrangeAndGreen

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 854a995 and 57a0d93.

📒 Files selected for processing (4)

• app/res/navigation/nav_graph_connectid.xml (2 hunks)
• app/src/org/commcare/fragments/connectId/ConnectIDSecondaryPhoneNumber.java (1 hunks)
• app/src/org/commcare/fragments/connectId/ConnectIdMessageFragment.java (1 hunks)
• app/src/org/commcare/fragments/connectId/ConnectIdPhoneVerificationFragmnet.java (1 hunks)

🔇 Additional comments (5)

app/src/org/commcare/fragments/connectId/ConnectIdMessageFragment.java (1)

61-61: Good addition: Prevents unintended dialog dismissal

Making the dialog non-cancelable prevents users from accidentally dismissing it by tapping outside or pressing the back button, which aligns with the bug fix described in CCCT-961.

app/src/org/commcare/fragments/connectId/ConnectIdPhoneVerificationFragmnet.java (1)

172-176: Good fix: Safely handles back navigation

This change properly handles the case when no previous back stack entry exists, preventing potential crashes or navigation issues when users press the back button. Now it correctly finishes the activity instead of attempting to navigate back to a non-existent destination.

app/src/org/commcare/fragments/connectId/ConnectIDSecondaryPhoneNumber.java (1)

116-120: Good fix: Consistent back navigation handling

This change mirrors the safe back navigation pattern implemented in ConnectIdPhoneVerificationFragmnet, ensuring consistent behavior across fragments. It properly checks for previous back stack entry availability before attempting navigation.

app/res/navigation/nav_graph_connectid.xml (2)

134-135: Good change: Improves navigation stack management

This navigation action now pops up to and including the signup fragment, which properly clears intermediate fragments from the back stack. This prevents navigation issues that could occur when users navigate back through the flow.

---

148-150: Good change: Consistent navigation stack management

Similar to the previous change, this action now also pops up to and including the signup fragment, maintaining consistency in how the back stack is managed during navigation from the message dialog to different destinations.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.