mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-06 04:18:31 +00:00
Replace AppSettings with UserSettings from the UserSessionFlow and below.
Remove some redundant injections when passed alongside a user session too. # Conflicts: # ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift # ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
This commit is contained in:
@@ -11,7 +11,7 @@ import UIKit
|
||||
|
||||
final class PresenceService {
|
||||
private let clientProxy: ClientProxyProtocol
|
||||
private let appSettings: AppSettings
|
||||
private let userSettings: UserSettings
|
||||
private let notificationCenter: NotificationCenter
|
||||
|
||||
private var isForegroundActive: Bool
|
||||
@@ -22,11 +22,11 @@ final class PresenceService {
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
|
||||
init(clientProxy: ClientProxyProtocol,
|
||||
appSettings: AppSettings,
|
||||
userSettings: UserSettings,
|
||||
notificationCenter: NotificationCenter = .default,
|
||||
initialApplicationState: UIApplication.State = UIApplication.shared.applicationState) {
|
||||
self.clientProxy = clientProxy
|
||||
self.appSettings = appSettings
|
||||
self.userSettings = userSettings
|
||||
self.notificationCenter = notificationCenter
|
||||
isForegroundActive = initialApplicationState == .active
|
||||
|
||||
@@ -41,7 +41,7 @@ final class PresenceService {
|
||||
}
|
||||
|
||||
private var desiredPresence: ClientProxyPresence {
|
||||
switch (isForegroundActive, appSettings.sharePresence) {
|
||||
switch (isForegroundActive, userSettings.sharePresence) {
|
||||
case (true, true):
|
||||
.online
|
||||
case (true, false):
|
||||
@@ -68,7 +68,7 @@ final class PresenceService {
|
||||
}
|
||||
|
||||
private func observeSharePresence() {
|
||||
appSettings.sharePresencePublisher
|
||||
userSettings.sharePresencePublisher
|
||||
.removeDuplicates()
|
||||
.sink { [weak self] _ in
|
||||
self?.reportCurrentState()
|
||||
|
||||
Reference in New Issue
Block a user