Added main ToS/PP

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

@@ -21,6 +21,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.StyleRes;
+import android.text.TextUtils;
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.util.ExtraConstants;
@@ -128,4 +129,16 @@ public FlowParameters[] newArray(int size) {
             return new FlowParameters[size];
         }
     };
+
+    public boolean isSingleProviderFlow() {
+        return providerInfo.size() == 1;
+    }
+
+    public boolean isTermsOfServiceUrlProvided() {
+        return !TextUtils.isEmpty(termsOfServiceUrl);
+    }
+
+    public boolean isPrivacyPolicyUrlProvided() {
+        return !TextUtils.isEmpty(privacyPolicyUrl);
+    }
 }

auth/src/main/java/com/firebase/ui/auth/data/remote/SignInKickstarter.java

@@ -91,11 +91,9 @@ public void onComplete(@NonNull Task<CredentialRequestResponse> task) {
     }
 
     private void startAuthMethodChoice() {
-        List<AuthUI.IdpConfig> idpConfigs = getArguments().providerInfo;
-
         // If there is only one provider selected, launch the flow directly
-        if (idpConfigs.size() == 1) {
-            AuthUI.IdpConfig firstIdpConfig = idpConfigs.get(0);
+        if (getArguments().isSingleProviderFlow()) {
+            AuthUI.IdpConfig firstIdpConfig = getArguments().providerInfo.get(0);
             String firstProvider = firstIdpConfig.getProviderId();
             switch (firstProvider) {
                 case EmailAuthProvider.PROVIDER_ID:

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

@@ -13,11 +13,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.firebase.ui.auth.R;
+import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.auth.util.ui.fieldvalidators.EmailFieldValidator;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
@@ -96,6 +99,21 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         }
 
         view.findViewById(R.id.button_next).setOnClickListener(this);
+
+        TextView termsText = view.findViewById(R.id.email_tos_and_pp_text);
+        TextView footerText = view.findViewById(R.id.email_footer_tos_and_pp_text);
+        FlowParameters flowParameters = getFlowParams();
+
+        if (flowParameters.isSingleProviderFlow()) {
+            PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(getContext(),
+                    flowParameters,
+                    termsText);
+        } else {
+            termsText.setVisibility(View.GONE);
+            PrivacyDisclosureUtils.setupTermsOfServiceFooter(getContext(),
+                    flowParameters,
+                    footerText);
+        }
     }
 
     @Override

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

@@ -20,9 +20,9 @@
 import com.firebase.ui.auth.data.model.User;
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.firebase.ui.auth.util.ui.ImeHelper;
-import com.firebase.ui.auth.util.ui.PreambleHandler;
 import com.firebase.ui.auth.util.ui.fieldvalidators.BaseValidator;
 import com.firebase.ui.auth.util.ui.fieldvalidators.EmailFieldValidator;
 import com.firebase.ui.auth.util.ui.fieldvalidators.NoOpValidator;
@@ -80,7 +80,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             @Override
             protected void onSuccess(@NonNull IdpResponse response) {
                 startSaveCredentials(
-                        mHandler.getCurrentUser(), response, mPasswordEditText.getText().toString());
+                        mHandler.getCurrentUser(),
+                        response,
+                        mPasswordEditText.getText().toString());
             }
 
             @Override
@@ -140,16 +142,17 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         // Only show the name field if required
         nameInput.setVisibility(requireName ? View.VISIBLE : View.GONE);
 
-        PreambleHandler.setup(
-                getContext(),
-                getFlowParams(),
-                R.string.fui_button_text_save,
-                view.<TextView>findViewById(R.id.create_account_text));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && getFlowParams().enableCredentials) {
             mEmailEditText.setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO);
         }
 
-        if (savedInstanceState != null) { return; }
+        TextView footerText = view.findViewById(R.id.email_footer_tos_and_pp_text);
+        PrivacyDisclosureUtils.setupTermsOfServiceFooter(getContext(), getFlowParams(), footerText);
+
+        // WARNING: Nothing below this line will be executed on rotation
+        if (savedInstanceState != null) {
+            return;
+        }
 
         // If email is passed in, fill in the field and move down to the name field.
         String email = mUser.getEmail();
