Merged element 1.11.3 into bum

This commit is contained in:
Arnfried Griesert
2023-09-29 05:24:53 +02:00
36 changed files with 452 additions and 180 deletions
@@ -24,11 +24,11 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
var completion: ((UserSessionsOverviewViewModelResult) -> Void)?
init(userSessionsOverviewService: UserSessionsOverviewServiceProtocol, settingsService: UserSessionSettingsProtocol) {
init(userSessionsOverviewService: UserSessionsOverviewServiceProtocol, settingsService: UserSessionSettingsProtocol, showDeviceLogout: Bool) {
self.userSessionsOverviewService = userSessionsOverviewService
self.settingsService = settingsService
let showLocationInfo = BWIBuildSettings.shared.deviceManagerShowIPAddress && settingsService.showIPAddressesInSessionsManager
super.init(initialViewState: .init(showLocationInfo: showLocationInfo))
super.init(initialViewState: .init(showLocationInfo: showLocationInfo, showDeviceLogout: showDeviceLogout))
userSessionsOverviewService.overviewDataPublisher.sink { [weak self] overviewData in
self?.updateViewState(with: overviewData)