From 782d51c1d63248010b06c0b855280d67a98722c5 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 4 May 2022 16:43:22 +1000 Subject: [PATCH] minor change on hardfork version check --- .../Sending & Receiving/Pollers/ClosedGroupPoller.swift | 2 +- SessionSnodeKit/SnodeAPI.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift index 33a3869ae..8012d971f 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift @@ -89,7 +89,7 @@ public final class ClosedGroupPoller : NSObject { Threading.pollerQueue.async { var promises: [Promise] = [] if let promise = self?.poll(groupPublicKey) { promises.append(promise) } - if SnodeAPI.inHardfork, let promise = self?.poll(groupPublicKey, defaultInbox: true) { promises.append(promise) } + if SnodeAPI.duringHardforkTransition, let promise = self?.poll(groupPublicKey, defaultInbox: true) { promises.append(promise) } when(resolved: promises).done(on: Threading.pollerQueue) { _ in self?.pollRecursively(groupPublicKey) }.catch(on: Threading.pollerQueue) { error in diff --git a/SessionSnodeKit/SnodeAPI.swift b/SessionSnodeKit/SnodeAPI.swift index 3f055319a..116f959c2 100644 --- a/SessionSnodeKit/SnodeAPI.swift +++ b/SessionSnodeKit/SnodeAPI.swift @@ -31,7 +31,7 @@ public final class SnodeAPI : NSObject { // MARK: Hardfork version private static var hardfork = UserDefaults.standard[.hardfork] private static var softfork = UserDefaults.standard[.softfork] - public static var inHardfork: Bool { hardfork >= 19 && softfork >= 1 } + public static var duringHardforkTransition: Bool { hardfork == 19 && softfork == 0 } // MARK: Settings private static let maxRetryCount: UInt = 8