From 330e4ce8adc9204d42d4e65cd0bc960e00528f18 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 7 Apr 2021 13:18:24 +1000 Subject: [PATCH] Fix unnecessary V2 open group requests --- Session/Home/HomeVC.swift | 4 +++- Session/Meta/AppDelegate.m | 2 +- SessionMessagingKit/Open Groups/V2/OpenGroupManagerV2.swift | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 13f962a83..6d573b4fc 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -154,7 +154,9 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv let _ = IP2Country.shared.populateCacheIfNeeded() } // Get default open group rooms if needed - OpenGroupAPIV2.getDefaultRoomsIfNeeded() + if OpenGroupManagerV2.useV2OpenGroups { + OpenGroupAPIV2.getDefaultRoomsIfNeeded() + } } override func viewDidAppear(_ animated: Bool) { diff --git a/Session/Meta/AppDelegate.m b/Session/Meta/AppDelegate.m index 4666e3a6c..458fca1a5 100644 --- a/Session/Meta/AppDelegate.m +++ b/Session/Meta/AppDelegate.m @@ -411,7 +411,7 @@ static NSTimeInterval launchStartedAt; } requiresSync:YES]; } - if (CurrentAppContext().isMainApp) { + if (CurrentAppContext().isMainApp && SNOpenGroupManagerV2.useV2OpenGroups) { [SNOpenGroupAPIV2 getDefaultRoomsIfNeeded]; } diff --git a/SessionMessagingKit/Open Groups/V2/OpenGroupManagerV2.swift b/SessionMessagingKit/Open Groups/V2/OpenGroupManagerV2.swift index 9efcff9a1..69e7a2c66 100644 --- a/SessionMessagingKit/Open Groups/V2/OpenGroupManagerV2.swift +++ b/SessionMessagingKit/Open Groups/V2/OpenGroupManagerV2.swift @@ -5,7 +5,7 @@ public final class OpenGroupManagerV2 : NSObject { private var pollers: [String:OpenGroupPollerV2] = [:] private var isPolling = false - public static var useV2OpenGroups = false + @objc public static var useV2OpenGroups = false // MARK: Initialization @objc public static let shared = OpenGroupManagerV2()