@@ -233,11 +236,11 @@ private void validateAndRegisterUser() {
         boolean nameValid = mNameValidator.validate(name);
         if (emailValid && passwordValid && nameValid) {
             mHandler.startSignIn(new IdpResponse.Builder(
-                    new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
-                            .setName(name)
-                            .setPhotoUri(mUser.getPhotoUri())
-                            .build())
-                    .build(),
+                            new User.Builder(EmailAuthProvider.PROVIDER_ID, email)
+                                    .setName(name)
+                                    .setPhotoUri(mUser.getPhotoUri())
+                                    .build())
+                            .build(),
                     password);
         }
     }

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -28,6 +28,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.firebase.ui.auth.AuthUI;
@@ -42,6 +43,7 @@
 import com.firebase.ui.auth.data.remote.PhoneSignInHandler;
 import com.firebase.ui.auth.data.remote.TwitterSignInHandler;
 import com.firebase.ui.auth.ui.AppCompatBase;
+import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.viewmodel.ResourceObserver;
 import com.firebase.ui.auth.viewmodel.idp.ProviderSignInBase;
 import com.firebase.ui.auth.viewmodel.idp.SocialProviderResponseHandler;
@@ -106,6 +108,11 @@ protected void onFailure(@NonNull Exception e) {
                 }
             }
         });
+
+        TextView termsText = findViewById(R.id.main_tos_and_pp);
+        PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicyText(this,
+                getFlowParams(),
+                termsText);
     }
 
     private void populateIdpList(List<IdpConfig> providerConfigs,

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java

@@ -91,7 +91,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             mPhoneNumber = savedInstanceState.getString(KEY_VERIFICATION_PHONE);
 
             if (savedInstanceState.getSerializable(KEY_STATE) != null) {
-                mVerificationState = (VerificationState) savedInstanceState.getSerializable(KEY_STATE);
+                mVerificationState = (VerificationState) savedInstanceState.getSerializable(
+                        KEY_STATE);
             }
             return;
         }
@@ -165,7 +166,8 @@ public void submitConfirmationCode(@NonNull String confirmationCode) {
             // See: https://github.com/firebase/FirebaseUI-Android/issues/922
             Log.w(PHONE_VERIFICATION_LOG_TAG,
                     String.format("submitConfirmationCode: mVerificationId is %s ; " +
-                            "confirmationCode is %s", TextUtils.isEmpty(mVerificationId) ? "empty" : "not empty",
+                                    "confirmationCode is %s",
+                            TextUtils.isEmpty(mVerificationId) ? "empty" : "not empty",
                             TextUtils.isEmpty(confirmationCode) ? "empty" : "not empty"));
             return;
         }
@@ -311,7 +313,8 @@ private void showAlertDialog(@StringRes int messageId,
         String s = getString(messageId);
         mAlertDialog = new AlertDialog.Builder(this)
                 .setMessage(s)
-                .setPositiveButton(R.string.fui_incorrect_code_dialog_positive_button_text, onClickListener)
+                .setPositiveButton(R.string.fui_incorrect_code_dialog_positive_button_text,
+                        onClickListener)
                 .show();
     }
 
