Skip to content

Commit 496d1ab

Browse files
committed
Remove implicit optionals
1 parent b23d055 commit 496d1ab

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

FirebaseRemoteConfig/SwiftNew/ConfigSettings.swift

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,13 @@ let RCNHTTPDefaultConnectionTimeout: TimeInterval = 60
7474

7575
// MARK: - Data required by config request.
7676

77-
/// The Google App ID of the configured FIRApp.
78-
open var googleAppID: String!
79-
80-
/// Device authentication ID required by config request.
81-
open var deviceAuthID: String!
82-
83-
/// Secret Token required by config request.
84-
open var secretToken: String!
85-
86-
/// Device data version of checkin information.
87-
open var deviceDataVersion: String!
88-
8977
/// InstallationsID.
9078
/// - Note: The property is atomic because it is accessed across multiple threads.
91-
@objc public var configInstallationsIdentifier: String!
79+
@objc public var configInstallationsIdentifier: String?
9280

9381
/// Installations token.
9482
/// - Note: The property is atomic because it is accessed across multiple threads.
95-
@objc public var configInstallationsToken: String!
83+
@objc public var configInstallationsToken: String?
9684

9785
/// Bundle Identifier
9886
public let bundleIdentifier: String
@@ -437,8 +425,8 @@ let RCNHTTPDefaultConnectionTimeout: TimeInterval = 60
437425
/// - Returns: Config fetch request string
438426
@objc public func nextRequest(withUserProperties userProperties: [String: Any]?) -> String {
439427
var request = "{"
440-
request += "app_instance_id:'\(configInstallationsIdentifier)'"
441-
request += ", app_instance_id_token:'\(configInstallationsToken)'"
428+
request += "app_instance_id:'\(configInstallationsIdentifier ?? "")'"
429+
request += ", app_instance_id_token:'\(configInstallationsToken ?? "")'"
442430
request += ", app_id:'\(_googleAppID)'"
443431
request += ", country_code:'\(Device.remoteConfigDeviceCountry())'"
444432
request += ", language_code:'\(Device.remoteConfigDeviceLocale())'"

0 commit comments

Comments
 (0)