Connect Login fix #3279

OrangeAndGreen · 2025-07-30T15:41:19Z

Product Description

Fixes a bug where once the user logs in to an app from the Connect menu and log out, they won't be prompted to unlock when trying to login to any app from the login page.

Technical Summary

Consuming the intent that gets passed to DispatchActivity when launching an app from Connect.
We only want that flag to apply once, the next time Dispatch launches the LoginActivity.
On subsequent launches of LoginActivity after that, we don't want to indicate that it was launched from Connect.

Feature Flag

Connect

Safety Assurance

Safety story

Discovered this during local testing and tested the fix once applied.
This was introduced in a recent phase 4 PR and is not part of the latest released beta.

Automated test coverage

None

QA Plan

Test to run: Login to an app from the Connect menu, then logout. On the Login page, try to login into any installed app (both managed by PersonalID and not managed by PersonalID).
Managed by PersonalID: User should be required to unlock again before logging into the app
Not managed by PersonalID: Traditional login logic should apply (require user-entered password and use it to login)

…so it only applies once)

coderabbitai · 2025-07-30T15:42:53Z

📝 Walkthrough

Walkthrough

The private method getLaunchedFromConnect() in the DispatchActivity class was updated. Now, when this method reads the IS_LAUNCH_FROM_CONNECT boolean extra from the intent and finds it to be true, it also removes this extra from the intent. Previously, the method only retrieved the extra without modifying the intent. No public APIs or method signatures were changed.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Suggested labels

cross requested, skip-integration-tests

Suggested reviewers

shubham1g5

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

📜 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 f89fbd8 and df092e0.

📒 Files selected for processing (1)

app/src/org/commcare/activities/DispatchActivity.java (1 hunks)

🧰 Additional context used

🧠 Learnings (2)

📓 Common learnings

Learnt from: shubham1g5
PR: dimagi/commcare-android#0
File: :0-0
Timestamp: 2025-05-08T11:08:18.530Z
Learning: PR #3048 "Phase 4 Connect PR" introduces a substantial feature called "Connect" to the CommCare Android app, which includes messaging, job management, delivery tracking, payment processing, authentication flows, and learning modules. It follows a modern architecture using Navigation Components with three navigation graphs, segregated business logic in Manager classes, and proper database persistence.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3248
File: app/src/org/commcare/connect/MessageManager.java:0-0
Timestamp: 2025-07-29T14:54:47.940Z
Learning: User OrangeAndGreen organizes messaging-related changes into separate PRs rather than mixing them with other Connect work, which aligns with their preference for handling code issues in separate PRs when they are not directly related to the main changes.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3248
File: app/src/org/commcare/connect/network/ApiPersonalId.java:0-0
Timestamp: 2025-07-29T14:56:40.681Z
Learning: User OrangeAndGreen prefers to defer ApiPersonalId refactoring (specifically InputStream resource management improvements) to separate PRs rather than mixing them with Connect feature work, even when the code is already in master.

Learnt from: Jignesh-dimagi
PR: dimagi/commcare-android#0
File: :0-0
Timestamp: 2025-05-08T13:40:19.645Z
Learning: PR #3048 introduces a comprehensive messaging system in the Connect feature, implementing secure encryption using AES-GCM for message content, proper channel management with consent flows, and a well-designed UI separation between sent and received messages with real-time notification integration.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3248
File: app/src/org/commcare/fragments/connect/ConnectResultsSummaryListFragment.java:0-0
Timestamp: 2025-07-29T15:21:43.403Z
Learning: User OrangeAndGreen prefers to defer memory leak fixes (like storing Context as fields in adapters) to separate PRs rather than mixing them with Connect feature work, especially when similar issues exist elsewhere in the codebase.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3040
File: app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryFlagRecord.java:39-55
Timestamp: 2025-04-18T20:13:29.655Z
Learning: In the CommCare Android Connect feature, the JSON object passed to `ConnectJobDeliveryFlagRecord.fromJson()` method should never be null based on the implementation design.

Learnt from: pm-dimagi
PR: dimagi/commcare-android#2949
File: app/src/org/commcare/fragments/connectId/ConnectIdBiometricConfigFragment.java:235-236
Timestamp: 2025-02-04T21:29:29.594Z
Learning: The empty performPasswordUnlock method in ConnectIdBiometricConfigFragment is intentionally left empty and should not be flagged in reviews.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3248
File: app/src/org/commcare/fragments/connect/ConnectUnlockFragment.java:0-0
Timestamp: 2025-07-29T14:10:55.131Z
Learning: In ConnectUnlockFragment.java, opportunityId values are expected to always contain valid integer strings. Integer.parseInt() should be allowed to throw NumberFormatException if invalid data is encountered, following the fail-fast philosophy used throughout the Connect feature for data contract violations.

