Skip to content

Commit f3e54fc

Browse files
thatfiredevthatfiredev
authored
Merge branch 'version-9.0.0-dev' into rpf/email-link-auth-hide-#
2 parents 21c270c + 7231cf5 commit f3e54fc

File tree

8 files changed

+9
-44
lines changed

8 files changed

+9
-44
lines changed

‎app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ private Intent getSignInIntent(@Nullable String link) {
194194
.setTheme(getSelectedTheme())
195195
.setLogo(getSelectedLogo())
196196
.setAvailableProviders(getSelectedProviders())
197-
.setIsSmartLockEnabled(mBinding.credentialSelectorEnabled.isChecked(),
198-
mBinding.hintSelectorEnabled.isChecked());
197+
.setCredentialManagerEnabled(mBinding.credentialSelectorEnabled.isChecked());
199198

200199
if (mBinding.customLayout.isChecked()) {
201200
AuthMethodPickerLayout customLayout = new AuthMethodPickerLayout

‎app/src/main/res/layout/auth_ui_layout.xml

-7
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,6 @@
312312
android:checked="true"
313313
android:text="@string/options_enable_credential_selector" />
314314

315-
<CheckBox
316-
android:id="@+id/hint_selector_enabled"
317-
android:layout_width="wrap_content"
318-
android:layout_height="wrap_content"
319-
android:checked="true"
320-
android:text="@string/options_enable_hint_selector" />
321-
322315
<CheckBox
323316
android:id="@+id/allow_new_email_accounts"
324317
android:layout_width="wrap_content"

‎app/src/main/res/values/strings.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
<string name="facebook_permission_photos">Photos</string>
6464

6565
<string name="options_header">Other Options</string>
66-
<string name="options_enable_credential_selector">Enable Smart Lock\'s credential selector</string>
67-
<string name="options_enable_hint_selector">Enable Smart Lock\'s hint selector</string>
66+
<string name="options_enable_credential_selector">Enable Credential Manager\'s credential selector</string>
6867
<string name="options_allow_new_email_acccount">Allow new account creation</string>
6968
<string name="options_require_name">Require first/last name with email accounts.</string>
7069
<string name="options_use_auth_emulator">Connect to auth emulator (localhost:9099).</string>

‎auth/src/main/java/com/firebase/ui/auth/AuthUI.java

+3-22
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,6 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
11261126
boolean mAlwaysShowProviderChoice = false;
11271127
boolean mLockOrientation = false;
11281128
boolean mEnableCredentials = true;
1129-
boolean mEnableHints = true;
11301129
AuthMethodPickerLayout mAuthMethodPickerLayout = null;
11311130
ActionCodeSettings mPasswordSettings = null;
11321131

@@ -1251,32 +1250,15 @@ public T setDefaultProvider(@Nullable IdpConfig config) {
12511250
}
12521251

12531252
/**
1254-
* Enables or disables the use of Smart Lock for Passwords in the # flow. To
1255-
* (en)disable hint selector and credential selector independently use {@link
1256-
* #setIsSmartLockEnabled(boolean, boolean)}
1253+
* Enables or disables the use of Credential Manager for Passwords credential selector
12571254
* <p>
1258-
* <p>SmartLock is enabled by default.
1259-
*
1260-
* @param enabled enables smartlock's credential selector and hint selector
1261-
*/
1262-
@NonNull
1263-
public T setIsSmartLockEnabled(boolean enabled) {
1264-
return setIsSmartLockEnabled(enabled, enabled);
1265-
}
1266-
1267-
/**
1268-
* Enables or disables the use of Smart Lock for Passwords credential selector and hint
1269-
* selector.
1270-
* <p>
1271-
* <p>Both selectors are enabled by default.
1255+
* <p>Is enabled by default.
12721256
*
12731257
* @param enableCredentials enables credential selector before #
1274-
* @param enableHints enable hint selector in respective # screens
12751258
*/
12761259
@NonNull
1277-
public T setIsSmartLockEnabled(boolean enableCredentials, boolean enableHints) {
1260+
public T setCredentialManagerEnabled(boolean enableCredentials) {
12781261
mEnableCredentials = enableCredentials;
1279-
mEnableHints = enableHints;
12801262
return (T) this;
12811263
}
12821264

@@ -1409,7 +1391,6 @@ protected FlowParameters getFlowParams() {
14091391
mTosUrl,
14101392
mPrivacyPolicyUrl,
14111393
mEnableCredentials,
1412-
mEnableHints,
14131394
mEnableAnonymousUpgrade,
14141395
mAlwaysShowProviderChoice,
14151396
mLockOrientation,

‎auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java

-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public FlowParameters createFromParcel(Parcel in) {
7070
termsOfServiceUrl,
7171
privacyPolicyUrl,
7272
enableCredentials,
73-
enableHints,
7473
enableAnonymousUpgrade,
7574
alwaysShowProviderChoice,
7675
lockOrientation,
@@ -113,7 +112,6 @@ public FlowParameters[] newArray(int size) {
113112
public final ActionCodeSettings passwordResetSettings;
114113

115114
public final boolean enableCredentials;
116-
public final boolean enableHints;
117115
public final boolean enableAnonymousUpgrade;
118116
public final boolean alwaysShowProviderChoice;
119117
public final boolean lockOrientation;
@@ -130,7 +128,6 @@ public FlowParameters(
130128
@Nullable String termsOfServiceUrl,
131129
@Nullable String privacyPolicyUrl,
132130
boolean enableCredentials,
133-
boolean enableHints,
134131
boolean enableAnonymousUpgrade,
135132
boolean alwaysShowProviderChoice,
136133
boolean lockOrientation,
@@ -146,7 +143,6 @@ public FlowParameters(
146143
this.termsOfServiceUrl = termsOfServiceUrl;
147144
this.privacyPolicyUrl = privacyPolicyUrl;
148145
this.enableCredentials = enableCredentials;
149-
this.enableHints = enableHints;
150146
this.enableAnonymousUpgrade = enableAnonymousUpgrade;
151147
this.alwaysShowProviderChoice = alwaysShowProviderChoice;
152148
this.lockOrientation = lockOrientation;
@@ -172,7 +168,6 @@ public void writeToParcel(Parcel dest, int flags) {
172168
dest.writeString(termsOfServiceUrl);
173169
dest.writeString(privacyPolicyUrl);
174170
dest.writeInt(enableCredentials ? 1 : 0);
175-
dest.writeInt(enableHints ? 1 : 0);
176171
dest.writeInt(enableAnonymousUpgrade ? 1 : 0);
177172
dest.writeInt(alwaysShowProviderChoice ? 1 : 0);
178173
dest.writeInt(lockOrientation ? 1 : 0);
@@ -205,7 +200,6 @@ public boolean isAnonymousUpgradeEnabled() {
205200
public boolean isPlayServicesRequired() {
206201
// Play services only required for Google # and the Credentials API
207202
return isProviderEnabled(GoogleAuthProvider.PROVIDER_ID)
208-
|| enableHints
209203
|| enableCredentials;
210204
}
211205

‎auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
8787

8888
ImeHelper.setImeOnDoneListener(mEmailEditText, this);
8989

90-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && getFlowParams().enableHints) {
90+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
9191
mEmailEditText.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);
9292
}
9393

@@ -135,7 +135,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
135135
if (!TextUtils.isEmpty(email)) {
136136
mEmailEditText.setText(email);
137137
// Previously auto-triggering the check is now removed.
138-
} else if (getFlowParams().enableHints) {
138+
} else if (getFlowParams().enableCredentials) {
139139
mHandler.fetchCredential();
140140
}
141141
}

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
8585

8686
mSmsTermsText.setText(getString(R.string.fui_sms_terms_of_service,
8787
getString(R.string.fui_verify_phone_number)));
88-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && getFlowParams().enableHints) {
88+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
8989
mPhoneEditText.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);
9090
}
9191
requireActivity().setTitle(getString(R.string.fui_verify_phone_number_title));
@@ -220,7 +220,7 @@ private void setDefaultCountryForSpinner() {
220220
"",
221221
countryIso,
222222
String.valueOf(PhoneNumberUtils.getCountryCode(countryIso))));
223-
} else if (getFlowParams().enableHints) {
223+
} else if (getFlowParams().enableCredentials) {
224224
// Launch phone number hint flow using the new API
225225
mCheckPhoneHandler.fetchCredential(requireActivity());
226226
}

‎auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java

-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
184184
null,
185185
null,
186186
true,
187-
true,
188187
enableAnonymousUpgrade,
189188
false,
190189
true,

0 commit comments

Comments
 (0)