Skip to content

Commit 475a679

Browse files
committed
Make experimentMetadata property non-null
1 parent 6fa19f0 commit 475a679

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

FirebaseRemoteConfig/SwiftNew/ConfigExperiment.swift

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import Foundation
2424
private static let serviceOrigin = "frc"
2525

2626
@objc private var experimentPayloads: [Data]
27-
@objc private var experimentMetadata: [String: Any]?
27+
@objc private var experimentMetadata: [String: Any]
2828
@objc private var activeExperimentPayloads: [Data]
2929
private let dbManager: ConfigDBManager?
3030
private let experimentController: ExperimentController?
@@ -54,7 +54,7 @@ import Foundation
5454
@objc private func loadExperimentFromTable() {
5555
guard let dbManager else { return }
5656

57-
let completionHandler: (Bool, [String: Sendable]?) -> Void = { [weak self] _, result in
57+
let completionHandler: (Bool, [String: Any]?) -> Void = { [weak self] _, result in
5858
guard let self else { return }
5959

6060
if result?[ConfigConstants.experimentTableKeyPayload] != nil {
@@ -71,10 +71,9 @@ import Foundation
7171
}
7272
}
7373

74-
if result?[ConfigConstants.experimentTableKeyMetadata] != nil {
75-
self
76-
.experimentMetadata =
77-
result?[ConfigConstants.experimentTableKeyMetadata] as? [String: Any]
74+
if let experimentTable =
75+
result?[ConfigConstants.experimentTableKeyMetadata] as? [String: Any] {
76+
self.experimentMetadata = experimentTable
7877
}
7978

8079
if result?[ConfigConstants.experimentTableKeyActivePayload] != nil {
@@ -126,7 +125,7 @@ import Foundation
126125
let lifecycleEvent = LifecycleEvents()
127126

128127
// Get the last experiment start time prior to the latest payload.
129-
let lastStartTime = experimentMetadata?[Self.experimentMetadataKeyLastStartTime] as? Double
128+
let lastStartTime = experimentMetadata[Self.experimentMetadataKeyLastStartTime] as? Double
130129

131130
// Update the last experiment start time with the latest payload.
132131
updateExperimentStartTime()
@@ -146,13 +145,13 @@ import Foundation
146145

147146
@objc private func updateExperimentStartTime() {
148147
let existingLastStartTime =
149-
experimentMetadata?[Self.experimentMetadataKeyLastStartTime] as? Double
148+
experimentMetadata[Self.experimentMetadataKeyLastStartTime] as? Double
150149

151150
let latestStartTime = latestStartTime(existingLastStartTime: existingLastStartTime ?? 0)
152151

153-
experimentMetadata?[Self.experimentMetadataKeyLastStartTime] = latestStartTime
152+
experimentMetadata[Self.experimentMetadataKeyLastStartTime] = latestStartTime
154153

155-
guard let experimentMetadata, JSONSerialization.isValidJSONObject(experimentMetadata) else {
154+
guard JSONSerialization.isValidJSONObject(experimentMetadata) else {
156155
RCLog.error("I-RCN000028", "Invalid fetched experiment metadata to be serialized.")
157156
return
158157
}

0 commit comments

Comments
 (0)