From e7b90179929ddcd71c196ddb5a63706fdf8f4738 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 9 Feb 2021 13:55:32 +1100 Subject: [PATCH] Enable V2 closed group control messages --- Session/Closed Groups/EditClosedGroupVC.swift | 4 ++-- Session/Conversations/OWSConversationSettingsViewController.m | 2 +- Session/Home/HomeVC.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Session/Closed Groups/EditClosedGroupVC.swift b/Session/Closed Groups/EditClosedGroupVC.swift index ec89fa71b..31e476c85 100644 --- a/Session/Closed Groups/EditClosedGroupVC.swift +++ b/Session/Closed Groups/EditClosedGroupVC.swift @@ -271,9 +271,9 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega Storage.write(with: { [weak self] transaction in do { if !members.contains(getUserHexEncodedPublicKey()) { - try MessageSender.leave(groupPublicKey, using: transaction) + try MessageSender.v2_leave(groupPublicKey, using: transaction) } else { - try MessageSender.update(groupPublicKey, with: members, name: name, transaction: transaction) + try MessageSender.v2_update(groupPublicKey, with: members, name: name, transaction: transaction) } } catch { DispatchQueue.main.async { diff --git a/Session/Conversations/OWSConversationSettingsViewController.m b/Session/Conversations/OWSConversationSettingsViewController.m index 56aaccb41..21eae4b48 100644 --- a/Session/Conversations/OWSConversationSettingsViewController.m +++ b/Session/Conversations/OWSConversationSettingsViewController.m @@ -939,7 +939,7 @@ static CGRect oldframe; if (gThread.isClosedGroup) { NSString *groupPublicKey = [LKGroupUtilities getDecodedGroupID:gThread.groupModel.groupId]; [LKStorage writeSyncWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { - [SNMessageSender leaveClosedGroupWithPublicKey:groupPublicKey using:transaction error:nil]; + [SNMessageSender v2_leaveClosedGroupWithPublicKey:groupPublicKey using:transaction error:nil]; }]; } diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 04994c47e..b197fe40f 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -398,7 +398,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIViewC let groupID = thread.groupModel.groupId let groupPublicKey = LKGroupUtilities.getDecodedGroupID(groupID) do { - try MessageSender.leave(groupPublicKey, using: transaction) + try MessageSender.v2_leave(groupPublicKey, using: transaction) } catch { // TODO: Handle }