Skip to content

Commit fe71814

Browse files
authored
Revert "Disable Sessions due to usage (#10796)" (#10842)
This reverts commit 8c68475.
1 parent 6d9f334 commit fe71814

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

FirebaseSessions/Sources/Settings/SessionsSettings.swift

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,13 @@ class SessionsSettings: SettingsProtocol {
4646
}
4747

4848
var sessionsEnabled: Bool {
49-
// TODO: Remove this block before release
50-
// Disabling the SDK because some customers seem to be building from master
51-
// Uncomment the code below before release
49+
// Order of precendence LocalOverrides > Remote Settings > SDK Defaults
5250
if let sessionEnabled = localOverrides.sessionsEnabled {
5351
return sessionEnabled
52+
} else if let sessionEnabled = remoteSettings.sessionsEnabled {
53+
return sessionEnabled
5454
}
55-
return false
56-
57-
// TODO: uncomment before release
58-
// // Order of precendence LocalOverrides > Remote Settings > SDK Defaults
59-
// if let sessionEnabled = localOverrides.sessionsEnabled {
60-
// return sessionEnabled
61-
// } else if let sessionEnabled = remoteSettings.sessionsEnabled {
62-
// return sessionEnabled
63-
// }
64-
// return sdkDefaults.sessionsEnabled!
55+
return sdkDefaults.sessionsEnabled!
6556
}
6657

6758
var sessionTimeout: TimeInterval {

FirebaseSessions/Tests/Unit/SessionsSettingsTests.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ class SessionsSettingsTests: XCTestCase {
8282
remoteSettings: remoteSettings
8383
)
8484

85-
// TODO: uncomment before release
86-
// XCTAssertTrue(sessionSettings.sessionsEnabled)
85+
XCTAssertTrue(sessionSettings.sessionsEnabled)
8786
XCTAssertEqual(sessionSettings.samplingRate, 1.0)
8887
XCTAssertEqual(sessionSettings.sessionTimeout, 30 * 60)
8988
}
@@ -110,8 +109,7 @@ class SessionsSettingsTests: XCTestCase {
110109
remoteSettings: remoteSettings
111110
)
112111

113-
// TODO: uncomment before release
114-
// XCTAssertTrue(sessionSettings.sessionsEnabled)
112+
XCTAssertTrue(sessionSettings.sessionsEnabled)
115113
XCTAssertEqual(sessionSettings.samplingRate, 0.8)
116114
XCTAssertEqual(sessionSettings.sessionTimeout, 50)
117115
}

0 commit comments

Comments
 (0)