Skip to content

PM-renamed everything from connectid to personalid #3114

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

Merged
pm-dimagi merged 2 commits into from
May 17, 2025
Merged

PM-renamed everything from connectid to personalid #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20f24a
-renamed everything from connectid to personalid
pm-dimagi May 17, 2025
20f29ad
-coderabbit sugestions
pm-dimagi May 17, 2025
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
2 changes: 1 addition & 1 deletion app/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</intent-filter>
</activity>
<activity
android:name="org.commcare.activities.connect.ConnectIdActivity"
android:name="org.commcare.activities.connect.PersonalIdActivity"
android:screenOrientation="portrait"/>
<activity
android:label="@string/application_name"
Expand Down
2 changes: 1 addition & 1 deletion app/res/layout/screen_personalid_name.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"
android:orientation="vertical"
tools:context="org.commcare.fragments.connectId.PersonalIdNameFragment">
tools:context="org.commcare.fragments.personalId.PersonalIdNameFragment">

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/res/layout/screen_personalid_phoneno.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
tools:context="org.commcare.fragments.connectId.PersonalIdPhoneFragment">
tools:context="org.commcare.fragments.personalId.PersonalIdPhoneFragment">

<LinearLayout
android:layout_width="match_parent"
Expand Down
12 changes: 6 additions & 6 deletions app/res/navigation/nav_graph_personalid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<fragment
android:id="@+id/personalid_biometric_config"
android:name="org.commcare.fragments.connectId.PersonalIdBiometricConfigFragment"
android:name="org.commcare.fragments.personalId.PersonalIdBiometricConfigFragment"
android:label="fragment_personalid_biometric_config"
tools:layout="@layout/screen_personalid_verify">
<action
Expand All @@ -22,7 +22,7 @@

<fragment
android:id="@+id/personalid_otp_page"
android:name="org.commcare.fragments.connectId.PersonalIdPhoneVerificationFragment"
android:name="org.commcare.fragments.personalId.PersonalIdPhoneVerificationFragment"
android:label="fragment_personalid_phone_verify"
tools:layout="@layout/screen_personalid_phone_verify">
<action
Expand All @@ -43,7 +43,7 @@

<dialog
android:id="@+id/personalid_message_display"
android:name="org.commcare.fragments.connectId.PersonalIdMessageFragment"
android:name="org.commcare.fragments.personalId.PersonalIdMessageFragment"
android:label="fragment_personalid_message"
tools:layout="@layout/screen_personalid_message">
<action
Expand Down Expand Up @@ -96,7 +96,7 @@

<fragment
android:id="@+id/personalid_backup_code"
android:name="org.commcare.fragments.connectId.PersonalIdBackupCodeFragment"
android:name="org.commcare.fragments.personalId.PersonalIdBackupCodeFragment"
android:label="fragment_personalid_pin"
tools:layout="@layout/fragment_recovery_code">
<action
Expand All @@ -123,7 +123,7 @@

<fragment
android:id="@+id/personalid_phone_fragment"
android:name="org.commcare.fragments.connectId.PersonalIdPhoneFragment"
android:name="org.commcare.fragments.personalId.PersonalIdPhoneFragment"
android:label="fragment_personalid_phone_fragment"
tools:layout="@layout/screen_personalid_phoneno">
<action
Expand All @@ -139,7 +139,7 @@

<fragment
android:id="@+id/personalid_name"
android:name="org.commcare.fragments.connectId.PersonalIdNameFragment"
android:name="org.commcare.fragments.personalId.PersonalIdNameFragment"
android:label="personalid_name"
tools:layout="@layout/screen_personalid_name">

