Skip to content

Force ToS & Pp to be added to align with FirebaseUI Web & iOS #1325

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
merged 3 commits into from
May 30, 2018
Merged

Force ToS & Pp to be added to align with FirebaseUI Web & iOS #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a32106e
Users must provide both a ToS and Pp. Added setTosAndPrivacyPolicyUrl…
lsirac May 29, 2018
dcf5397
Adds precondition non null check for tosUrl and PrivacyPolicyUrl
lsirac May 30, 2018
0efa43a
Updates documentation
lsirac May 30, 2018
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
4 changes: 2 additions & 2 deletions app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ public void signIn(View view) {
.setTheme(getSelectedTheme())
.setLogo(getSelectedLogo())
.setAvailableProviders(getSelectedProviders())
.setTosUrl(getSelectedTosUrl())
.setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
.setTosAndPrivacyPolicyUrls(getSelectedTosUrl(),
getSelectedPrivacyPolicyUrl())
.setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
mEnableHintSelector.isChecked())
.build(),
Expand Down
6 changes: 3 additions & 3 deletions auth/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ startActivityForResult(

##### Adding a ToS and privacy policy

If a terms of service URL and privacy policy URL are required:
A terms of service URL and privacy policy URL are generally required:

```java
startActivityForResult(
AuthUI.getInstance()
.createSignInIntentBuilder()
.setAvailableProviders(...)
.setTosUrl("https://superapp.example.com/terms-of-service.html")
.setPrivacyPolicyUrl("https://superapp.example.com/privacy-policy.html")
.setTosAndPrivacyPolicyUrls("https://superapp.example.com/terms-of-service.html",
"https://superapp.example.com/privacy-policy.html")
.build(),
RC_SIGN_IN);
```
Expand Down
18 changes: 18 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/AuthUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,22 +808,40 @@ public T setLogo(@DrawableRes int logo) {

/**
* Specifies the terms-of-service URL for the application.
*
* @deprecated Please use {@link #setTosAndPrivacyPolicyUrls(String, String)}
* For the Tos link to be displayed a Privacy Policy url must also be provided.
*/
@NonNull
@Deprecated
public T setTosUrl(@Nullable String tosUrl) {
mTosUrl = tosUrl;
return (T) this;
}

/**
* Specifies the privacy policy URL for the application.
*
* @deprecated Please use {@link #setTosAndPrivacyPolicyUrls(String, String)}
* For the Privacy Policy link to be displayed a Tos url must also be provided.
*/
@NonNull
@Deprecated
public T setPrivacyPolicyUrl(@Nullable String privacyPolicyUrl) {
mPrivacyPolicyUrl = privacyPolicyUrl;
return (T) this;
}

@NonNull
public T setTosAndPrivacyPolicyUrls(@NonNull String tosUrl,
@NonNull String privacyPolicyUrl) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add a Preconditions check in here to check the non-null-ness since @NonNull is just an IDE hint.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Preconditions.checkNotNull(tosUrl, "tosUrl cannot be null");
Preconditions.checkNotNull(privacyPolicyUrl, "privacyPolicyUrl cannot be null");
mTosUrl = tosUrl;
mPrivacyPolicyUrl = privacyPolicyUrl;
return (T) this;
}

/**
* Specified the set of supported authentication providers. At least one provider must be
* specified. There may only be one instance of each provider.
Expand Down
12 changes: 0 additions & 12 deletions auth/src/main/java/com/firebase/ui/auth/util/data/PrivacyDisclosureUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ private static int getGlobalTermsStringResource(FlowParameters flowParameters) {

if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
return R.string.fui_tos_and_pp;
} else if (termsOfServiceUrlProvided) {
return R.string.fui_tos_only;
} else if (privacyPolicyUrlProvided) {
return R.string.fui_pp_only;
}

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

if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
return R.string.fui_tos_and_pp_footer;
} else if (termsOfServiceUrlProvided) {
return R.string.fui_tos_footer;
} else if (privacyPolicyUrlProvided) {
return R.string.fui_pp_footer;
}

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

if (termsOfServiceUrlProvided && privacyPolicyUrlProvided) {
return R.string.fui_sms_terms_of_service_and_privacy_policy_extended;
} else if (termsOfServiceUrlProvided) {
return R.string.fui_sms_terms_of_service_only_extended;
} else if (privacyPolicyUrlProvided) {
return R.string.fui_sms_privacy_policy_only_extended;
}

return NO_TOS_OR_PP;
Expand Down
31 changes: 1 addition & 30 deletions auth/src/main/java/com/firebase/ui/auth/util/ui/PreambleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@ private void initPreamble(@StringRes int textViewText) {
mBuilder = new SpannableStringBuilder(withTargets);

replaceTarget(BTN_TARGET, mButtonText);
replaceUrlTarget(
TOS_TARGET,
R.string.fui_terms_of_service,
mFlowParameters.termsOfServiceUrl);
replaceUrlTarget(TOS_TARGET, R.string.fui_terms_of_service, mFlowParameters.termsOfServiceUrl);
replaceUrlTarget(PP_TARGET, R.string.fui_privacy_policy, mFlowParameters.privacyPolicyUrl);
}

Expand Down Expand Up @@ -109,36 +106,10 @@ private String getPreambleStringWithTargets(@StringRes int textViewText, boolean
new Object[]{BTN_TARGET, TOS_TARGET, PP_TARGET}
: new Object[]{TOS_TARGET, PP_TARGET};
return mContext.getString(textViewText, targets);
} else if (termsOfServiceUrlProvided) {
Object[] targets = hasButton ?
new Object[]{BTN_TARGET, TOS_TARGET} : new Object[]{TOS_TARGET};
return mContext.getString(textViewText, targets);
} else if (privacyPolicyUrlProvided) {
Object[] targets = hasButton ?
new Object[]{BTN_TARGET, PP_TARGET} : new Object[]{PP_TARGET};
return mContext.getString(textViewText, targets);
}
return null;
}

@Nullable
private String getPreambleStringWithTargetsNoButton(@StringRes int textViewText) {
boolean hasTos = !TextUtils.isEmpty(mFlowParameters.termsOfServiceUrl);
boolean hasPp = !TextUtils.isEmpty(mFlowParameters.privacyPolicyUrl);
if (hasTos && hasPp) {
return mContext.getString(textViewText,
TOS_TARGET, PP_TARGET);
} else if (hasTos) {
return mContext.getString(textViewText,
TOS_TARGET);
} else if (hasPp) {
return mContext.getString(textViewText,
PP_TARGET);
}
return null;
}


private class CustomTabsSpan extends ClickableSpan {
private final String mUrl;
private final CustomTabsIntent mCustomTabsIntent;
Expand Down
6 changes: 0 additions & 6 deletions auth/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">جارٍ التحميل…</string>
<string name="fui_sign_in_default">تسجيل الدخول</string>
<string name="fui_tos_and_pp">تشير المتابعة إلى موافقتك على %1$s و%2$s.</string>
<string name="fui_tos_only">تشير المتابعة إلى موافقتك على %1$s.</string>
<string name="fui_pp_only">تشير المتابعة إلى موافقتك على %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">متابعة</string>
<string name="fui_sms_terms_of_service">عند النقر على “%1$s”، قد يتمّ إرسال رسالة قصيرة SMS وقد يتمّ تطبيق رسوم الرسائل والبيانات.</string>
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s و%3$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
<string name="fui_sms_terms_of_service_only_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
<string name="fui_sms_privacy_policy_only_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-b+es+419/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">Cargando…</string>
<string name="fui_sign_in_default">Acceder</string>
<string name="fui_tos_and_pp">Si continúas, indicas que aceptas nuestras %1$s y %2$s.</string>
<string name="fui_tos_only">Si continúas, indicas que aceptas nuestras %1$s.</string>
<string name="fui_pp_only">Si continúas, indicas que aceptas nuestras %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s     %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">Continuar</string>
<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>
<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>
<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>
<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>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">Зарежда се…</string>
<string name="fui_sign_in_default">Вход</string>
<string name="fui_tos_and_pp">Продължавайки, приемате нашите %1$s и %2$s.</string>
<string name="fui_tos_only">Продължавайки, приемате нашите %1$s.</string>
<string name="fui_pp_only">Продължавайки, приемате нашата %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s     %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">Напред</string>
<string name="fui_sms_terms_of_service">Докосвайки „%1$s“, може да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">Докосвайки „%1$s“, приемате нашите %2$s и %3$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
<string name="fui_sms_terms_of_service_only_extended">Докосвайки „%1$s“, приемате нашите %2$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
<string name="fui_sms_privacy_policy_only_extended">Докосвайки „%1$s“, приемате нашата %2$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-bn/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">লোড হচ্ছে…</string>
<string name="fui_sign_in_default">সাইন-ইন করুন</string>
<string name="fui_tos_and_pp">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s এবং %2$s-এর সাথে সম্মত।</string>
<string name="fui_tos_only">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s-এর সাথে সম্মত।</string>
<string name="fui_pp_only">চালিয়ে যাওয়ার অর্থ, আপনি আমাদের %1$s-এর সাথে সম্মত।</string>
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">চালিয়ে যান</string>
<string name="fui_sms_terms_of_service">%1$s এ ট্যাপ করলে আপনি একটি এসএমএস পাঠাতে পারেন। মেসেজ ও ডেটার চার্জ প্রযোজ্য।</string>
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s এবং %3$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
<string name="fui_sms_terms_of_service_only_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
<string name="fui_sms_privacy_policy_only_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-ca/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">S\'està carregant…</string>
<string name="fui_sign_in_default">Inicia la sessió</string>
<string name="fui_tos_and_pp">En continuar, acceptes les nostres %1$s i la nostra %2$s.</string>
<string name="fui_tos_only">En continuar, acceptes les nostres %1$s.</string>
<string name="fui_pp_only">En continuar, acceptes la nostra %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">Continua</string>
<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>
<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>
<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>
<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>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">Načítání…</string>
<string name="fui_sign_in_default">Přihlásit se</string>
<string name="fui_tos_and_pp">Budete-li pokračovat, vyjadřujete svůj souhlas s dokumenty %1$s a %2$s.</string>
<string name="fui_tos_only">Budete-li pokračovat, vyjadřujete svůj souhlas s dokumentem %1$s.</string>
<string name="fui_pp_only">Budete-li pokračovat, vyjadřujete svůj souhlas s dokumentem %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">Pokračovat</string>
<string name="fui_sms_terms_of_service">Po klepnutí na možnost %1$s může být odeslána SMS. Mohou být účtovány poplatky za zprávy a data.</string>
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">Klepnutím na tlačítko %1$s vyjadřujete svůj souhlas s dokumenty %2$s a %3$s. Může být odeslána SMS a mohou být účtovány poplatky za zprávy a data.</string>
<string name="fui_sms_terms_of_service_only_extended">Klepnutím na tlačítko %1$s vyjadřujete svůj souhlas s dokumentem %2$s. Může být odeslána SMS a mohou být účtovány poplatky za zprávy a data.</string>
<string name="fui_sms_privacy_policy_only_extended">Klepnutím na tlačítko %1$s vyjadřujete svůj souhlas s dokumentem %2$s. Může být odeslána SMS a mohou být účtovány poplatky za zprávy a data.</string>
</resources>
6 changes: 0 additions & 6 deletions auth/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
<string name="fui_progress_dialog_loading">Indlæser…</string>
<string name="fui_sign_in_default">Log ind</string>
<string name="fui_tos_and_pp">Ved at fortsætte indikerer du, at du accepterer vores %1$s og %2$s.</string>
<string name="fui_tos_only">Ved at fortsætte indikerer du, at du accepterer vores %1$s.</string>
<string name="fui_pp_only">Ved at fortsætte indikerer du, at du accepterer vores %1$s.</string>
<string name="fui_tos_and_pp_footer">%1$s \u00A0 \u00A0 %2$s</string>
<string name="fui_tos_footer">%1$s</string>
<string name="fui_pp_footer">%1$s</string>
<string name="fui_idp_name_google">Google</string>
<string name="fui_idp_name_facebook">Facebook</string>
<string name="fui_idp_name_twitter">Twitter</string>
Expand Down Expand Up @@ -69,6 +65,4 @@
<string name="fui_continue_phone_login">Fortsæt</string>
<string name="fui_sms_terms_of_service">Når du trykker på “%1$s”, sendes der måske en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
<string name="fui_sms_terms_of_service_and_privacy_policy_extended">Når du trykker på “%1$s”, indikerer du, at du accepterer vores %2$s og %3$s. Der sendes måske en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
<string name="fui_sms_terms_of_service_only_extended">Når du trykker på “%1$s”, indikerer du, at du accepterer vores %2$s. Der sendes måske en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
<string name="fui_sms_privacy_policy_only_extended">Når du trykker på “%1$s”, indikerer du, at du accepterer vores %2$s. Der sendes måske en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
</resources>
Loading