Skip to content

Commit f757896

Browse files
authored
Merge pull request #682 from xuaninbox/master
Revert "Don't use password autofill if Performance is linked"
2 parents 4f0aaa5 + 6c34f68 commit f757896

File tree

7 files changed

+7
-30
lines changed

7 files changed

+7
-30
lines changed

Auth/FirebaseAuthUI/FUIAuthUtils.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,4 @@ extern NSString *const FUIAuthBundleName;
4949
*/
5050
+ (UIImage *)imageNamed:(NSString *)name fromBundle:(nullable NSBundle *)bundle;
5151

52-
/** @fn isFirebasePerformanceAvailable
53-
* @brief Used to work around https://github.com/firebase/firebase-ios-sdk/issues/2283
54-
*/
55-
+ (BOOL)isFirebasePerformanceAvailable;
56-
5752
@end

Auth/FirebaseAuthUI/FUIAuthUtils.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,4 @@ + (UIImage *)imageNamed:(NSString *)name fromBundleNameOrNil:(nullable NSString
5656
return [UIImage imageWithContentsOfFile:path];
5757
}
5858

59-
+ (BOOL)isFirebasePerformanceAvailable {
60-
return NSClassFromString(@"FIRPerformance") != nil;
61-
}
62-
6359
@end

EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
291291
cell.textField.returnKeyType = UIReturnKeyNext;
292292
cell.textField.keyboardType = UIKeyboardTypeEmailAddress;
293293
if (@available(iOS 11.0, *)) {
294-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
295-
cell.textField.textContentType = UITextContentTypeUsername;
296-
}
294+
cell.textField.textContentType = UITextContentTypeUsername;
297295
}
298296
[cell.textField addTarget:self
299297
action:@selector(textFieldDidChange)

EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
182182
_emailField.autocorrectionType = UITextAutocorrectionTypeNo;
183183
_emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
184184
if (@available(iOS 11.0, *)) {
185-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
186-
_emailField.textContentType = UITextContentTypeUsername;
187-
}
185+
_emailField.textContentType = UITextContentTypeUsername;
188186
}
189187
[cell.textField addTarget:self
190188
action:@selector(textFieldDidChange)

EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
258258
_emailField.autocorrectionType = UITextAutocorrectionTypeNo;
259259
_emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
260260
if (@available(iOS 11.0, *)) {
261-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
262-
_emailField.textContentType = UITextContentTypeUsername;
263-
}
261+
_emailField.textContentType = UITextContentTypeUsername;
264262
}
265263
} else if (indexPath.row == 1) {
266264
cell.label.text = FUILocalizedString(kStr_Password);
@@ -270,9 +268,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
270268
_passwordField.returnKeyType = UIReturnKeyNext;
271269
_passwordField.keyboardType = UIKeyboardTypeDefault;
272270
if (@available(iOS 11.0, *)) {
273-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
274-
_passwordField.textContentType = UITextContentTypePassword;
275-
}
271+
_passwordField.textContentType = UITextContentTypePassword;
276272
}
277273
}
278274
[cell.textField addTarget:self

EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
268268
_emailField.autocorrectionType = UITextAutocorrectionTypeNo;
269269
_emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
270270
if (@available(iOS 11.0, *)) {
271-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
272-
_emailField.textContentType = UITextContentTypeUsername;
273-
}
271+
_emailField.textContentType = UITextContentTypeUsername;
274272
}
275273
} else if (indexPath.row == 1) {
276274
cell.label.text = FUILocalizedString(kStr_Name);
@@ -294,9 +292,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
294292
_passwordField.returnKeyType = UIReturnKeyNext;
295293
_passwordField.keyboardType = UIKeyboardTypeDefault;
296294
if (@available(iOS 11.0, *)) {
297-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
298-
_passwordField.textContentType = UITextContentTypePassword;
299-
}
295+
_passwordField.textContentType = UITextContentTypePassword;
300296
}
301297
}
302298
[cell.textField addTarget:self

EmailAuth/FirebaseEmailAuthUI/FUIPasswordVerificationViewController.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
222222
_passwordField.returnKeyType = UIReturnKeyNext;
223223
_passwordField.keyboardType = UIKeyboardTypeDefault;
224224
if (@available(iOS 11.0, *)) {
225-
if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
226-
_passwordField.textContentType = UITextContentTypePassword;
227-
}
225+
_passwordField.textContentType = UITextContentTypePassword;
228226
}
229227
[cell.textField addTarget:self
230228
action:@selector(textFieldDidChange)

0 commit comments

Comments
 (0)