Merge pull request #475 from morganchen12/master

Fix issue where FUIAuthPickerViewController always used default authUI for TOS/PP

Author: morganchen12

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode9.3
+osx_image: xcode9.4
 language: objective-c
 xcode_workspace: FirebaseUI.xcworkspace
 xcode_scheme: FirebaseUI

FirebaseAuthUI/FUIAuthPickerViewController.m

@@ -140,12 +140,12 @@ - (void)viewDidLoad {
 }
 
 - (NSAttributedString *)privacyPolicyAndTOS {
-  if (![FUIAuth defaultAuthUI].TOSURL.absoluteString.length &&
-      ![FUIAuth defaultAuthUI].privacyPolicyURL.absoluteString.length) {
+  if (!self.authUI.TOSURL.absoluteString.length &&
+      !self.authUI.privacyPolicyURL.absoluteString.length) {
     return nil;
   }
-  if (![FUIAuth defaultAuthUI].TOSURL.absoluteString.length ||
-    ![FUIAuth defaultAuthUI].privacyPolicyURL.absoluteString.length) {
+  if (!self.authUI.TOSURL.absoluteString.length ||
+    !self.authUI.privacyPolicyURL.absoluteString.length) {
     NSLog(@"The terms of service and privacy policy URLs for your app must be provided together. Pl"
         "ease set the terms of service policy using [FUIAuth defaultAuthUI].TOSURL and the privacy"
         " policy URL using [FUIAuth defaultAuthUI].privacyPolicyURL");
@@ -162,15 +162,15 @@ - (NSAttributedString *)privacyPolicyAndTOS {
 
   if (TOSRange.length) {
     [attributedLinkText addAttribute:NSLinkAttributeName
-                               value:[FUIAuth defaultAuthUI].TOSURL
+                               value:self.authUI.TOSURL
                                range:TOSRange];
   }
   NSRange privacyPolicyRange =
     [privacyPolicyAndTOSString rangeOfString:FUILocalizedString(kStr_PrivacyPolicy)];
 
   if (privacyPolicyRange.length) {
     [attributedLinkText addAttribute:NSLinkAttributeName
-                               value:[FUIAuth defaultAuthUI].privacyPolicyURL
+                               value:self.authUI.privacyPolicyURL
                                range:privacyPolicyRange];
   }
   return attributedLinkText;