Master connectid merge #3037
Merged
Master connectid merge #3037
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
…ommcare-android into pm_connectid_merge # Conflicts: # app/src/org/commcare/connect/database/ConnectDatabaseHelper.java # app/src/org/commcare/connect/database/ConnectDatabaseUtils.java # app/src/org/commcare/google/services/analytics/AnalyticsParamValue.java # app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java
… from connectId fragments
…nto pm_connectid_merge # Conflicts: # app/res/values/strings.xml
Contributor
Author
|
@damagatchi retest this please |
Comment on lines
11
to
15
| public static final int CONNECTID_REQUEST_CODE = 1034; | ||
| public static final int LOGIN_CONNECT_LAUNCH_REQUEST_CODE = 1050; | ||
| public static final int COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE = 1051; | ||
| public static final int STANDARD_HOME_CONNECT_LAUNCH_REQUEST_CODE = 1051; | ||
| public static final int NETWORK_ACTIVITY_ID = 7000; |
Contributor
There was a problem hiding this comment.
CodeRabbit makes a good point here! Should these be different?
Contributor
Author
|
@damagatchi retest this please |
Comment on lines
232
to
242
| public void forgetUser(String reason) { | ||
|
|
||
| if (ConnectDatabaseHelper.dbExists(parentActivity)) { | ||
| FirebaseAnalyticsUtil.reportCccDeconfigure(reason); | ||
| } | ||
|
|
||
| ConnectUserDatabaseUtil.forgetUser(parentActivity); | ||
| ConnectIdActivity connectIdActivity = new ConnectIdActivity(); | ||
| connectIdActivity.reset(); | ||
| connectStatus = ConnectIdStatus.NotIntroduced; | ||
| } |
Contributor
There was a problem hiding this comment.
Agreed with coderabbit, this doesn't seem right. Since none of those fields are static I don't think there's any need to reset them here, since they'll be cleaned up when the activity gets popped
…nto pm_missing_code # Conflicts: # app/src/org/commcare/activities/StandardHomeActivity.java
OrangeAndGreen
approved these changes
Apr 22, 2025
shubham1g5
approved these changes
Apr 23, 2025
…nto pm_connectid_merge # Conflicts: # app/src/org/commcare/activities/StandardHomeActivity.java
…re-android into pm_missing_code
-update the missing code, and change the request code value
…re-android into master_connectid_merge # Conflicts: # app/src/org/commcare/activities/StandardHomeActivity.java
Contributor
Author
|
@damagatchi retest this please |
4 tasks
This was referenced Jul 22, 2025
Closed
Merged
This was referenced Jul 30, 2025
Merged
Merged
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.
Product Description
This Pr contains the phase 2 Connectid Code merged with master
Technical Summary
#2949
https://dimagi.atlassian.net/browse/CCCT-956
cross-request: dimagi/commcare-core#1455
Feature Flag
Connect id COde
Safety Assurance
Safety story
Automated test coverage
QA Plan
Labels and Review