Skip to content

Commit 1df7d3d

Browse files
SUPERCILEXsamtstern
authored andcommitted
Use native string formatter (#475)
1 parent ab9b801 commit 1df7d3d

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ public void onClick(View view) {
113113
}
114114

115115
private String getIdpPromptString(String email) {
116-
String promptStringTemplate = getResources().getString(R.string.welcome_back_idp_prompt);
117-
return String.format(promptStringTemplate, email, mIdpProvider.getName(this));
116+
return getResources().getString(R.string.welcome_back_idp_prompt,
117+
email,
118+
mIdpProvider.getName(this));
118119
}
119120

120121
@Override

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ protected void onCreate(Bundle savedInstanceState) {
7979
mPasswordField = (EditText) findViewById(R.id.password);
8080

8181
// Create welcome back text with email bolded
82-
String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body);
83-
bodyText = String.format(bodyText, mEmail);
82+
String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body, mEmail);
8483
SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
8584
int emailStart = bodyText.indexOf(mEmail);
8685
spannableStringBuilder.setSpan(new StyleSpan(Typeface.BOLD),

auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public class RecoveryEmailSentDialog extends DialogBase {
2121
public Dialog onCreateDialog(Bundle savedInstanceState) {
2222
return new AlertDialog.Builder(getContext(), R.style.FirebaseUI_Dialog)
2323
.setTitle(R.string.title_confirm_recover_password_activity)
24-
.setMessage(String.format(getString(R.string.confirm_recovery_body),
25-
getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
24+
.setMessage(getString(R.string.confirm_recovery_body,
25+
getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
2626
.setOnDismissListener(new DialogInterface.OnDismissListener() {
2727
@Override
2828
public void onDismiss(DialogInterface anInterface) {

auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ public class PasswordFieldValidator extends BaseValidator {
2424
public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) {
2525
super(errorContainer);
2626
mMinLength = minLength;
27-
String template = mErrorContainer.getResources()
28-
.getQuantityString(R.plurals.password_length, minLength);
29-
mErrorMessage = String.format(template, mMinLength);
27+
mErrorMessage = mErrorContainer.getResources()
28+
.getQuantityString(R.plurals.password_length, minLength, mMinLength);
3029
}
3130

3231
@Override

0 commit comments

Comments
 (0)