Learnt from: pm-dimagi
PR: dimagi/commcare-android#2949
File: app/src/org/commcare/fragments/connectId/ConnectIdBiometricConfigFragment.java:95-131
Timestamp: 2025-02-04T21:38:11.970Z
Learning: Biometric authentication security improvements were considered but skipped in PR #2949 as per user's request. The implementation remained with basic biometric authentication without additional security layers.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3108
File: app/src/org/commcare/activities/StandardHomeActivityUIController.java:0-0
Timestamp: 2025-06-20T13:21:20.908Z
Learning: User OrangeAndGreen prefers to handle code issues in separate PRs rather than immediately fixing them in the current PR when they are not directly related to the main changes.

Learnt from: Jignesh-dimagi
PR: dimagi/commcare-android#3093
File: app/res/navigation/nav_graph_connect_messaging.xml:41-45
Timestamp: 2025-05-09T10:57:41.073Z
Learning: In the CommCare Android codebase, the navigation graph for Connect messaging (`nav_graph_connect_messaging.xml`) intentionally uses `channel_id` as the argument name in the connectMessageFragment, despite using `channelId` in other parts of the same navigation graph. This naming difference is by design in the refactored code.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3037
File: app/src/org/commcare/connect/ConnectConstants.java:11-15
Timestamp: 2025-04-21T18:48:08.330Z
Learning: Request codes used for startActivityForResult should be unique throughout the application, even if they're used in different activities. COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE and STANDARD_HOME_CONNECT_LAUNCH_REQUEST_CODE should have different values.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3108
File: app/src/org/commcare/models/connect/ConnectLoginJobListModel.java:79-92
Timestamp: 2025-06-20T15:51:14.157Z
Learning: The ConnectLoginJobListModel class in app/src/org/commcare/models/connect/ConnectLoginJobListModel.java does not need to implement Parcelable interface as it is not passed between Android activities or fragments.

Learnt from: OrangeAndGreen
PR: dimagi/commcare-android#3121
File: app/src/org/commcare/fragments/SelectInstallModeFragment.java:201-205
Timestamp: 2025-05-22T14:26:41.341Z
Learning: In SelectInstallModeFragment.java, the showConnectErrorMessage method intentionally omits null checks because it's called at a specific point in the startup flow where UI is guaranteed to be loaded. It's designed to crash if activity or view is null to make potential issues immediately visible rather than hiding them with defensive programming.

app/src/org/commcare/activities/DispatchActivity.java (8)

Learnt from: shubham1g5
PR: dimagi/commcare-android#0
File: :0-0
Timestamp: 2025-05-08T11:08:18.530Z
Learning: PR #3048 "Phase 4 Connect PR" introduces a substantial feature called "Connect" to the CommCare Android app, which includes messaging, job management, delivery tracking, payment processing, authentication flows, and learning modules. It follows a modern architecture using Navigation Components with three navigation graphs, segregated business logic in Manager classes, and proper database persistence.

Learnt from: OrangeAndGreen
PR: #3040
File: app/src/org/commcare/android/database/connect/models/ConnectJobDeliveryFlagRecord.java:39-55
Timestamp: 2025-04-18T20:13:29.655Z
Learning: In the CommCare Android Connect feature, the JSON object passed to ConnectJobDeliveryFlagRecord.fromJson() method should never be null based on the implementation design.

Learnt from: Jignesh-dimagi
PR: #3093
File: app/res/navigation/nav_graph_connect_messaging.xml:41-45
Timestamp: 2025-05-09T10:57:41.073Z
Learning: In the CommCare Android codebase, the navigation graph for Connect messaging (nav_graph_connect_messaging.xml) intentionally uses channel_id as the argument name in the connectMessageFragment, despite using channelId in other parts of the same navigation graph. This naming difference is by design in the refactored code.

Learnt from: OrangeAndGreen
PR: #3108
File: app/src/org/commcare/models/connect/ConnectLoginJobListModel.java:79-92
Timestamp: 2025-06-20T15:51:14.157Z
Learning: The ConnectLoginJobListModel class in app/src/org/commcare/models/connect/ConnectLoginJobListModel.java does not need to implement Parcelable interface as it is not passed between Android activities or fragments.

Learnt from: OrangeAndGreen
PR: #3121
File: app/src/org/commcare/activities/CommCareSetupActivity.java:360-364
Timestamp: 2025-05-22T14:28:35.959Z
Learning: In CommCareSetupActivity.java, the call to installFragment.showConnectErrorMessage() after fragment transactions is intentionally unguarded with null checks. This follows the app's design pattern where critical error paths prefer immediate crashes over silent failures, making potential issues immediately visible during development rather than hiding them with defensive programming.