Expand Down
34 changes: 17 additions & 17 deletions app/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,22 +403,22 @@
<string name="fcm_notification">FCM Notification</string>
<string name="fcm_default_notification_channel">notification-channel-push-notifications</string>
<string name="app_select_message" cc:translatable="true">Select an app:</string>
<string name="connect_id_enabled">ConnectID Enabled</string>
<string name="login_password_by_connect">Via ConnectID (or press here)</string>
<string name="connect_id_enabled">PersonalID Enabled</string>
<string name="login_password_by_connect">Via PersonalID (or press here)</string>
<string name="login_welcome_connect_signed_in">Welcome %s!</string>
<string name="login_connect_secondary_phone_message">Please confirm your secondary phone by %s to keep using ConnectID.</string>
<string name="login_connect_secondary_phone_message">Please confirm your secondary phone by %s to keep using PersonalID.</string>
<string name="choice_or">___________ OR ___________</string>
<string name="busy_message">We are still busy processing your previous request. Please try again in some time.</string>

<string name="connect_button_logged_in">Go to Connect menu</string>

<!-- ConnectID strings -->
<!-- PersonalID strings -->
<string name="connect_registration_title">Get Started with PersonalID</string>
<string name="connect_registration_subtitle">Enter your Phone Number</string>
<string name="connect_signup">Signup</string>
<string name="connect_recover">Recover</string>
<string name="connect_registration_have_account">Already have\nan Account?</string>
<string name="connect_recover_no_account">Don\'t have\nConnectID?</string>
<string name="connect_recover_no_account">Don\'t have\nPersonalID?</string>

<string name="connect_consent_message_1">I have read and agree to Dimagi\'s <a href="https://www.dimagi.com/terms/latest/privacy/">Privacy Policy</a>, <a href="https://www.dimagi.com/terms/latest/tos/">Terms of Service</a>, <a href="https://www.dimagi.com/terms/latest/ba/">Business Agreement</a> and <a href="https://www.dimagi.com/terms/latest/aup/">Acceptable Use Policy</a>.</string>
<string name="connect_phone_page_title">Phone Number</string>
Expand Down Expand Up @@ -469,12 +469,12 @@

<string name="connect_pin_confirm_message">You entered the wrong Code too many times, you will have to configure the code again.\n On the next screen, we\'ll redirect you to the configure code page.</string>
<string name="connect_pin_verify_forgot">Forgot Code</string>
<string name="connect_recovery_title">ConnectID Recovery</string>
<string name="connect_recovery_title">PersonalID Recovery</string>



<string name="connect_recovery_decision_new">Choose a step below</string>
<string name="connect_recovery_button_new">Create New ConnectID Account</string>
<string name="connect_recovery_button_new">Create New PersonalID Account</string>
<string name="connect_recovery_button_recover">Recover Existing Account</string>
<string name="connect_recovery_decision_phone">Please enter the primary phone number you entered with your account</string>

Expand All @@ -489,7 +489,7 @@
<string name="connect_recovery_success_message">You have successfully recovered your account and can now resume using your ConnectID.</string>
<string name="connect_recovery_success_button">OK</string>
<string name="connect_recovery_failure">Error finalizing recovery, please try again later</string>
<string name="connect_unlock_title">Unlock ConnectID</string>
<string name="connect_unlock_title">Unlock PersonalID</string>
<string name="connect_unlock_message">Please unlock to continue</string>
<string name="connect_unlock_button_pin">Unlock with PIN</string>
<string name="connect_unlock_button_password">Unlock with Password</string>
Expand All @@ -507,15 +507,15 @@
<string name="connect_register_name">Name</string>
<string name="connect_register_success_title">Account Created</string>

<string name="connect_register_success_message">Your ConnectID account has been successfully created and is now ready for you to use!</string>
<string name="connect_register_success_message">Your PersonalID account has been successfully created and is now ready for you to use!</string>
<string name="connect_register_success_button">OK</string>
<string name="connect_verify_title">Unlock Options</string>
<string name="connect_verify_message">Please configure a method below to unlock both your device and PersonalId account</string>
<string name="connect_verify_use_fingerprint_long">Use Fingerprint to Connect</string>
<string name="connect_verify_fingerprint_configured">Your fingerprint has already been configured and will be used to unlock ConnectID.</string>
<string name="connect_verify_fingerprint_configured">Your fingerprint has already been configured and will be used to unlock PersonalID.</string>
<string name="connect_verify_configure_fingerprint">Configure Fingerprint</string>
<string name="connect_verify_use_pin_long">Use PIN to Connect</string>
<string name="connect_verify_pin_configured">Your PIN has already been configured and will be used to unlock ConnectID.</string>
<string name="connect_verify_pin_configured">Your PIN has already been configured and will be used to unlock PersonalID.</string>
<string name="connect_verify_configuration_failed">Configuration failed, please try again. %s</string>

