Skip to content

Commit a1a24cf

Browse files
authored
Fix runtime warnings detected by Xcode 15 b3 (#11518)
1 parent 1fb9fdc commit a1a24cf

10 files changed

+41
-27
lines changed

FirebaseAuth/Sources/Swift/AuthProvider/EmailAuthProvider.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ class EmailAuthCredential: AuthCredential, NSSecureCoding {
7878
}
7979

8080
public required init?(coder: NSCoder) {
81-
guard let email = coder.decodeObject(forKey: "email") as? String else {
81+
guard let email = coder.decodeObject(of: NSString.self, forKey: "email") as? String else {
8282
return nil
8383
}
8484
self.email = email
85-
if let password = coder.decodeObject(forKey: "password") as? String {
85+
if let password = coder.decodeObject(of: NSString.self, forKey: "password") as? String {
8686
emailType = .password(password)
87-
} else if let link = coder.decodeObject(forKey: "link") as? String {
87+
} else if let link = coder.decodeObject(of: NSString.self, forKey: "link") as? String {
8888
emailType = .link(link)
8989
} else {
9090
return nil

FirebaseAuth/Sources/Swift/AuthProvider/FacebookAuthProvider.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ import Foundation
5757
}
5858

5959
required init?(coder: NSCoder) {
60-
guard let accessToken = coder.decodeObject(forKey: "accessToken") as? String else {
60+
guard let accessToken = coder.decodeObject(of: NSString.self, forKey: "accessToken") as? String
61+
else {
6162
return nil
6263
}
6364
self.accessToken = accessToken

FirebaseAuth/Sources/Swift/AuthProvider/GameCenterAuthProvider.swift

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,20 @@
160160
}
161161

162162
public required init?(coder: NSCoder) {
163-
guard let playerID = coder.decodeObject(forKey: "playerID") as? String,
164-
let teamPlayerID = coder.decodeObject(forKey: "teamPlayerID") as? String,
165-
let gamePlayerID = coder.decodeObject(forKey: "gamePlayerID") as? String,
163+
guard let playerID = coder.decodeObject(of: NSString.self, forKey: "playerID") as? String,
164+
let teamPlayerID = coder.decodeObject(
165+
of: NSString.self,
166+
forKey: "teamPlayerID"
167+
) as? String,
168+
let gamePlayerID = coder.decodeObject(
169+
of: NSString.self,
170+
forKey: "gamePlayerID"
171+
) as? String,
166172
let timestamp = coder.decodeObject(forKey: "timestamp") as? UInt64,
167-
let displayName = coder.decodeObject(forKey: "displayName") as? String else {
173+
let displayName = coder.decodeObject(
174+
of: NSString.self,
175+
forKey: "displayName"
176+
) as? String else {
168177
return nil
169178
}
170179
self.playerID = playerID
@@ -173,8 +182,8 @@
173182
self.timestamp = timestamp
174183
self.displayName = displayName
175184
publicKeyURL = coder.decodeObject(forKey: "publicKeyURL") as? URL
176-
signature = coder.decodeObject(forKey: "signature") as? Data
177-
salt = coder.decodeObject(forKey: "salt") as? Data
185+
signature = coder.decodeObject(of: NSData.self, forKey: "signature") as? Data
186+
salt = coder.decodeObject(of: NSData.self, forKey: "salt") as? Data
178187
super.init(provider: GameCenterAuthProvider.id)
179188
}
180189
}

FirebaseAuth/Sources/Swift/AuthProvider/GitHubAuthProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class GitHubAuthCredential: AuthCredential, NSSecureCoding {
5757
}
5858

5959
required init?(coder: NSCoder) {
60-
guard let token = coder.decodeObject(forKey: "token") as? String else {
60+
guard let token = coder.decodeObject(of: NSString.self, forKey: "token") as? String else {
6161
return nil
6262
}
6363
self.token = token

FirebaseAuth/Sources/Swift/AuthProvider/GoogleAuthProvider.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ import Foundation
6363
}
6464

6565
required init?(coder: NSCoder) {
66-
guard let idToken = coder.decodeObject(forKey: "idToken") as? String,
67-
let accessToken = coder.decodeObject(forKey: "accessToken") as? String else {
66+
guard let idToken = coder.decodeObject(of: NSString.self, forKey: "idToken") as? String,
67+
let accessToken = coder.decodeObject(of: NSString.self, forKey: "accessToken") as? String
68+
else {
6869
return nil
6970
}
7071
self.idToken = idToken

FirebaseAuth/Sources/Swift/AuthProvider/OAuthCredential.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ import Foundation
113113
}
114114

115115
public required init?(coder: NSCoder) {
116-
idToken = coder.decodeObject(forKey: "IDToken") as? String
117-
rawNonce = coder.decodeObject(forKey: "rawNonce") as? String
118-
accessToken = coder.decodeObject(forKey: "accessToken") as? String
119-
pendingToken = coder.decodeObject(forKey: "pendingToken") as? String
120-
secret = coder.decodeObject(forKey: "secret") as? String
116+
idToken = coder.decodeObject(of: NSString.self, forKey: "IDToken") as? String
117+
rawNonce = coder.decodeObject(of: NSString.self, forKey: "rawNonce") as? String
118+
accessToken = coder.decodeObject(of: NSString.self, forKey: "accessToken") as? String
119+
pendingToken = coder.decodeObject(of: NSString.self, forKey: "pendingToken") as? String
120+
secret = coder.decodeObject(of: NSString.self, forKey: "secret") as? String
121121
fullName = coder.decodeObject(forKey: "fullName") as? PersonNameComponents
122122
OAuthResponseURLString = nil
123123
sessionID = nil

FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthCredential.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@ import Foundation
5252
}
5353

5454
public required init?(coder: NSCoder) {
55-
if let verificationID = coder.decodeObject(forKey: "verificationID") as? String,
56-
let verificationCode = coder.decodeObject(forKey: "verificationCode") as? String {
55+
if let verificationID = coder.decodeObject(
56+
of: NSString.self,
57+
forKey: "verificationID"
58+
) as? String,
59+
let verificationCode = coder.decodeObject(of: NSString.self, forKey: "verificationCode")
60+
as? String {
5761
credentialKind = .verification(verificationID, verificationCode)
5862
super.init(provider: PhoneAuthProvider.id)
5963
} else if let temporaryProof = coder.decodeObject(forKey: "temporaryProof") as? String,

FirebaseAuth/Sources/Swift/AuthProvider/TwitterAuthProvider.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ class TwitterAuthCredential: AuthCredential, NSSecureCoding {
6262
}
6363

6464
required init?(coder: NSCoder) {
65-
guard let token = coder.decodeObject(forKey: "token") as? String,
66-
let secret = coder.decodeObject(forKey: "secret") as? String else {
65+
guard let token = coder.decodeObject(of: NSString.self, forKey: "token") as? String,
66+
let secret = coder.decodeObject(of: NSString.self, forKey: "secret") as? String else {
6767
return nil
6868
}
6969
self.token = token

FirebaseAuth/Sources/Swift/Utilities/AuthWebView.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/** @class AuthWebView
2121
@brief A class responsible for creating a WKWebView for use within Firebase Auth.
2222
*/
23+
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
2324
@objc(FIRAuthWebView) public class AuthWebView: UIView {
2425
public lazy var webView: WKWebView = createWebView()
2526
public lazy var spinner: UIActivityIndicatorView = createSpinner()
@@ -73,11 +74,7 @@
7374
}
7475

7576
private func createSpinner() -> UIActivityIndicatorView {
76-
if #available(iOS 13.0, macCatalyst 13.0, *) {
77-
return UIActivityIndicatorView(style: .medium)
78-
} else {
79-
return UIActivityIndicatorView(style: .gray)
80-
}
77+
return UIActivityIndicatorView(style: .medium)
8178
}
8279
}
8380
#endif

FirebaseAuth/Sources/Swift/Utilities/AuthWebViewController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/** @protocol AuthWebViewControllerDelegate
2222
@brief Defines a delegate for AuthWebViewController
2323
*/
24+
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
2425
protocol AuthWebViewControllerDelegate: AnyObject {
2526
/** @fn webViewControllerDidCancel:
2627
@brief Notifies the delegate that the web view controller is being cancelled by the user.
@@ -55,6 +56,7 @@
5556
completion: @escaping (URL?, Error?) -> Void)
5657
}
5758

59+
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
5860
class AuthWebViewController: UIViewController,
5961
WKNavigationDelegate {
6062
// MARK: - Properties

0 commit comments

Comments
 (0)