Skip to content

Commit a385dfa

Browse files
lsiracsamtstern
lsirac
authored and
samtstern
committed
Force ToS & Pp to be added to align with FirebaseUI Web & iOS (#1325)
1 parent fd99883 commit a385dfa

File tree

91 files changed

+37
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+37
-559
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ public void signIn(View view) {
160160
.setTheme(getSelectedTheme())
161161
.setLogo(getSelectedLogo())
162162
.setAvailableProviders(getSelectedProviders())
163-
.setTosUrl(getSelectedTosUrl())
164-
.setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
163+
.setTosAndPrivacyPolicyUrls(getSelectedTosUrl(),
164+
getSelectedPrivacyPolicyUrl())
165165
.setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
166166
mEnableHintSelector.isChecked())
167167
.build(),

‎auth/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,15 @@ startActivityForResult(
231231

232232
##### Adding a ToS and privacy policy
233233

234-
If a terms of service URL and privacy policy URL are required:
234+
A terms of service URL and privacy policy URL are generally required:
235235

236236
```java
237237
startActivityForResult(
238238
AuthUI.getInstance()
239239
.createSignInIntentBuilder()
240240
.setAvailableProviders(...)
241-
.setTosUrl("https://superapp.example.com/terms-of-service.html")
242-
.setPrivacyPolicyUrl("https://superapp.example.com/privacy-policy.html")
241+
.setTosAndPrivacyPolicyUrls("https://superapp.example.com/terms-of-service.html",
242+
"https://superapp.example.com/privacy-policy.html")
243243
.build(),
244244
RC_SIGN_IN);
245245
```

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,22 +939,40 @@ public T setLogo(@DrawableRes int logo) {
939939

940940
/**
941941
* Specifies the terms-of-service URL for the application.
942+
*
943+
* @deprecated Please use {@link #setTosAndPrivacyPolicyUrls(String, String)}
944+
* For the Tos link to be displayed a Privacy Policy url must also be provided.
942945
*/
943946
@NonNull
947+
@Deprecated
944948
public T setTosUrl(@Nullable String tosUrl) {
945949
mTosUrl = tosUrl;
946950
return (T) this;
947951
}
948952

949953
/**
950954
* Specifies the privacy policy URL for the application.
955+
*
956+
* @deprecated Please use {@link #setTosAndPrivacyPolicyUrls(String, String)}
957+
* For the Privacy Policy link to be displayed a Tos url must also be provided.
951958
*/
952959
@NonNull
960+
@Deprecated
953961
public T setPrivacyPolicyUrl(@Nullable String privacyPolicyUrl) {
954962
mPrivacyPolicyUrl = privacyPolicyUrl;
955963
return (T) this;
956964
}
957965

966+
@NonNull
967+
public T setTosAndPrivacyPolicyUrls(@NonNull String tosUrl,
968+
@NonNull String privacyPolicyUrl) {
969+
Preconditions.checkNotNull(tosUrl, "tosUrl cannot be null");
970+
Preconditions.checkNotNull(privacyPolicyUrl, "privacyPolicyUrl cannot be null");
971+
mTosUrl = tosUrl;
972+
mPrivacyPolicyUrl = privacyPolicyUrl;
973+
return (T) this;
974+
}
975+
958976
/**
959977
* Specified the set of supported authentication providers. At least one provider must
960978
* be specified. There may only be one instance of each provider.

‎auth/src/main/java/com/firebase/ui/auth/util/data/PrivacyDisclosureUtils.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ private static int getGlobalTermsStringResource(FlowParameters flowParameters) {
4949

5050
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
5151
return R.string.fui_tos_and_pp;
52-
} else if (termsOfServiceUrlProvided) {
53-
return R.string.fui_tos_only;
54-
} else if (privacyPolicyUrlProvided) {
55-
return R.string.fui_pp_only;
5652
}
5753

5854
return NO_TOS_OR_PP;
@@ -65,10 +61,6 @@ private static int getGlobalTermsFooterStringResource(FlowParameters flowParamet
6561

6662
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
6763
return R.string.fui_tos_and_pp_footer;
68-
} else if (termsOfServiceUrlProvided) {
69-
return R.string.fui_tos_footer;
70-
} else if (privacyPolicyUrlProvided) {
71-
return R.string.fui_pp_footer;
7264
}
7365

7466
return NO_TOS_OR_PP;
@@ -81,10 +73,6 @@ private static int getTermsSmsStringResource(FlowParameters flowParameters) {
8173

8274
if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
8375
return R.string.fui_sms_terms_of_service_and_privacy_policy_extended;
84-
} else if (termsOfServiceUrlProvided) {
85-
return R.string.fui_sms_terms_of_service_only_extended;
86-
} else if (privacyPolicyUrlProvided) {
87-
return R.string.fui_sms_privacy_policy_only_extended;
8876
}
8977

9078
return NO_TOS_OR_PP;

‎auth/src/main/java/com/firebase/ui/auth/util/ui/PreambleHandler.java‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@ private void initPreamble(@StringRes int textViewText) {
7373
mBuilder = new SpannableStringBuilder(withTargets);
7474

7575
replaceTarget(BTN_TARGET, mButtonText);
76-
replaceUrlTarget(
77-
TOS_TARGET,
78-
R.string.fui_terms_of_service,
79-
mFlowParameters.termsOfServiceUrl);
76+
replaceUrlTarget(TOS_TARGET, R.string.fui_terms_of_service, mFlowParameters.termsOfServiceUrl);
8077
replaceUrlTarget(PP_TARGET, R.string.fui_privacy_policy, mFlowParameters.privacyPolicyUrl);
8178
}
8279

@@ -109,36 +106,10 @@ private String getPreambleStringWithTargets(@StringRes int textViewText, boolean
109106
new Object[]{BTN_TARGET, TOS_TARGET, PP_TARGET}
110107
: new Object[]{TOS_TARGET, PP_TARGET};
111108
return mContext.getString(textViewText, targets);
112-
} else if (termsOfServiceUrlProvided) {
113-
Object[] targets = hasButton ?
114-
new Object[]{BTN_TARGET, TOS_TARGET} : new Object[]{TOS_TARGET};
115-
return mContext.getString(textViewText, targets);
116-
} else if (privacyPolicyUrlProvided) {
117-
Object[] targets = hasButton ?
118-
new Object[]{BTN_TARGET, PP_TARGET} : new Object[]{PP_TARGET};
119-
return mContext.getString(textViewText, targets);
120-
}
121-
return null;
122-
}
123-
124-
@Nullable
125-
private String getPreambleStringWithTargetsNoButton(@StringRes int textViewText) {
126-
boolean hasTos = !TextUtils.isEmpty(mFlowParameters.termsOfServiceUrl);
127-
boolean hasPp = !TextUtils.isEmpty(mFlowParameters.privacyPolicyUrl);
128-
if (hasTos && hasPp) {
129-
return mContext.getString(textViewText,
130-
TOS_TARGET, PP_TARGET);
131-
} else if (hasTos) {
132-
return mContext.getString(textViewText,
133-
TOS_TARGET);
134-
} else if (hasPp) {
135-
return mContext.getString(textViewText,
136-
PP_TARGET);
137109
}
138110
return null;
139111
}
140112

141-
142113
private class CustomTabsSpan extends ClickableSpan {
143114
private final String mUrl;
144115
private final CustomTabsIntent mCustomTabsIntent;

‎auth/src/main/res/values-ar/strings.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<string name="fui_progress_dialog_loading">جارٍ التحميل…</string>
33
<string name="fui_sign_in_default">تسجيل الدخول</string>
44
<string name="fui_tos_and_pp">تشير المتابعة إلى موافقتك على %1$s و%2$s.</string>
5-
<string name="fui_tos_only">تشير المتابعة إلى موافقتك على %1$s.</string>
6-
<string name="fui_pp_only">تشير المتابعة إلى موافقتك على %1$s.</string>
75
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
8-
<string name="fui_tos_footer">%1$s</string>
9-
<string name="fui_pp_footer">%1$s</string>
106
<string name="fui_idp_name_google">Google</string>
117
<string name="fui_idp_name_facebook">Facebook</string>
128
<string name="fui_idp_name_twitter">Twitter</string>
@@ -69,6 +65,4 @@
6965
<string name="fui_continue_phone_login">متابعة</string>
7066
<string name="fui_sms_terms_of_service">عند النقر على “%1$s”، قد يتمّ إرسال رسالة قصيرة SMS وقد يتمّ تطبيق رسوم الرسائل والبيانات.</string>
7167
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s و%3$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
72-
<string name="fui_sms_terms_of_service_only_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
73-
<string name="fui_sms_privacy_policy_only_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
7468
</resources>

‎auth/src/main/res/values-b+es+419/strings.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<string name="fui_progress_dialog_loading">Cargando…</string>
33
<string name="fui_sign_in_default">Acceder</string>
44
<string name="fui_tos_and_pp">Si continúas, indicas que aceptas nuestras %1$s y %2$s.</string>
5-
<string name="fui_tos_only">Si continúas, indicas que aceptas nuestras %1$s.</string>
6-
<string name="fui_pp_only">Si continúas, indicas que aceptas nuestras %1$s.</string>
75
<string name="fui_tos_and_pp_footer">%1$s     %2$s</string>
8-
<string name="fui_tos_footer">%1$s</string>
9-
<string name="fui_pp_footer">%1$s</string>
106
<string name="fui_idp_name_google">Google</string>
117
<string name="fui_idp_name_facebook">Facebook</string>
128
<string name="fui_idp_name_twitter">Twitter</string>
@@ -69,6 +65,4 @@
6965
<string name="fui_continue_phone_login">Continuar</string>
7066
<string name="fui_sms_terms_of_service">Si presionas “%1$s”, se enviará un SMS. Se aplicarán las tarifas de mensajes y datos.</string>
7167
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">Si presionas “%1$s”, indicas que aceptas nuestras %2$s y %3$s. Es posible que se te envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
72-
<string name="fui_sms_terms_of_service_only_extended">Si presionas “%1$s”, indicas que aceptas nuestras %2$s. Es posible que se te envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
73-
<string name="fui_sms_privacy_policy_only_extended">Si presionas “%1$s”, indicas que aceptas nuestras %2$s. Es posible que se te envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
7468
</resources>

‎auth/src/main/res/values-bg/strings.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<string name="fui_progress_dialog_loading">Зарежда се…</string>
33
<string name="fui_sign_in_default">Вход</string>
44
<string name="fui_tos_and_pp">Продължавайки, приемате нашите %1$s и %2$s.</string>
5-
<string name="fui_tos_only">Продължавайки, приемате нашите %1$s.</string>
6-
<string name="fui_pp_only">Продължавайки, приемате нашата %1$s.</string>
75
<string name="fui_tos_and_pp_footer">%1$s     %2$s</string>
8-
<string name="fui_tos_footer">%1$s</string>
9-
<string name="fui_pp_footer">%1$s</string>
106
<string name="fui_idp_name_google">Google</string>
117
<string name="fui_idp_name_facebook">Facebook</string>
128
<string name="fui_idp_name_twitter">Twitter</string>
@@ -69,6 +65,4 @@
6965
<string name="fui_continue_phone_login">Напред</string>
7066
<string name="fui_sms_terms_of_service">Докосвайки „%1$s“, може да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
7167
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">Докосвайки „%1$s“, приемате нашите %2$s и %3$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
72-
<string name="fui_sms_terms_of_service_only_extended">Докосвайки „%1$s“, приемате нашите %2$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
73-
<string name="fui_sms_privacy_policy_only_extended">Докосвайки „%1$s“, приемате нашата %2$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
7468
</resources>

‎auth/src/main/res/values-bn/strings.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<string name="fui_progress_dialog_loading">লোড হচ্ছে…</string>
33
<string name="fui_sign_in_default">সাইন-ইন করুন</string>
44
<string name="fui_tos_and_pp">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s এবং %2$s-এর সাথে সম্মত।</string>
5-
<string name="fui_tos_only">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s-এর সাথে সম্মত।</string>
6-
<string name="fui_pp_only">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s-এর সাথে সম্মত।</string>
75
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
8-
<string name="fui_tos_footer">%1$s</string>
9-
<string name="fui_pp_footer">%1$s</string>
106
<string name="fui_idp_name_google">Google</string>
117
<string name="fui_idp_name_facebook">Facebook</string>
128
<string name="fui_idp_name_twitter">Twitter</string>
@@ -69,6 +65,4 @@
6965
<string name="fui_continue_phone_login">চালিয়ে যান</string>
7066
<string name="fui_sms_terms_of_service">%1$s এ ট্যাপ করলে আপনি একটি এসএমএস পাঠাতে পারেন। মেসেজ ও ডেটার চার্জ প্রযোজ্য।</string>
7167
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s এবং %3$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
72-
<string name="fui_sms_terms_of_service_only_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
73-
<string name="fui_sms_privacy_policy_only_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
7468
</resources>

‎auth/src/main/res/values-ca/strings.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<string name="fui_progress_dialog_loading">S\'està carregant…</string>
33
<string name="fui_sign_in_default">Inicia la sessió</string>
44
<string name="fui_tos_and_pp">En continuar, acceptes les nostres %1$s i la nostra %2$s.</string>
5-
<string name="fui_tos_only">En continuar, acceptes les nostres %1$s.</string>
6-
<string name="fui_pp_only">En continuar, acceptes la nostra %1$s.</string>
75
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
8-
<string name="fui_tos_footer">%1$s</string>
9-
<string name="fui_pp_footer">%1$s</string>
106
<string name="fui_idp_name_google">Google</string>
117
<string name="fui_idp_name_facebook">Facebook</string>
128
<string name="fui_idp_name_twitter">Twitter</string>
@@ -69,6 +65,4 @@
6965
<string name="fui_continue_phone_login">Continua</string>
7066
<string name="fui_sms_terms_of_service">En tocar %1$s, és possible que s\'enviï un SMS. Es poden aplicar tarifes de dades i missatges.</string>
7167
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">En tocar %1$s, acceptes les nostres %2$s i la nostra %3$s. És possible que s\'enviï un SMS. Es poden aplicar tarifes de dades i missatges.</string>
72-
<string name="fui_sms_terms_of_service_only_extended">En tocar %1$s, acceptes les nostres %2$s. És possible que s\'enviï un SMS. Es poden aplicar tarifes de dades i missatges.</string>
73-
<string name="fui_sms_privacy_policy_only_extended">En tocar %1$s, acceptes la nostra %2$s. És possible que s\'enviï un SMS. Es poden aplicar tarifes de dades i missatges.</string>
7468
</resources>

0 commit comments

Comments
 (0)