@@ -351,7 +354,8 @@ public void onFailure(@NonNull Exception e) {
                                             R.string.fui_incorrect_code_dialog_body,
                                             new DialogInterface.OnClickListener() {
                                                 @Override
-                                                public void onClick(DialogInterface dialog, int which) {
+                                                public void onClick(DialogInterface dialog,
+                                                                    int which) {
                                                     getSubmitConfirmationCodeFragment()
                                                             .setConfirmationCode("");
                                                 }
@@ -362,7 +366,8 @@ public void onClick(DialogInterface dialog, int which) {
                                             R.string.fui_error_session_expired,
                                             new DialogInterface.OnClickListener() {
                                                 @Override
-                                                public void onClick(DialogInterface dialog, int which) {
+                                                public void onClick(DialogInterface dialog,
+                                                                    int which) {
                                                     getSubmitConfirmationCodeFragment()
                                                             .setConfirmationCode("");
                                                 }

auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java

@@ -34,9 +34,9 @@
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.util.CustomCountDownTimer;
 import com.firebase.ui.auth.util.ExtraConstants;
+import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.util.ui.BucketedTextChangeListener;
 import com.firebase.ui.auth.util.ui.ImeHelper;
-import com.firebase.ui.auth.util.ui.PreambleHandler;
 
 /**
  * Display confirmation code to verify phone numbers input in {{@link VerifyPhoneNumberFragment}}
@@ -56,7 +56,6 @@ public class SubmitConfirmationCodeFragment extends FragmentBase {
     private Button mSubmitConfirmationButton;
     private CustomCountDownTimer mCountdownTimer;
     private PhoneActivity mVerifier;
-    private TextView mAgreementText;
     private long mMillisUntilFinished;
 
     public static SubmitConfirmationCodeFragment newInstance(FlowParameters flowParameters,
@@ -73,8 +72,9 @@ public static SubmitConfirmationCodeFragment newInstance(FlowParameters flowPara
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable
-            Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fui_confirmation_code_layout, container, false);
         FragmentActivity parentActivity = getActivity();
 
@@ -83,7 +83,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         mResendCodeTextView = v.findViewById(R.id.resend_code);
         mConfirmationCodeEditText = v.findViewById(R.id.confirmation_code);
         mSubmitConfirmationButton = v.findViewById(R.id.submit_confirmation_code);
-        mAgreementText = v.findViewById(R.id.create_account_tos);
 
         final String phoneNumber = getArguments().getString(ExtraConstants.PHONE);
 
@@ -93,10 +92,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         setupCountDown(RESEND_WAIT_MILLIS);
         setupSubmitConfirmationCodeButton();
         setupResendConfirmationCodeTextView(phoneNumber);
-        setUpTermsOfService();
         return v;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        TextView footerText = view.<TextView>findViewById(R.id.email_footer_tos_and_pp_text);
+        PrivacyDisclosureUtils.setupTermsOfServiceFooter(getContext(), getFlowParams(), footerText);
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -221,13 +226,6 @@ private void cancelTimer() {
         }
     }
 
-    private void setUpTermsOfService() {
-        PreambleHandler.setup(getContext(),
-                getFlowParams(),
-                R.string.fui_continue_phone_login,
-                mAgreementText);
-    }
-
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     CustomCountDownTimer getCountdownTimer() {
         return mCountdownTimer;

auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java

@@ -41,6 +41,7 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.data.PhoneNumberUtils;
+import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.auth.viewmodel.RequestCodes;
 import com.google.android.gms.auth.api.credentials.Credential;
@@ -55,7 +56,6 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class VerifyPhoneNumberFragment extends FragmentBase implements View.OnClickListener {
     public static final String TAG = "VerifyPhoneFragment";
-
     private Context mAppContext;
 
     private CountryListSpinner mCountryListSpinner;
@@ -107,15 +107,14 @@ public void onDonePressed() {
         parentActivity.setTitle(getString(R.string.fui_verify_phone_number_title));
         setupCountrySpinner();
         setupSendCodeButton();
-        setupTerms();
-
         return v;
     }
 
-    private void setupTerms() {
-        final String verifyPhoneButtonText = getString(R.string.fui_verify_phone_number);
-        final String terms = getString(R.string.fui_sms_terms_of_service, verifyPhoneButtonText);
-        mSmsTermsText.setText(terms);
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        TextView footerText = view.<TextView>findViewById(R.id.email_footer_tos_and_pp_text);
+        setupPrivacyDisclosures(footerText);
     }
 
     @Override
@@ -273,6 +272,24 @@ private void setCountryCode(PhoneNumber phoneNumber) {
         }
     }
 
+    private void setupPrivacyDisclosures(TextView footerText) {
+        final String verifyPhoneButtonText = getString(R.string.fui_verify_phone_number);
+        final String multipleProviderFlowText = getString(R.string.fui_sms_terms_of_service,
+                verifyPhoneButtonText);
+        FlowParameters flowParameters = getFlowParams();
+
+        if (flowParameters.isSingleProviderFlow()) {
+            PrivacyDisclosureUtils.setupTermsOfServiceAndPrivacyPolicySmsText(getContext(),
+                    flowParameters,
+                    mSmsTermsText);
+        } else {
+            PrivacyDisclosureUtils.setupTermsOfServiceFooter(getContext(),
+                    flowParameters,
+                    footerText);
+            mSmsTermsText.setText(multipleProviderFlowText);
+        }
+    }
+
     void showError(String e) {
         mPhoneInputLayout.setError(e);
     }