Merge "fix the terms of service url"

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/ui/credentials/ChooseAccountActivity.java

@@ -132,13 +132,15 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 startActivityForResult(AuthMethodPickerActivity.createIntent(
                         getApplicationContext(),
                         mAppName,
+                        mTermsOfServiceUrl,
                         mProviderParcels
                 ), RC_AUTH_METHOD_PICKER);
             }
         } else {
             startActivityForResult(AuthMethodPickerActivity.createIntent(
                     getApplicationContext(),
                     mAppName,
+                    mTermsOfServiceUrl,
                     mProviderParcels
             ), RC_AUTH_METHOD_PICKER);
         }
@@ -164,6 +166,7 @@ public void onFailure(@NonNull Exception ex) {
                                 startActivity(AuthMethodPickerActivity.createIntent(
                                         getApplicationContext(),
                                         mAppName,
+                                        mTermsOfServiceUrl,
                                         mProviderParcels
                                 ));
                                 finish(RESULT_OK, new Intent());
@@ -200,6 +203,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     AuthMethodPickerActivity.createIntent(
                         getApplicationContext(),
                         mAppName,
+                        mTermsOfServiceUrl,
                         mProviderParcels), RC_AUTH_METHOD_PICKER);
             } else if (resultCode == RESULT_FIRST_USER) {
                 // TODO: (serikb) figure out flow
@@ -237,6 +241,7 @@ protected void redirectToIdpSignIn(
                 nextIntent = AuthMethodPickerActivity.createIntent(
                         this,
                         mAppName,
+                        mTermsOfServiceUrl,
                         providers
                 );
         }

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

@@ -62,6 +62,7 @@ private void startEmailHandler(String email, List<String> providers) {
             Intent registerIntent = RegisterEmailActivity.createIntent(
                     AcquireEmailActivity.this,
                     email,
+                    mTermsOfServiceUrl,
                     mAppName
             );
             startActivityForResult(registerIntent, RC_REGISTER_ACCOUNT);

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

@@ -49,7 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 e.printStackTrace();
             }
         }
-        finish(BaseActivity.RESULT_CANCELED, new Intent());
+        finish(RESULT_CANCELED, new Intent());
         return;
     }
 
@@ -65,6 +65,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                                 this,
                                 null,
                                 mAppName,
+                                mTermsOfServiceUrl,
                                 mProviderParcels
                                 ),
                         RC_SIGN_IN);
@@ -78,9 +79,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     public static Intent getInitIntent(
             Context context,
             String appName,
+            String tosUrl,
             ArrayList<IDPProviderParcel> providers) {
         return new Intent(context, EmailHintContainerActivity.class)
                 .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
+                .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, tosUrl)
                 .putExtra(ControllerConstants.EXTRA_PROVIDERS, providers);
     }
 }

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

@@ -102,9 +102,11 @@ protected void onCreate(Bundle savedInstanceState) {
     public static Intent createIntent(
             Context context,
             String email,
+            String tosUrl,
             String appName) {
        return new Intent(context, RegisterEmailActivity.class)
                .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
+               .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, tosUrl)
                .putExtra(ControllerConstants.EXTRA_EMAIL, email);
     }
 

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

@@ -59,11 +59,13 @@ public static Intent createIntent(
             Context context,
             String email,
             String appName,
+            String tosUrl,
             ArrayList<IDPProviderParcel> providers
     ) {
         return new Intent(context, SignInNoPasswordActivity.class)
                 .putExtra(ControllerConstants.EXTRA_EMAIL, email)
                 .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
+                .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, tosUrl)
                 .putExtra(ControllerConstants.EXTRA_PROVIDERS, providers);
     }
 

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

@@ -160,6 +160,7 @@ public void onClick(View view) {
             Intent intent = EmailHintContainerActivity.getInitIntent(
                     this,
                     mAppName,
+                    mTermsOfServiceUrl,
                     mProviderParcels
             );
             startActivityForResult(intent, RC_EMAIL_FLOW);
@@ -174,10 +175,11 @@ public void onClick(View view) {
      * @return The intent to start the authentication picker activity.
      */
     public static Intent createIntent(
-            Context context, String appName, ArrayList<IDPProviderParcel> parcels) {
+            Context context, String appName, String tosUrl, ArrayList<IDPProviderParcel> parcels) {
         return new Intent()
                 .setClass(context, AuthMethodPickerActivity.class)
                 .putExtra(ControllerConstants.EXTRA_APP_NAME, appName)
+                .putExtra(ControllerConstants.EXTRA_TERMS_OF_SERVICE_URL, tosUrl)
                 .putParcelableArrayListExtra(ControllerConstants.EXTRA_PROVIDERS, parcels);
     }
 }