diff --git a/Session/Conversations/Settings/OWSConversationSettingsViewController.m b/Session/Conversations/Settings/OWSConversationSettingsViewController.m index 7d3135714..b703a58ff 100644 --- a/Session/Conversations/Settings/OWSConversationSettingsViewController.m +++ b/Session/Conversations/Settings/OWSConversationSettingsViewController.m @@ -861,17 +861,6 @@ CGFloat kIconViewLength = 24; [self.thread updateWithMutedUntilDate:nil transaction:transaction]; }]; } - if (self.isClosedGroup) { - NSString *groupPublicKey = [LKGroupUtilities getDecodedGroupID:((TSGroupThread *)self.thread).groupModel.groupId]; - NSString *userPublicKey = [SNGeneralUtilities getUserPublicKey]; - if (uiSwitch.isOn) { - [[LKPushNotificationAPI performOperation:ClosedGroupOperationUnsubscribe - forClosedGroupWithPublicKey:groupPublicKey userPublicKey:userPublicKey] retainUntilComplete]; - } else { - [[LKPushNotificationAPI performOperation:ClosedGroupOperationSubscribe - forClosedGroupWithPublicKey:groupPublicKey userPublicKey:userPublicKey] retainUntilComplete]; - } - } } - (void)blockConversationSwitchDidChange:(id)sender diff --git a/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift b/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift index b725e1527..8fccb96ec 100644 --- a/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift +++ b/SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift @@ -88,13 +88,7 @@ public final class PushNotificationAPI : NSObject { } // Subscribe to all closed groups Storage.shared.getUserClosedGroupPublicKeys().forEach { closedGroupPublicKey in - let groupID = LKGroupUtilities.getEncodedClosedGroupIDAsData(closedGroupPublicKey) - let threadOrNil = TSGroupThread.fetch(uniqueId: TSGroupThread.threadId(fromGroupId: groupID)) - if threadOrNil?.isMuted == true { - // Do nothing - } else { - performOperation(.subscribe, for: closedGroupPublicKey, publicKey: publicKey) - } + performOperation(.subscribe, for: closedGroupPublicKey, publicKey: publicKey) } return promise }