<string name="connect_verify_configure_pin">Configure PIN</string>
Expand Down Expand Up @@ -642,9 +642,9 @@
<string name="login_unlink_connectid_message">I see you logged in with your password although ConnectID was configured for auto-login. Would you like to sever this login from ConnectID?</string>
<string name="login_link_connectid_yes">Yes</string>
<string name="login_link_connectid_no">No</string>
<string name="login_menu_connect_sign_in">Sign up for ConnectID</string>
<string name="login_menu_connect_sign_in">Sign up for PersonalID</string>

<string name="login_menu_connect_forget">Forget ConnectID user</string>
<string name="login_menu_connect_forget">Forget PersonalID user</string>

<string name="connect_app_install_unknown_error">App install failed due to an unknown error</string>
<string name="connect_app_installed">App installed</string>
Expand Down Expand Up @@ -801,7 +801,7 @@
<string name="connect_unlock_pin_title">Unlock via PIN</string>
<string name="connect_unlock_pin_message">Enter your PIN to continue</string>
<string name="connect_register_title">Create Account</string>
<string name="connect_register_title2">ConnectID</string>
<string name="connect_register_title2">PersonalID</string>
<string name="connect_register_dob">Date of Birth (YYYY-MM-DD)</string>
<string name="connect_register_phone">Phone Number (+18887776666)</string>
<string name="connect_register_phone_alt">Alternate Phone Number</string>
Expand Down Expand Up @@ -875,7 +875,7 @@
<string name="connect_results_summary_view_deliveries">View Deliveries</string>
<string name="connect_results_summary_payments_title">Payments</string>
<string name="connect_results_summary_view_payments">View Payments</string>
<string name="login_menu_connect_sign_out">Sign out of ConnectID</string>
<string name="login_menu_connect_sign_out">Sign out of PersonalID</string>
<string name="connect_home_progress_today">Today\'s Visits: %d</string>
<string name="suspended">Suspended</string>
<string name="select_phone_number">Select Phone Number</string>
Expand All @@ -884,8 +884,8 @@
<string name="learn_more">Learn More</string>
<string name="click_to_sync">Click to sync progress</string>
<string name="connect_commcare_app">CommCare App</string>
<string name="login_button_connect">Unlock ConnectID</string>
<string name="login_welcome_connect_signed_out">Unlock ConnectID first and then enter your app.</string>
<string name="login_button_connect">Unlock PersonalID</string>
<string name="login_welcome_connect_signed_out">Unlock PersonalID first and then enter your app.</string>
<string name="default_welcome_message">Welcome</string>
<string name="connect_navigation_error">Navigation issue</string>
<string name="connect_biometric_error">Authentication Failed</string>
Expand Down
20 changes: 10 additions & 10 deletions app/src/org/commcare/activities/CommCareSetupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.commcare.CommCareApp;
import org.commcare.CommCareApplication;
import org.commcare.connect.ConnectConstants;
import org.commcare.connect.ConnectIDManager;
import org.commcare.connect.PersonalIdManager;
import org.commcare.dalvik.BuildConfig;
import org.commcare.dalvik.R;
import org.commcare.engine.resource.AppInstallStatus;
Expand Down Expand Up @@ -174,7 +174,7 @@ protected void onCreate(Bundle savedInstanceState) {
return;
}
if (!fromManager) {
ConnectIDManager.getInstance().init(this);
PersonalIdManager.getInstance().init(this);
}
loadIntentAndInstanceState(savedInstanceState);
persistCommCareAppState();
Expand Down Expand Up @@ -423,7 +423,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
finish();
return;
case ConnectConstants.COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE:
ConnectIDManager.getInstance().handleFinishedActivity(this, resultCode);
PersonalIdManager.getInstance().handleFinishedActivity(this, resultCode);
return;
default:
return;
Expand Down Expand Up @@ -496,12 +496,12 @@ public boolean onPrepareOptionsMenu(Menu menu) {

MenuItem item = menu.findItem(MENU_CONNECT_SIGN_IN);
if (item != null) {
item.setVisible(!fromManager && !fromExternal && !ConnectIDManager.getInstance().isloggedIn());
item.setVisible(!fromManager && !fromExternal && !PersonalIdManager.getInstance().isloggedIn());
}

item = menu.findItem(MENU_CONNECT_FORGET);
if (item != null) {
item.setVisible(!fromManager && !fromExternal && ConnectIDManager.getInstance().isloggedIn());
item.setVisible(!fromManager && !fromExternal && PersonalIdManager.getInstance().isloggedIn());
}
return true;
}
Expand Down Expand Up @@ -627,20 +627,20 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
case MENU_CONNECT_SIGN_IN:
//Setup ConnectID and proceed to jobs page if successful
ConnectIDManager.getInstance().launchConnectId(this, ConnectConstants.COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE);
PersonalIdManager.getInstance().launchPersonalId(this, ConnectConstants.COMMCARE_SETUP_CONNECT_LAUNCH_REQUEST_CODE);
break;
case MENU_CONNECT_FORGET:
ConnectIDManager.getInstance().forgetUser(AnalyticsParamValue.CCC_FORGOT_USER_SETUP_PAGE);
PersonalIdManager.getInstance().forgetUser(AnalyticsParamValue.CCC_FORGOT_USER_SETUP_PAGE);
updateConnectButton();
break;
}
return true;
}

