Skip to content

[Draft][Do Not Merge] skip biometric page for automated testing #3491

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

Draft
shubham1g5 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[Draft][Do Not Merge] skip biometric page for automated testing #3491

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
47789d7
skip biometric and otp page for automated testing - hardcoded for now…
shubham1g5 Jan 14, 2026
dd72d5a
skip biometric unlock
shubham1g5 Jan 15, 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
3 changes: 3 additions & 0 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 @@ -123,6 +123,9 @@
<action
android:id="@+id/action_personalid_phone_fragment_to_personalid_biometric_config"
app:destination="@id/personalid_biometric_config"/>
<action
android:id="@+id/action_personalid_phone_fragment_to_personalid_name"
app:destination="@id/personalid_name" />
<action
android:id="@+id/action_personalid_phone_fragment_self"
app:destination="@id/personalid_phone_fragment" />
Expand Down
8 changes: 4 additions & 4 deletions app/src/org/commcare/activities/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,12 @@ protected void initiateLoginAttempt(boolean restoreSession) {
doLogin(loginMode, restoreSession, "AUTO");
} else if (loginManagedByPersonalId()) {
//Unlock and then auto login
personalIdManager.unlockConnect(this, success -> {
if (success) {
// personalIdManager.unlockConnect(this, success -> {
// if (success) {
String pass = personalIdManager.getStoredPasswordForApp(seatedAppId, username);
doLogin(loginMode, restoreSession, pass);
}
});
// }
// });
} else {
//Manual login
String passwordOrPin = uiController.getEnteredPasswordOrPin();
Expand Down
8 changes: 4 additions & 4 deletions app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ private void handleRedirectIfAny() {
action,
getIntent().getStringExtra(NOTIFICATION_ID)
);
PersonalIdManager.getInstance().unlockConnect(this, success -> {
if (success) {
// PersonalIdManager.getInstance().unlockConnect(this, success -> {
// if (success) {
String channelId = getIntent().getStringExtra(
ConnectMessagingMessageRecord.META_MESSAGE_CHANNEL_ID);
String notificationId = getIntent().getStringExtra(NOTIFICATION_ID);
Expand All @@ -100,8 +100,8 @@ private void handleRedirectIfAny() {
} else {
handleChannelForValidity(channelId);
}
}
});
// }
// });
}
}

Expand Down
18 changes: 9 additions & 9 deletions app/src/org/commcare/connect/ConnectNavHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import org.commcare.connect.database.ConnectUserDatabaseUtil

object ConnectNavHelper {
private fun unlockAndGoTo(activity: CommCareActivity<*>, listener: ConnectActivityCompleteListener, navigationAction: (Context) -> Unit) {
val personalIdManager: PersonalIdManager = PersonalIdManager.getInstance()
personalIdManager.init(activity)
personalIdManager.unlockConnect(
activity
) { success: Boolean ->
if (success) {
// val personalIdManager: PersonalIdManager = PersonalIdManager.getInstance()
// personalIdManager.init(activity)
// personalIdManager.unlockConnect(
// activity
// ) { success: Boolean ->
// if (success) {
navigationAction(activity)
}
listener.connectActivityComplete(success)
}
// }
// listener.connectActivityComplete(success)
// }
}

fun unlockAndGoToMessaging(activity: CommCareActivity<*>, listener: ConnectActivityCompleteListener) {
Expand Down
26 changes: 13 additions & 13 deletions app/src/org/commcare/connect/PersonalIdManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@ private void showLinkDialog(CommCareActivity<?> activity, ConnectLinkedAppRecord

private void unlockAndLinkConnect(CommCareActivity<?> activity, ConnectLinkedAppRecord linkedApp,
String username, String password, ConnectActivityCompleteListener callback) {
unlockConnect(activity, success -> {
if (!success) {
callback.connectActivityComplete(false);
FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(), FAILURE_UNLOCK_FAILED);
return;
}

// unlockConnect(activity, success -> {
// if (!success) {
// callback.connectActivityComplete(false);
// FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(), FAILURE_UNLOCK_FAILED);
// return;
// }
//
linkedApp.linkToPersonalId(password);
FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(), SYNC_SUCCESS);
ConnectAppDatabaseUtil.storeApp(activity, linkedApp);
Expand All @@ -383,7 +383,7 @@ public void tokenRequestDenied() {
callback.connectActivityComplete(false);
}
});
});
// });
}

private void promptToDelinkPersonalIdApp(CommCareActivity<?> activity, String appId, String username,
Expand All @@ -400,17 +400,17 @@ private void promptToDelinkPersonalIdApp(CommCareActivity<?> activity, String ap

dialog.setPositiveButton(activity.getString(R.string.login_link_connectid_yes), (d, w) -> {
activity.dismissAlertDialog();
unlockConnect(activity, success -> {
if (success) {
// unlockConnect(activity, success -> {
// if (success) {
ConnectLinkedAppRecord linkedApp = ConnectAppDatabaseUtil.getConnectLinkedAppRecord(activity,
appId, username);
if (linkedApp != null) {
linkedApp.severPersonalIdLink();
ConnectAppDatabaseUtil.storeApp(activity, linkedApp);
}
}
callback.connectActivityComplete(false);
});
// }
// callback.connectActivityComplete(false);
// });
});

dialog.setNegativeButton(activity.getString(R.string.login_link_connectid_no), (d, w) -> {
Expand Down
12 changes: 6 additions & 6 deletions app/src/org/commcare/fragments/connect/ConnectUnlockFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
private final Runnable unlockRunnable = new Runnable() {
@Override
public void run() {
PersonalIdManager.getInstance().unlockConnect((CommCareActivity<?>) requireActivity(), success -> {
if (success) {
// PersonalIdManager.getInstance().unlockConnect((CommCareActivity<?>) requireActivity(), success -> {
// if (success) {
retrieveOpportunities();
} else {
requireActivity().finish();
}
});
// } else {
// requireActivity().finish();
// }
// });
}
};

Expand Down
5 changes: 4 additions & 1 deletion app/src/org/commcare/fragments/personalId/PersonalIdPhoneFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,10 @@ private void handleIntegrityFailure(String subError, String logMessage) {
}

private void onConfigurationSuccess() {
Navigation.findNavController(binding.personalidPhoneContinueButton).navigate(navigateToBiometricSetup());
// Navigation.findNavController(binding.personalidPhoneContinueButton).navigate(navigateToBiometricSetup());
Navigation.findNavController(binding.personalidPhoneContinueButton).navigate(
PersonalIdPhoneFragmentDirections.actionPersonalidPhoneFragmentToPersonalidName()
);
}

private void navigateFailure(PersonalIdApiHandler.PersonalIdOrConnectApiErrorCodes failureCode, Throwable t) {
Expand Down