Skip to content

Pm beta fix mainline #3271

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 3 commits into from
Jul 25, 2025
Merged

Pm beta fix mainline #3271

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7369c3c
fix message null check
pm-dimagi Jul 25, 2025
ba3d5b1
fix message null check
pm-dimagi Jul 25, 2025
17d6f01
fixed variable name spell
pm-dimagi Jul 25, 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
15 changes: 10 additions & 5 deletions 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 @@ -58,6 +58,7 @@
import java.util.HashMap;

import static com.google.android.play.core.integrity.model.IntegrityDialogResponseCode.DIALOG_SUCCESSFUL;
import static org.commcare.fragments.personalId.PersonalIdPhoneFragmentDirections.*;
import static org.commcare.utils.Permissions.shouldShowPermissionRationale;

public class PersonalIdPhoneFragment extends BasePersonalIdFragment implements CommCareLocationListener {
Expand Down Expand Up @@ -99,7 +100,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@Override
public void onResume() {
super.onResume();
locationController.start();
if (!isOnPermissionErrorScreen()) {
locationController.start();
}
}

@Override
Expand Down Expand Up @@ -461,10 +464,12 @@ protected void navigateToMessageDisplay(String title, String message, boolean i
Navigation.findNavController(binding.personalidPhoneContinueButton).navigate(navDirections);
}

private void navigateToPermissionErrorMessageDisplay(int errorMeesage, int buttonText) {
navigateToMessageDisplay(
requireActivity().getString(errorMeesage), null,true,
ConnectConstants.PERSONALID_LOCATION_PERMISSION_FAILURE, buttonText);
private void navigateToPermissionErrorMessageDisplay(int errorMessage, int buttonText) {
if (!isOnPermissionErrorScreen()) {
navigateToMessageDisplay(
getString(R.string.personalid_grant_location_service), requireActivity().getString(errorMessage), true,
ConnectConstants.PERSONALID_LOCATION_PERMISSION_FAILURE, buttonText);
}
}

@Override
Expand Down