private void updateConnectButton() {
installFragment.updateConnectButton(!fromManager && !fromExternal && ConnectIDManager.getInstance().isloggedIn(), v -> {
ConnectIDManager.getInstance().unlockConnect(this, success -> {
ConnectIDManager.getInstance().goToConnectJobsList(this);
installFragment.updateConnectButton(!fromManager && !fromExternal && PersonalIdManager.getInstance().isloggedIn(), v -> {
PersonalIdManager.getInstance().unlockConnect(this, success -> {
PersonalIdManager.getInstance().goToConnectJobsList(this);
});
});
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/org/commcare/activities/DispatchActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.commcare.CommCareApplication;
import org.commcare.android.database.global.models.ApplicationRecord;
import org.commcare.android.database.user.models.SessionStateDescriptor;
import org.commcare.connect.ConnectIDManager;
import org.commcare.connect.PersonalIdManager;
import org.commcare.dalvik.R;
import org.commcare.preferences.DeveloperPreferences;
import org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity;
Expand Down Expand Up @@ -202,10 +202,10 @@ private void dispatch() {
} else if(redirectToConnectHome) {
redirectToConnectHome = false;
CommCareApplication.instance().closeUserSession();
ConnectIDManager.getInstance().goToConnectJobsList(this);
PersonalIdManager.getInstance().goToConnectJobsList(this);
} else if(redirectToConnectOpportunityInfo) {
redirectToConnectOpportunityInfo = false;
ConnectIDManager.getInstance().goToActiveInfoForJob(this, true);
PersonalIdManager.getInstance().goToActiveInfoForJob(this, true);
} else {
Comment on lines +205 to 209
Copy link

@coderabbitai coderabbitai bot May 17, 2025

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Method names still use "Connect" prefix

The methods called on PersonalIdManager still use "Connect" in their names:

  • goToConnectJobsList(this)
  • goToActiveInfoForJob(this, true)

This suggests an incomplete renaming effort, where the class has been renamed but the methods still use the old terminology. If "Connect" is being preserved as a broader concept with "PersonalId" as a component, this might be intentional, but it could lead to confusion in the codebase.

🏁 Script executed:

#!/bin/bash
# Check method naming in PersonalIdManager
grep -rn "goToConnectJobsList\|goToActiveInfoForJob" app/src/org/commcare/connect/PersonalIdManager.java

Length of output: 299

Rename methods to remove the “Connect” prefix

The following methods in PersonalIdManager (and their calls) still use the old “Connect” terminology. To keep naming consistent after the class rename, please update both the declaration and all callsites:

• In app/src/org/commcare/connect/PersonalIdManager.java
– Rename

public void goToConnectJobsList(Context parent)

→

public void goToJobsList(Context parent)

– Rename

public void goToActiveInfoForJob(Activity activity, boolean allowProgression)

→

public void goToActiveJobInfo(Activity activity, boolean allowProgression)

• In app/src/org/commcare/activities/DispatchActivity.java (around lines 205–209)
– Update calls to goToConnectJobsList(this) → goToJobsList(this)
– Update calls to goToActiveInfoForJob(this, true) → goToActiveJobInfo(this, true)

This will align method names with the new PersonalIdManager branding and avoid confusion.

🤖 Prompt for AI Agents 
In app/src/org/commcare/activities/DispatchActivity.java around lines 205 to
209, the method calls to PersonalIdManager still use the old "Connect" prefix,
which is inconsistent with the class rename. Rename the method calls from
goToConnectJobsList(this) to goToJobsList(this) and from
goToActiveInfoForJob(this, true) to goToActiveJobInfo(this, true). Also, update
the corresponding method declarations in
app/src/org/commcare/connect/PersonalIdManager.java to match these new names to
maintain consistency across the codebase.

launchHomeScreen();
}
Expand Down Expand Up @@ -322,7 +322,7 @@ private void launchHomeScreen() {
i.putExtra(START_FROM_LOGIN, startFromLogin);
i.putExtra(LoginActivity.LOGIN_MODE, lastLoginMode);
i.putExtra(LoginActivity.MANUAL_SWITCH_TO_PW_MODE, userManuallyEnteredPasswordMode);
i.putExtra(LoginActivity.CONNECTID_MANAGED_LOGIN, connectIdManagedLogin);
i.putExtra(LoginActivity.PERSONALID_MANAGED_LOGIN, connectIdManagedLogin);
startFromLogin = false;
clearSessionEndpointAppId();
startActivityForResult(i, HOME_SCREEN);
Expand Down Expand Up @@ -470,7 +470,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
lastLoginMode = (LoginMode)intent.getSerializableExtra(LoginActivity.LOGIN_MODE);
userManuallyEnteredPasswordMode =
intent.getBooleanExtra(LoginActivity.MANUAL_SWITCH_TO_PW_MODE, false);
connectIdManagedLogin = intent.getBooleanExtra(LoginActivity.CONNECTID_MANAGED_LOGIN, false);
connectIdManagedLogin = intent.getBooleanExtra(LoginActivity.PERSONALID_MANAGED_LOGIN, false);
connectManagedLogin = intent.getBooleanExtra(LoginActivity.CONNECT_MANAGED_LOGIN, false);
startFromLogin = true;
}
Expand Down
2 changes: 0 additions & 2 deletions app/src/org/commcare/activities/HomeScreenBaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Base64;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Toast;

Expand All @@ -41,7 +40,6 @@
import org.commcare.appupdate.AppUpdateControllerFactory;
import org.commcare.appupdate.AppUpdateState;
import org.commcare.appupdate.FlexibleAppUpdateController;
import org.commcare.connect.ConnectIDManager;
import org.commcare.core.process.CommCareInstanceInitializer;
import org.commcare.dalvik.BuildConfig;
import org.commcare.dalvik.R;
Expand Down
Loading
Loading