From adec197edb3563c2f2eaec74f3312650661be588 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 2 Mar 2020 10:37:39 -0300 Subject: [PATCH] Resolve groups v2-related TODOs. --- .../ViewControllers/HomeView/ConversationListViewController.m | 1 + SignalMessaging/groups/GroupV2UpdatesImpl.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m index 131376e903..5528512ce5 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m +++ b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m @@ -1600,6 +1600,7 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup"; [self.conversationSplitViewController closeSelectedConversationAnimated:YES]; } + // GroupsV2 TODO: Should we leave v2 groups here? [self.databaseStorage writeWithBlock:^(SDSAnyWriteTransaction *transaction) { if ([thread isKindOfClass:[TSGroupThread class]]) { TSGroupThread *groupThread = (TSGroupThread *)thread; diff --git a/SignalMessaging/groups/GroupV2UpdatesImpl.swift b/SignalMessaging/groups/GroupV2UpdatesImpl.swift index 48f0d67944..da7b2cea6e 100644 --- a/SignalMessaging/groups/GroupV2UpdatesImpl.swift +++ b/SignalMessaging/groups/GroupV2UpdatesImpl.swift @@ -292,6 +292,7 @@ public class GroupV2UpdatesImpl: NSObject, GroupV2UpdatesSwift { groupUpdateMode: groupUpdateMode) .recover { (error) throws -> Promise in let shouldTrySnapshot = { () -> Bool in + // This should not fail over in the case of networking problems. if IsNetworkConnectivityFailure(error) { Logger.warn("Error: \(error)") return false