Merge pull request #607 from firebase/otp

morganchen12 · web-flow · commit b8532438d4db · 2019-02-05T13:47:52.000-08:00
Support OTP when targeting earlier versions of the iOS SDK
diff --git a/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m b/PhoneAuth/FirebasePhoneAuthUI/FUICodeField.m
@@ -59,11 +59,9 @@ - (void)setUpFromNib {
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   self.inputField.userInteractionEnabled = YES;
 
-#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0
   if (@available(iOS 12.0, *)) {
     self.inputField.textContentType = UITextContentTypeOneTimeCode;
   }
-#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0
 
   // Initialization code
   _codeEntry = [NSMutableString string];
@@ -175,11 +173,9 @@ - (CGSize)intrinsicContentSize {
 }
 
 - (UITextContentType _Null_unspecified)textContentType {
-#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0
   if (@available(iOS 12.0, *)) {
     return UITextContentTypeOneTimeCode;
   }
-#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0
   return nil;
 }
 
diff --git a/UITests/FirebaseUISample.xcodeproj/project.pbxproj b/UITests/FirebaseUISample.xcodeproj/project.pbxproj
@@ -600,6 +600,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -659,6 +660,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,9 @@ - (void)setUpFromNib {`
`59`	`59`	`UIViewAutoresizingFlexibleWidth \| UIViewAutoresizingFlexibleHeight;`
`60`	`60`	`self.inputField.userInteractionEnabled = YES;`
`61`	`61`
`62`		`-#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0`
`63`	`62`	`if (@available(iOS 12.0, *)) {`
`64`	`63`	`self.inputField.textContentType = UITextContentTypeOneTimeCode;`
`65`	`64`	`}`
`66`		`-#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0`
`67`	`65`
`68`	`66`	`// Initialization code`
`69`	`67`	`_codeEntry = [NSMutableString string];`
`@@ -175,11 +173,9 @@ - (CGSize)intrinsicContentSize {`
`175`	`173`	`}`
`176`	`174`
`177`	`175`	`- (UITextContentType _Null_unspecified)textContentType {`
`178`		`-#if __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0`
`179`	`176`	`if (@available(iOS 12.0, *)) {`
`180`	`177`	`return UITextContentTypeOneTimeCode;`
`181`	`178`	`}`
`182`		`-#endif // __IPHONE_OS_MIN_VERSION_REQUIRED > __IPHONE_12_0`
`183`	`179`	`return nil;`
`184`	`180`	`}`
`185`	`181`