Learnt from: pm-dimagi
PR: #2847
File: app/src/org/commcare/android/database/connect/models/ConnectJobRecordV7.java:171-173
Timestamp: 2025-01-26T14:29:13.631Z
Learning: When migrating ConnectJobRecord from V4 to V7 using fromV4() method, isActive is intentionally defaulted to true for all migrated records.

Learnt from: OrangeAndGreen
PR: #3037
File: app/src/org/commcare/connect/ConnectConstants.java:11-15
Timestamp: 2025-04-21T18:48:08.330Z
Learning: Request codes used for startActivityForResult should be unique throughout the application, even if they're used in different activities. COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE and STANDARD_HOME_CONNECT_LAUNCH_REQUEST_CODE should have different values.

Learnt from: OrangeAndGreen
PR: #3108
File: app/src/org/commcare/fragments/connect/ConnectUnlockFragment.java:62-64
Timestamp: 2025-06-04T19:17:21.213Z
Learning: In ConnectUnlockFragment.java, the user prefers to let getArguments() potentially throw NullPointerException rather than adding null checks, as the arguments are required for proper navigation flow and their absence indicates a programming error that should fail fast.

🔇 Additional comments (1)

app/src/org/commcare/activities/DispatchActivity.java (1)

316-322: LGTM! Correctly implements one-time consumption of Connect launch flag.

The modification properly addresses the bug described in the PR objectives where the Connect launch flag was persisting across multiple login attempts. By removing the IS_LAUNCH_FROM_CONNECT extra from the intent after reading it (when true), this ensures the flag only applies once - specifically for the immediate LoginActivity launch - preventing it from affecting subsequent login flows.

This follows the same pattern used elsewhere in the class (like clearSessionEndpointAppId()) and aligns perfectly with the intended behavior described in the PR objectives.

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch dv/connect_login_fix

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

🪧 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.
- Explain this complex logic.
- 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 explain this code block.
- @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 explain its main purpose.
- @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate unit tests to generate unit tests for 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.

shubham1g5

Does it need to be hotixed ?

shubham1g5 · 2025-07-30T15:47:38Z

app/src/org/commcare/activities/DispatchActivity.java

    private boolean getLaunchedFromConnect() {
-        return getIntent().getBooleanExtra(IS_LAUNCH_FROM_CONNECT, false);
+        boolean launchedFromConnect = getIntent().getBooleanExtra(IS_LAUNCH_FROM_CONNECT, false);
+        if(launchedFromConnect) {


this is not needed as extras.remove doesn't do anything by itself if the key doesn;t exist.

Ah, nice. 0a29db0

OrangeAndGreen · 2025-07-30T16:23:39Z

No need for a hotfix, this change was introduced after the code freeze. Just to be safe, I just tested with the latest live beta (477060) and was prompted to unlock when trying to login to the next app (i.e. expected behavior).

Consuming intent flag for launched-from-connect in DispatchActivity (…

df092e0

…so it only applies once)

OrangeAndGreen requested a review from shubham1g5 July 30, 2025 15:41

shubham1g5 previously approved these changes Jul 30, 2025

View reviewed changes

Blanket calling removeExtra (safe even if the key isn't in the intent).

0a29db0

OrangeAndGreen dismissed shubham1g5’s stale review via 0a29db0 July 30, 2025 16:22

OrangeAndGreen requested a review from shubham1g5 July 30, 2025 16:23

shubham1g5 approved these changes Jul 31, 2025

View reviewed changes

shubham1g5 merged commit ee3cdae into feature/connect Jul 31, 2025
2 checks passed

shubham1g5 deleted the dv/connect_login_fix branch July 31, 2025 03:30

OrangeAndGreen added this to the 2.59 milestone Aug 11, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Connect Login fix #3279

Connect Login fix #3279

Uh oh!

OrangeAndGreen commented Jul 30, 2025

Uh oh!

coderabbitai bot commented Jul 30, 2025

Walkthrough

Estimated code review effort

Suggested labels

Suggested reviewers

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

shubham1g5 left a comment

Uh oh!

shubham1g5 Jul 30, 2025

Uh oh!

OrangeAndGreen Jul 30, 2025

Uh oh!

OrangeAndGreen commented Jul 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Connect Login fix #3279

Connect Login fix #3279

Uh oh!

Conversation

OrangeAndGreen commented Jul 30, 2025

Product Description

Technical Summary

Feature Flag

Safety Assurance

Safety story

Automated test coverage

QA Plan

Uh oh!

coderabbitai bot commented Jul 30, 2025

Walkthrough

Estimated code review effort

Suggested labels

Suggested reviewers

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

shubham1g5 left a comment

Choose a reason for hiding this comment

Uh oh!

shubham1g5 Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

OrangeAndGreen Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

OrangeAndGreen commented Jul 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

CodeRabbit Configuration File (`.coderabbit.yaml`)