diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift index a65220a3a..eb5966cd5 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift @@ -61,10 +61,10 @@ public final class ClosedGroupPoller : NSObject { // MARK: Private API private func setUpPolling(for groupPublicKey: String) { - Threading.closedGroupPollerQueue.async { - self.poll(groupPublicKey).done(on: Threading.closedGroupPollerQueue) { [weak self] _ in + Threading.pollerQueue.async { + self.poll(groupPublicKey).done(on: Threading.pollerQueue) { [weak self] _ in self?.pollRecursively(groupPublicKey) - }.catch(on: Threading.closedGroupPollerQueue) { [weak self] error in + }.catch(on: Threading.pollerQueue) { [weak self] error in // The error is logged in poll(_:) self?.pollRecursively(groupPublicKey) } @@ -87,10 +87,10 @@ public final class ClosedGroupPoller : NSObject { SNLog("Next poll interval for closed group with public key: \(groupPublicKey) is \(nextPollInterval) s.") timers[groupPublicKey] = Timer.scheduledTimerOnMainThread(withTimeInterval: nextPollInterval, repeats: false) { [weak self] timer in timer.invalidate() - Threading.closedGroupPollerQueue.async { - self?.poll(groupPublicKey).done(on: Threading.closedGroupPollerQueue) { _ in + Threading.pollerQueue.async { + self?.poll(groupPublicKey).done(on: Threading.pollerQueue) { _ in self?.pollRecursively(groupPublicKey) - }.catch(on: Threading.closedGroupPollerQueue) { error in + }.catch(on: Threading.pollerQueue) { error in // The error is logged in poll(_:) self?.pollRecursively(groupPublicKey) } diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift index 8ef1ffcca..4c2ddbc8a 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift @@ -43,7 +43,7 @@ public final class OpenGroupPollerV2 : NSObject { self.isPolling = true let (promise, seal) = Promise.pending() promise.retainUntilComplete() - Threading.openGroupPollerQueue.async { + Threading.pollerQueue.async { OpenGroupAPIV2.compactPoll(self.server).done(on: OpenGroupAPIV2.workQueue) { [weak self] bodies in guard let self = self else { return } self.isPolling = false diff --git a/SessionMessagingKit/Utilities/Threading.swift b/SessionMessagingKit/Utilities/Threading.swift index 83f34ffd6..10db310b6 100644 --- a/SessionMessagingKit/Utilities/Threading.swift +++ b/SessionMessagingKit/Utilities/Threading.swift @@ -5,6 +5,4 @@ internal enum Threading { internal static let jobQueue = DispatchQueue(label: "SessionMessagingKit.jobQueue", qos: .userInitiated) internal static let pollerQueue = DispatchQueue(label: "SessionMessagingKit.pollerQueue") - internal static let closedGroupPollerQueue = DispatchQueue(label: "SessionMessagingKit.closedGroupPollerQueue") - internal static let openGroupPollerQueue = DispatchQueue(label: "SessionMessagingKit.openGroup") }