CCCT-627 || Country Code Issue #2926
Conversation
Set default country code
📝 WalkthroughWalkthroughThe pull request introduces improvements to phone number handling in the CommCare application, specifically focusing on country code management. In the The changes enhance the user experience during signup by automatically populating the country code field and ensuring consistent formatting. The The modifications are primarily focused on utility improvements for phone number input, with no significant changes to the core registration logic or control flow of the application. Sequence DiagramsequenceDiagram
participant User
participant SignupFragment
participant PhoneNumberHelper
participant Context
User->>SignupFragment: Initiates Signup
SignupFragment->>Context: Get Device Locale
Context-->>SignupFragment: Return Locale
SignupFragment->>PhoneNumberHelper: setDefaultCountryCode()
PhoneNumberHelper->>SignupFragment: Return Formatted Country Code
SignupFragment->>User: Display Pre-filled Country Code
Possibly related PRs
Suggested reviewers
Tip CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🔭 Outside diff range comments (1)
app/src/org/commcare/fragments/connectId/ConnectIDSignupFragment.java (1)
Line range hint
134-149: Improve country code text watcher implementation.The current implementation might cause cursor position issues and could potentially trigger an infinite loop. Consider a more robust approach.
Apply this diff:
binding.countryCode.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { } @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - if (!s.toString().contains("+")) { - binding.countryCode.setText("+" + binding.countryCode.getText()); + // Skip if the change is programmatic + if (binding.countryCode.getTag() != null) { + binding.countryCode.setTag(null); + return; } + + String text = s.toString(); + if (!text.startsWith("+")) { + // Mark this change as programmatic + binding.countryCode.setTag(true); + binding.countryCode.setText("+" + text); + // Restore cursor position + binding.countryCode.setSelection(binding.countryCode.length()); + } } @Override public void afterTextChanged(Editable s) { } });
🧹 Nitpick comments (1)
app/src/org/commcare/utils/PhoneNumberHelper.java (1)
86-101: Add documentation and input validation.The new method needs JavaDoc documentation and null checks for the context parameter.
Apply this diff:
+ /** + * Gets the default country code based on device's locale and formats it with "+" prefix. + * + * @param context The context used to get device locale. Must not be null. + * @return Formatted country code with "+" prefix, or empty string if code cannot be determined. + * @throws IllegalArgumentException if context is null + */ public static String setDefaultCountryCode(Context context) { + if (context == null) { + throw new IllegalArgumentException("Context must not be null"); + } Locale locale = context.getResources().getConfiguration().locale; PhoneNumberUtil util = getUtil(context); int code = util.getCountryCodeForRegion(locale.getCountry());
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
app/src/org/commcare/fragments/connectId/ConnectIDSignupFragment.java(1 hunks)app/src/org/commcare/utils/PhoneNumberHelper.java(2 hunks)
🔇 Additional comments (2)
app/src/org/commcare/utils/PhoneNumberHelper.java (1)
Line range hint 116-127: LGTM!
The error handling implementation is robust and follows good practices.
app/src/org/commcare/fragments/connectId/ConnectIDSignupFragment.java (1)
110-113: LGTM!
The initialization of country code is properly implemented using the new helper method.
Summary
https://dimagi.atlassian.net/browse/CCCT-627
Feature Flag
Product Description
PR Checklist
Automated test coverage
Safety story