Merge branch 'remove-OWSBlockingManager' into voice-calls-2

Session.xcodeproj/project.pbxproj

@@ -180,6 +180,8 @@
 		7BD477A827EC39F5004E2822 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477A727EC39F5004E2822 /* Atomic.swift */; };
 		7BD477AA27F15F24004E2822 /* OpenGroupServerIdLookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477A927F15F24004E2822 /* OpenGroupServerIdLookup.swift */; };
 		7BD477AC27F15F41004E2822 /* OpenGroupServerIdLookupMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477AB27F15F41004E2822 /* OpenGroupServerIdLookupMigration.swift */; };
+		7BD477AE27F526E3004E2822 /* BlockingManagerRemovalMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477AD27F526E3004E2822 /* BlockingManagerRemovalMigration.swift */; };
+		7BD477B027F526FF004E2822 /* BlockListUIUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD477AF27F526FF004E2822 /* BlockListUIUtils.swift */; };
 		7BDCFC08242186E700641C39 /* NotificationServiceExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */; };
 		7BDCFC0B2421EB7600641C39 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6F509951AA53F760068F56A /* Localizable.strings */; };
 		7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; };
@@ -318,8 +320,6 @@
 		B8DE1FB626C22FCB0079C9CE /* CallMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DE1FB526C22FCB0079C9CE /* CallMessage.swift */; };
 		B8EB20EE2640F28000773E52 /* VisibleMessage+OpenGroupInvitation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8EB20ED2640F28000773E52 /* VisibleMessage+OpenGroupInvitation.swift */; };
 		B8EB20F02640F7F000773E52 /* OpenGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8EB20EF2640F7F000773E52 /* OpenGroupInvitationView.swift */; };
-		B8F5F52925EC4F8A003BF8D4 /* BlockListUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F52825EC4F8A003BF8D4 /* BlockListUIUtils.m */; };
-		B8F5F54E25EC50A5003BF8D4 /* BlockListUIUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B8F5F52725EC4F6A003BF8D4 /* BlockListUIUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B8F5F56525EC8453003BF8D4 /* Notification+Contacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F56425EC8453003BF8D4 /* Notification+Contacts.swift */; };
 		B8F5F58325EC94A6003BF8D4 /* Collection+Subscripting.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F58225EC94A6003BF8D4 /* Collection+Subscripting.swift */; };
 		B8F5F60325EDE16F003BF8D4 /* DataExtractionNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F5F60225EDE16F003BF8D4 /* DataExtractionNotification.swift */; };
@@ -402,8 +402,6 @@
 		C32C5B6B256DC357003C73A2 /* OWSDisappearingConfigurationUpdateInfoMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDADA255A580400E217F9 /* OWSDisappearingConfigurationUpdateInfoMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C32C5B84256DC54F003C73A2 /* SSKEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDAF4255A580600E217F9 /* SSKEnvironment.m */; };
 		C32C5B8D256DC565003C73A2 /* SSKEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB31255A580A00E217F9 /* SSKEnvironment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C32C5B9F256DC739003C73A2 /* OWSBlockingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA68255A57F900E217F9 /* OWSBlockingManager.m */; };
-		C32C5BB0256DC73D003C73A2 /* OWSBlockingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBEB255A581B00E217F9 /* OWSBlockingManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C32C5BBA256DC7E3003C73A2 /* ProfileManagerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDBB9255A581600E217F9 /* ProfileManagerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C32C5BCC256DC830003C73A2 /* Storage+ClosedGroups.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D8F1372566120F0092EF10 /* Storage+ClosedGroups.swift */; };
 		C32C5BDD256DC88D003C73A2 /* OWSReadReceiptManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA71255A57FA00E217F9 /* OWSReadReceiptManager.m */; };
@@ -570,7 +568,6 @@
 		C374EEEB25DA3CA70073A857 /* ConversationTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C374EEEA25DA3CA70073A857 /* ConversationTitleView.swift */; };
 		C374EEF425DB31D40073A857 /* VoiceMessageRecordingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C374EEF325DB31D40073A857 /* VoiceMessageRecordingView.swift */; };
 		C379DCF4256735770002D4EB /* VisibleMessage+Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C379DCF3256735770002D4EB /* VisibleMessage+Attachment.swift */; };
-		C37F5385255B94F6002AEA92 /* SelectRecipientViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF34E255B6DC8007E1867 /* SelectRecipientViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C37F5396255B95BD002AEA92 /* OWSAnyTouchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF302255B6DBE007E1867 /* OWSAnyTouchGestureRecognizer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C37F5414255BAFA7002AEA92 /* SignalUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C33FD9AB255A548A00E217F9 /* SignalUtilitiesKit.framework */; };
 		C37F54DC255BB84A002AEA92 /* SessionSnodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A59F255385C100C340D1 /* SessionSnodeKit.framework */; };
@@ -624,20 +621,14 @@
 		C38EF32F255B6DBF007E1867 /* OWSFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF305255B6DBE007E1867 /* OWSFormat.m */; };
 		C38EF331255B6DBF007E1867 /* UIGestureRecognizer+OWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF307255B6DBE007E1867 /* UIGestureRecognizer+OWS.swift */; };
 		C38EF334255B6DBF007E1867 /* UIUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF30A255B6DBE007E1867 /* UIUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C38EF335255B6DBF007E1867 /* BlockListCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF30B255B6DBE007E1867 /* BlockListCache.swift */; };
 		C38EF359255B6DCC007E1867 /* SheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF33F255B6DC5007E1867 /* SheetViewController.swift */; };
-		C38EF35B255B6DCC007E1867 /* SelectThreadViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF341255B6DC5007E1867 /* SelectThreadViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C38EF35C255B6DCC007E1867 /* SelectThreadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF342255B6DC5007E1867 /* SelectThreadViewController.m */; };
 		C38EF35D255B6DCC007E1867 /* OWSNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF343255B6DC5007E1867 /* OWSNavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C38EF35E255B6DCC007E1867 /* OWSViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF344255B6DC5007E1867 /* OWSViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C38EF35F255B6DCC007E1867 /* SelectRecipientViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF345255B6DC6007E1867 /* SelectRecipientViewController.m */; };
 		C38EF363255B6DCC007E1867 /* ModalActivityIndicatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF349255B6DC7007E1867 /* ModalActivityIndicatorViewController.swift */; };
 		C38EF365255B6DCC007E1867 /* OWSTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF34B255B6DC8007E1867 /* OWSTableViewController.m */; };
 		C38EF366255B6DCC007E1867 /* ScreenLockViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF34C255B6DC8007E1867 /* ScreenLockViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C38EF367255B6DCC007E1867 /* OWSTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF34D255B6DC8007E1867 /* OWSTableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C38EF36B255B6DCC007E1867 /* ScreenLockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF351255B6DC9007E1867 /* ScreenLockViewController.m */; };
-		C38EF36C255B6DCC007E1867 /* SharingThreadPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF352255B6DC9007E1867 /* SharingThreadPickerViewController.m */; };
-		C38EF36D255B6DCC007E1867 /* SharingThreadPickerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF353255B6DCB007E1867 /* SharingThreadPickerViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C38EF36F255B6DCC007E1867 /* OWSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF355255B6DCB007E1867 /* OWSViewController.m */; };
 		C38EF370255B6DCC007E1867 /* OWSNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = C38EF356255B6DCB007E1867 /* OWSNavigationController.m */; };
 		C38EF371255B6DCC007E1867 /* MessageApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF357255B6DCC007E1867 /* MessageApprovalViewController.swift */; };
@@ -1204,6 +1195,8 @@
 		7BD477A727EC39F5004E2822 /* Atomic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
 		7BD477A927F15F24004E2822 /* OpenGroupServerIdLookup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGroupServerIdLookup.swift; sourceTree = "<group>"; };
 		7BD477AB27F15F41004E2822 /* OpenGroupServerIdLookupMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGroupServerIdLookupMigration.swift; sourceTree = "<group>"; };
+		7BD477AD27F526E3004E2822 /* BlockingManagerRemovalMigration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockingManagerRemovalMigration.swift; sourceTree = "<group>"; };
+		7BD477AF27F526FF004E2822 /* BlockListUIUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockListUIUtils.swift; sourceTree = "<group>"; };
 		7BDCFC0424206E7300641C39 /* SessionNotificationServiceExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SessionNotificationServiceExtension.entitlements; sourceTree = "<group>"; };
 		7BDCFC07242186E700641C39 /* NotificationServiceExtensionContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationServiceExtensionContext.swift; sourceTree = "<group>"; };
 		7BFD1A892745C4F000FB91B9 /* Permissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Permissions.swift; sourceTree = "<group>"; };
@@ -1359,8 +1352,6 @@
 		B8EB20E6263F7E4B00773E52 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B8EB20ED2640F28000773E52 /* VisibleMessage+OpenGroupInvitation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisibleMessage+OpenGroupInvitation.swift"; sourceTree = "<group>"; };
 		B8EB20EF2640F7F000773E52 /* OpenGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupInvitationView.swift; sourceTree = "<group>"; };
-		B8F5F52725EC4F6A003BF8D4 /* BlockListUIUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BlockListUIUtils.h; sourceTree = "<group>"; };
-		B8F5F52825EC4F8A003BF8D4 /* BlockListUIUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BlockListUIUtils.m; sourceTree = "<group>"; };
 		B8F5F56425EC8453003BF8D4 /* Notification+Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification+Contacts.swift"; sourceTree = "<group>"; };
 		B8F5F58225EC94A6003BF8D4 /* Collection+Subscripting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+Subscripting.swift"; sourceTree = "<group>"; };
 		B8F5F60225EDE16F003BF8D4 /* DataExtractionNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataExtractionNotification.swift; sourceTree = "<group>"; };
@@ -1410,7 +1401,6 @@
 		C33FD9AD255A548A00E217F9 /* SignalUtilitiesKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SignalUtilitiesKit.h; sourceTree = "<group>"; };
 		C33FD9AE255A548A00E217F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C33FDA67255A57F900E217F9 /* OWSPrimaryStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSPrimaryStorage.h; sourceTree = "<group>"; };
-		C33FDA68255A57F900E217F9 /* OWSBlockingManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSBlockingManager.m; sourceTree = "<group>"; };
 		C33FDA69255A57F900E217F9 /* SSKPreferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSKPreferences.swift; sourceTree = "<group>"; };
 		C33FDA6B255A57FA00E217F9 /* OWSDisappearingConfigurationUpdateInfoMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSDisappearingConfigurationUpdateInfoMessage.m; sourceTree = "<group>"; };
 		C33FDA6C255A57FA00E217F9 /* ProtoUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProtoUtils.m; sourceTree = "<group>"; };
@@ -1565,7 +1555,6 @@
 		C33FDBDE255A581900E217F9 /* PushNotificationAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushNotificationAPI.swift; sourceTree = "<group>"; };
 		C33FDBE1255A581A00E217F9 /* LKGroupUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKGroupUtilities.m; sourceTree = "<group>"; };
 		C33FDBE9255A581A00E217F9 /* TSInteraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSInteraction.m; sourceTree = "<group>"; };
-		C33FDBEB255A581B00E217F9 /* OWSBlockingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSBlockingManager.h; sourceTree = "<group>"; };
 		C33FDBEC255A581B00E217F9 /* OWSRecipientIdentity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSRecipientIdentity.m; sourceTree = "<group>"; };
 		C33FDBEF255A581B00E217F9 /* TSStorageKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSStorageKeys.h; sourceTree = "<group>"; };
 		C33FDBF1255A581B00E217F9 /* OWSIdentityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSIdentityManager.h; sourceTree = "<group>"; };
@@ -1687,21 +1676,14 @@
 		C38EF308255B6DBE007E1867 /* OWSPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSPreferences.m; path = SessionMessagingKit/Utilities/OWSPreferences.m; sourceTree = SOURCE_ROOT; };
 		C38EF309255B6DBE007E1867 /* DeviceSleepManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DeviceSleepManager.swift; path = SessionMessagingKit/Utilities/DeviceSleepManager.swift; sourceTree = SOURCE_ROOT; };
 		C38EF30A255B6DBE007E1867 /* UIUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIUtil.h; path = SignalUtilitiesKit/Utilities/UIUtil.h; sourceTree = SOURCE_ROOT; };
-		C38EF30B255B6DBE007E1867 /* BlockListCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BlockListCache.swift; path = SignalUtilitiesKit/Messaging/BlockListCache.swift; sourceTree = SOURCE_ROOT; };
 		C38EF33F255B6DC5007E1867 /* SheetViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SheetViewController.swift; path = "SignalUtilitiesKit/Shared View Controllers/SheetViewController.swift"; sourceTree = SOURCE_ROOT; };
-		C38EF341255B6DC5007E1867 /* SelectThreadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectThreadViewController.h; path = SignalUtilitiesKit/Sharing/SelectThreadViewController.h; sourceTree = SOURCE_ROOT; };
-		C38EF342255B6DC5007E1867 /* SelectThreadViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectThreadViewController.m; path = SignalUtilitiesKit/Sharing/SelectThreadViewController.m; sourceTree = SOURCE_ROOT; };
 		C38EF343255B6DC5007E1867 /* OWSNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSNavigationController.h; path = "SignalUtilitiesKit/Shared View Controllers/OWSNavigationController.h"; sourceTree = SOURCE_ROOT; };
 		C38EF344255B6DC5007E1867 /* OWSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSViewController.h; path = "SignalUtilitiesKit/Shared View Controllers/OWSViewController.h"; sourceTree = SOURCE_ROOT; };
-		C38EF345255B6DC6007E1867 /* SelectRecipientViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectRecipientViewController.m; path = SignalUtilitiesKit/Sharing/SelectRecipientViewController.m; sourceTree = SOURCE_ROOT; };
 		C38EF349255B6DC7007E1867 /* ModalActivityIndicatorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ModalActivityIndicatorViewController.swift; path = "SignalUtilitiesKit/Shared View Controllers/ModalActivityIndicatorViewController.swift"; sourceTree = SOURCE_ROOT; };
 		C38EF34B255B6DC8007E1867 /* OWSTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSTableViewController.m; path = "SignalUtilitiesKit/Shared View Controllers/OWSTableViewController.m"; sourceTree = SOURCE_ROOT; };
 		C38EF34C255B6DC8007E1867 /* ScreenLockViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenLockViewController.h; path = "SignalUtilitiesKit/Screen Lock/ScreenLockViewController.h"; sourceTree = SOURCE_ROOT; };
 		C38EF34D255B6DC8007E1867 /* OWSTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSTableViewController.h; path = "SignalUtilitiesKit/Shared View Controllers/OWSTableViewController.h"; sourceTree = SOURCE_ROOT; };
-		C38EF34E255B6DC8007E1867 /* SelectRecipientViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectRecipientViewController.h; path = SignalUtilitiesKit/Sharing/SelectRecipientViewController.h; sourceTree = SOURCE_ROOT; };
 		C38EF351255B6DC9007E1867 /* ScreenLockViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ScreenLockViewController.m; path = "SignalUtilitiesKit/Screen Lock/ScreenLockViewController.m"; sourceTree = SOURCE_ROOT; };
-		C38EF352255B6DC9007E1867 /* SharingThreadPickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SharingThreadPickerViewController.m; path = SignalUtilitiesKit/Sharing/SharingThreadPickerViewController.m; sourceTree = SOURCE_ROOT; };
-		C38EF353255B6DCB007E1867 /* SharingThreadPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharingThreadPickerViewController.h; path = SignalUtilitiesKit/Sharing/SharingThreadPickerViewController.h; sourceTree = SOURCE_ROOT; };
 		C38EF355255B6DCB007E1867 /* OWSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSViewController.m; path = "SignalUtilitiesKit/Shared View Controllers/OWSViewController.m"; sourceTree = SOURCE_ROOT; };
 		C38EF356255B6DCB007E1867 /* OWSNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSNavigationController.m; path = "SignalUtilitiesKit/Shared View Controllers/OWSNavigationController.m"; sourceTree = SOURCE_ROOT; };
 		C38EF357255B6DCC007E1867 /* MessageApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MessageApprovalViewController.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/MessageApprovalViewController.swift"; sourceTree = SOURCE_ROOT; };
@@ -2617,7 +2599,6 @@
 			isa = PBXGroup;
 			children = (
 				C3D9E3B52567685D0040E4F3 /* Attachments */,
-				C32C5B9E256DC720003C73A2 /* Blocking */,
 				B8F5F61925EDE4B0003BF8D4 /* Data Extraction */,
 				C32C5B01256DC054003C73A2 /* Expiration */,
 				C32C5D22256DD496003C73A2 /* Link Previews */,
@@ -2784,15 +2765,6 @@
 			path = Quotes;
 			sourceTree = "<group>";
 		};
-		C32C5B9E256DC720003C73A2 /* Blocking */ = {
-			isa = PBXGroup;
-			children = (
-				C33FDBEB255A581B00E217F9 /* OWSBlockingManager.h */,
-				C33FDA68255A57F900E217F9 /* OWSBlockingManager.m */,
-			);
-			path = Blocking;
-			sourceTree = "<group>";
-		};
 		C32C5BB9256DC7C4003C73A2 /* To Do */ = {
 			isa = PBXGroup;
 			children = (
@@ -2924,7 +2896,6 @@
 				C36096EE25AD21BC008B62B2 /* Screen Lock */,
 				C3851CD225624B060061EEB0 /* Shared Views */,
 				C360970125AD22D3008B62B2 /* Shared View Controllers */,
-				C36096F025AD227E008B62B2 /* Sharing */,
 				C3851CE3256250FA0061EEB0 /* To Do */,
 				C3CA3B11255CF17200F4C6D4 /* Utilities */,
 			);
@@ -3152,19 +3123,6 @@
 			path = "Profile Pictures";
 			sourceTree = "<group>";
 		};
-		C36096F025AD227E008B62B2 /* Sharing */ = {
-			isa = PBXGroup;
-			children = (
-				C38EF34E255B6DC8007E1867 /* SelectRecipientViewController.h */,
-				C38EF345255B6DC6007E1867 /* SelectRecipientViewController.m */,
-				C38EF341255B6DC5007E1867 /* SelectThreadViewController.h */,
-				C38EF342255B6DC5007E1867 /* SelectThreadViewController.m */,
-				C38EF353255B6DCB007E1867 /* SharingThreadPickerViewController.h */,
-				C38EF352255B6DC9007E1867 /* SharingThreadPickerViewController.m */,
-			);
-			path = Sharing;
-			sourceTree = "<group>";
-		};
 		C360970125AD22D3008B62B2 /* Shared View Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -3192,6 +3150,7 @@
 		C379DCE82567330E0002D4EB /* Migrations */ = {
 			isa = PBXGroup;
 			children = (
+				7BD477AD27F526E3004E2822 /* BlockingManagerRemovalMigration.swift */,
 				7BD477AB27F15F41004E2822 /* OpenGroupServerIdLookupMigration.swift */,
 				7B93D07227CF19C800811CB6 /* MessageRequestsMigration.swift */,
 				B8B32044258C117C0020074B /* ContactsMigration.swift */,
@@ -3284,8 +3243,7 @@
 		C38BBA0D255E321C0041B9A3 /* Messaging */ = {
 			isa = PBXGroup;
 			children = (
-				B8F5F52725EC4F6A003BF8D4 /* BlockListUIUtils.h */,
-				B8F5F52825EC4F8A003BF8D4 /* BlockListUIUtils.m */,
+				7BD477AF27F526FF004E2822 /* BlockListUIUtils.swift */,
 				C38EF2FC255B6DBD007E1867 /* ConversationStyle.swift */,
 				C38EF3D4255B6DEE007E1867 /* DisappearingTimerConfigurationView.swift */,
 				C33FDA72255A57FA00E217F9 /* OWSFailedAttachmentDownloadsJob.h */,
@@ -3293,7 +3251,6 @@
 				C33FDADB255A580400E217F9 /* OWSFailedMessagesJob.h */,
 				C33FDAB7255A580100E217F9 /* OWSFailedMessagesJob.m */,
 				C38EF397255B6DD9007E1867 /* ThreadViewModel.swift */,
-				C38EF30B255B6DBE007E1867 /* BlockListCache.swift */,
 				C38EF2E4255B6DB9007E1867 /* FullTextSearcher.swift */,
 				C38EF2E9255B6DBA007E1867 /* OWSUnreadIndicator.h */,
 				C38EF2E3255B6DB9007E1867 /* OWSUnreadIndicator.m */,
@@ -3796,7 +3753,6 @@
 				C33FDDCC255A582000E217F9 /* TSConstants.h in Headers */,
 				C33FDDBD255A582000E217F9 /* ByteParser.h in Headers */,
 				C38EF243255B6D67007E1867 /* UIViewController+OWS.h in Headers */,
-				C38EF36D255B6DCC007E1867 /* SharingThreadPickerViewController.h in Headers */,
 				C38EF35D255B6DCC007E1867 /* OWSNavigationController.h in Headers */,
 				C38EF249255B6D67007E1867 /* UIColor+OWS.h in Headers */,
 				C38EF216255B6D3B007E1867 /* Theme.h in Headers */,
@@ -3809,7 +3765,6 @@
 				C38EF3F5255B6DF7007E1867 /* OWSTextField.h in Headers */,
 				C38EF275255B6D7A007E1867 /* OWSDatabaseMigrationRunner.h in Headers */,
 				C38EF366255B6DCC007E1867 /* ScreenLockViewController.h in Headers */,
-				C38EF35B255B6DCC007E1867 /* SelectThreadViewController.h in Headers */,
 				C33FDDD3255A582000E217F9 /* OWSQueues.h in Headers */,
 				C33FDC96255A582000E217F9 /* NSObject+Casting.h in Headers */,
 				C33FDDB3255A582000E217F9 /* OWSError.h in Headers */,
@@ -3821,7 +3776,6 @@
 				C33FDDB2255A582000E217F9 /* NSArray+OWS.h in Headers */,
 				C38EF2D7255B6DAF007E1867 /* OWSProfileManager.h in Headers */,
 				C38EF290255B6D86007E1867 /* AppSetup.h in Headers */,
-				C37F5385255B94F6002AEA92 /* SelectRecipientViewController.h in Headers */,
 				C38EF367255B6DCC007E1867 /* OWSTableViewController.h in Headers */,
 				C38EF246255B6D67007E1867 /* UIFont+OWS.h in Headers */,
 				C33FD9AF255A548A00E217F9 /* SignalUtilitiesKit.h in Headers */,
@@ -3829,7 +3783,6 @@
 				C33FDD06255A582000E217F9 /* AppVersion.h in Headers */,
 				C33FDD5A255A582000E217F9 /* TSStorageHeaders.h in Headers */,
 				C33FDCA2255A582000E217F9 /* OWSMessageUtils.h in Headers */,
-				B8F5F54E25EC50A5003BF8D4 /* BlockListUIUtils.h in Headers */,
 				C38EF28F255B6D86007E1867 /* VersionMigrations.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3914,7 +3867,6 @@
 				C32C5EA0256DE0D6003C73A2 /* OWSPrimaryStorage.h in Headers */,
 				C3A3A111256E1A93004D228D /* OWSIncomingMessageFinder.h in Headers */,
 				C32C5AAC256DBE8F003C73A2 /* TSInfoMessage.h in Headers */,
-				C32C5BB0256DC73D003C73A2 /* OWSBlockingManager.h in Headers */,
 				C3A3A15F256E1BB4004D228D /* ProtoUtils.h in Headers */,
 				C3A3A145256E1B49004D228D /* OWSMediaGalleryFinder.h in Headers */,
 				B8856E33256F18D5001CE70E /* OWSStorage+Subclass.h in Headers */,
@@ -4609,10 +4561,10 @@
 				C38EF317255B6DBF007E1867 /* DisplayableText.swift in Sources */,
 				C38EF30F255B6DBF007E1867 /* AppPreferences.swift in Sources */,
 				C38EF3C3255B6DE7007E1867 /* ImageEditorTextItem.swift in Sources */,
+				7BD477AE27F526E3004E2822 /* BlockingManagerRemovalMigration.swift in Sources */,
 				C33FDC7D255A582000E217F9 /* OWSDispatch.m in Sources */,
 				C38EF247255B6D67007E1867 /* NSAttributedString+OWS.m in Sources */,
 				C33FDD49255A582000E217F9 /* ParamParser.swift in Sources */,
-				C38EF35F255B6DCC007E1867 /* SelectRecipientViewController.m in Sources */,
 				C38EF3C5255B6DE7007E1867 /* OWSViewController+ImageEditor.swift in Sources */,
 				C38EF39B255B6DDA007E1867 /* ThreadViewModel.swift in Sources */,
 				C38EF2A5255B6D93007E1867 /* Identicon+ObjC.swift in Sources */,
@@ -4620,7 +4572,6 @@
 				C33FDD12255A582000E217F9 /* OWSPrimaryStorage+Loki.m in Sources */,
 				C3D9E40C25676C100040E4F3 /* Storage+Conformances.swift in Sources */,
 				C38EF31A255B6DBF007E1867 /* OWSAnyTouchGestureRecognizer.m in Sources */,
-				C38EF36C255B6DCC007E1867 /* SharingThreadPickerViewController.m in Sources */,
 				C38EF385255B6DD2007E1867 /* AttachmentTextToolbar.swift in Sources */,
 				C33FDD23255A582000E217F9 /* FeatureFlags.swift in Sources */,
 				C38EF389255B6DD2007E1867 /* AttachmentTextView.swift in Sources */,
@@ -4654,7 +4605,6 @@
 				C38EF38C255B6DD2007E1867 /* ApprovalRailCellView.swift in Sources */,
 				C38EF409255B6DF7007E1867 /* ContactTableViewCell.m in Sources */,
 				C38EF32A255B6DBF007E1867 /* UIUtil.m in Sources */,
-				C38EF335255B6DBF007E1867 /* BlockListCache.swift in Sources */,
 				C38EF2A6255B6D93007E1867 /* PlaceholderIcon.swift in Sources */,
 				C38EF371255B6DCC007E1867 /* MessageApprovalViewController.swift in Sources */,
 				C33FDD92255A582000E217F9 /* SignalIOS.pb.swift in Sources */,
@@ -4690,7 +4640,6 @@
 				C38EF365255B6DCC007E1867 /* OWSTableViewController.m in Sources */,
 				C38EF36B255B6DCC007E1867 /* ScreenLockViewController.m in Sources */,
 				C38EF40C255B6DF7007E1867 /* GradientView.swift in Sources */,
-				C38EF35C255B6DCC007E1867 /* SelectThreadViewController.m in Sources */,
 				C38EF30E255B6DBF007E1867 /* FullTextSearcher.swift in Sources */,
 				C38EF3FA255B6DF7007E1867 /* DirectionalPanGestureRecognizer.swift in Sources */,
 				C38EF3BB255B6DE7007E1867 /* ImageEditorStrokeItem.swift in Sources */,
@@ -4707,6 +4656,7 @@
 				C38EF3F4255B6DF7007E1867 /* ContactCellView.m in Sources */,
 				C33FDC78255A582000E217F9 /* TSConstants.m in Sources */,
 				C38EF324255B6DBF007E1867 /* Bench.swift in Sources */,
+				7BD477B027F526FF004E2822 /* BlockListUIUtils.swift in Sources */,
 				C38EF292255B6D86007E1867 /* VersionMigrations.m in Sources */,
 				C38EF3F2255B6DF7007E1867 /* DisappearingTimerConfigurationView.swift in Sources */,
 				C38EF3F9255B6DF7007E1867 /* OWSLayerView.swift in Sources */,
@@ -4725,7 +4675,6 @@
 				C38EF40B255B6DF7007E1867 /* TappableStackView.swift in Sources */,
 				C38EF31D255B6DBF007E1867 /* UIImage+OWS.swift in Sources */,
 				C38EF359255B6DCC007E1867 /* SheetViewController.swift in Sources */,
-				B8F5F52925EC4F8A003BF8D4 /* BlockListUIUtils.m in Sources */,
 				C38EF386255B6DD2007E1867 /* AttachmentApprovalInputAccessoryView.swift in Sources */,
 				B8C2B2C82563685C00551B4D /* CircleView.swift in Sources */,
 				C38EF331255B6DBF007E1867 /* UIGestureRecognizer+OWS.swift in Sources */,
@@ -4868,7 +4817,6 @@
 				C32C59C1256DB41F003C73A2 /* TSGroupThread.m in Sources */,
 				C3A3A08F256E1728004D228D /* FullTextSearchFinder.swift in Sources */,
 				B8856D1A256F114D001CE70E /* ProximityMonitoringManager.swift in Sources */,
-				C32C5B9F256DC739003C73A2 /* OWSBlockingManager.m in Sources */,
 				C3D9E52725677DF20040E4F3 /* OWSThumbnailService.swift in Sources */,
 				C32C5E75256DE020003C73A2 /* YapDatabaseTransaction+OWS.m in Sources */,
 				C3BBE0802554CDD70050F1E3 /* Storage.swift in Sources */,

Session/Backups/OWSBackup.m

@@ -58,7 +58,6 @@ NSString *NSStringForBackupImportState(OWSBackupState state)
 NSArray<NSString *> *MiscCollectionsToBackup(void)
 {
     return @[
-             kOWSBlockingManager_BlockListCollection,
              OWSUserProfile.collection,
              SSKIncrementingIdFinder.collectionName,
              OWSPreferencesSignalDatabaseCollection,

Session/Backups/OWSBackupImportJob.m

@@ -622,7 +622,7 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
     // complete, they'll be run the next time the app launches.
     AnyPromise *promise = [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [[[OWSDatabaseMigrationRunner alloc] init] runAllOutstandingWithCompletion:^{
+            [[[OWSDatabaseMigrationRunner alloc] init] runAllOutstandingWithCompletion:^(BOOL successful, BOOL needsConfigSync){
                     resolve(@(1));
                 }];
         });

Session/Closed Groups/NewClosedGroupVC.swift

@@ -174,8 +174,7 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat
                 promise = MessageSender.createClosedGroup(name: name, members: selectedContacts, transaction: transaction)
             }
             let _ = promise.done(on: DispatchQueue.main) { thread in
-                let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete() // FIXME: It's probably cleaner to do this inside createClosedGroup(...)
+                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
                 self?.presentingViewController?.dismiss(animated: true, completion: nil)
                 SignalApp.shared().presentConversation(for: thread, action: .compose, animated: false)
             }

Session/Conversations/ConversationVC+Interaction.swift

@@ -68,21 +68,25 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
             self.blockedBanner.alpha = 0
         }, completion: { _ in
             if let contact: Contact = Storage.shared.getContact(with: publicKey) {
-                Storage.shared.write { transaction in
-                    contact.isBlocked = false
-                    Storage.shared.setContact(contact, using: transaction)
-                }
+                Storage.shared.write(
+                    with: { transaction in
+                        guard let transaction = transaction as? YapDatabaseReadWriteTransaction else { return }
+                        
+                        contact.isBlocked = false
+                        Storage.shared.setContact(contact, using: transaction)
+                    },
+                    completion: {
+                        MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
+                    }
+                )
             }
-            
-            OWSBlockingManager.shared().removeBlockedPhoneNumber(publicKey)
         })
     }
 
     func showBlockedModalIfNeeded() -> Bool {
-        guard let thread = thread as? TSContactThread else { return false }
-        let publicKey = thread.contactSessionID()
-        guard OWSBlockingManager.shared().isRecipientIdBlocked(publicKey) else { return false }
-        let blockedModal = BlockedModal(publicKey: publicKey)
+        guard let thread = thread as? TSContactThread, thread.isBlocked() else { return false }
+        
+        let blockedModal = BlockedModal(publicKey: thread.contactSessionID())
         blockedModal.modalPresentationStyle = .overFullScreen
         blockedModal.modalTransitionStyle = .crossDissolve
         present(blockedModal, animated: true, completion: nil)
@@ -1178,6 +1182,9 @@ extension ConversationVC {
                     Storage.shared.setContact(contact, using: transaction)
                 }
                 
+                // Send a sync message with the details of the contact
+                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
+                
                 // Hide the 'messageRequestView' since the request has been approved and force a config
                 // sync to propagate the contact approval state (both must run on the main thread)
                 DispatchQueue.main.async { [weak self] in
@@ -1211,11 +1218,6 @@ extension ConversationVC {
                         newViewControllers.remove(at: messageRequestsIndex)
                         self?.navigationController?.setViewControllers(newViewControllers, animated: false)
                     }
-                
-                    // Send a sync message with the details of the contact
-                    if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                        appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete()
-                    }
                 }
             }
     }
@@ -1252,6 +1254,12 @@ extension ConversationVC {
                         let sessionId: String = contactThread.contactSessionID()
                         
                         if let contact: Contact = Storage.shared.getContact(with: sessionId) {
+                            // Stop observing the `BlockListDidChange` notification (we are about to pop the screen
+                            // so showing the banner just looks buggy)
+                            if let strongSelf = self {
+                                NotificationCenter.default.removeObserver(strongSelf, name: .contactBlockedStateChanged, object: nil)
+                            }
+                            
                             contact.isApproved = false
                             contact.isBlocked = true
                             
@@ -1269,24 +1277,10 @@ extension ConversationVC {
                     self?.thread.remove(with: transaction)
                 },
                 completion: { [weak self] in
-                    // Block the contact
-                    if let sessionId: String = (self?.thread as? TSContactThread)?.contactSessionID(), !OWSBlockingManager.shared().isRecipientIdBlocked(sessionId) {
-                        
-                        // Stop observing the `BlockListDidChange` notification (we are about to pop the screen
-                        // so showing the banner just looks buggy)
-                        if let strongSelf = self {
-                            NotificationCenter.default.removeObserver(strongSelf, name: NSNotification.Name(rawValue: kNSNotificationName_BlockListDidChange), object: nil)
-                        }
-                        
-                        OWSBlockingManager.shared().addBlockedPhoneNumber(sessionId)
-                    }
+                    // Force a config sync and pop to the previous screen
+                    MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
                     
-                    // Force a config sync and pop to the previous screen (both must run on the main thread)
                     DispatchQueue.main.async {
-                        if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                            appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete()
-                        }
-                        
                         self?.navigationController?.popViewController(animated: true)
                     }
                 }

Session/Conversations/ConversationVC.swift

@@ -354,7 +354,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         notificationCenter.addObserver(self, selector: #selector(handleKeyboardWillChangeFrameNotification(_:)), name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleKeyboardWillHideNotification(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleAudioDidFinishPlayingNotification(_:)), name: .SNAudioDidFinishPlaying, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(addOrRemoveBlockedBanner), name: NSNotification.Name(rawValue: kNSNotificationName_BlockListDidChange), object: nil)
+        notificationCenter.addObserver(self, selector: #selector(addOrRemoveBlockedBanner), name: .contactBlockedStateChanged, object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleGroupUpdatedNotification), name: .groupThreadUpdated, object: nil)
         notificationCenter.addObserver(self, selector: #selector(sendScreenshotNotificationIfNeeded), name: UIApplication.userDidTakeScreenshotNotification, object: nil)
         notificationCenter.addObserver(self, selector: #selector(handleMessageSentStatusChanged), name: .messageSentStatusDidChange, object: nil)
@@ -722,10 +722,11 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
             blockedBanner.removeFromSuperview()
         }
         guard let thread = thread as? TSContactThread else { return detach() }
-        if OWSBlockingManager.shared().isRecipientIdBlocked(thread.contactSessionID()) {
+        if thread.isBlocked() {
             view.addSubview(blockedBanner)
             blockedBanner.pin([ UIView.HorizontalEdge.left, UIView.VerticalEdge.top, UIView.HorizontalEdge.right ], to: view)
-        } else {
+        }
+        else {
             detach()
         }
     }

Session/Conversations/ConversationViewModel.m

@@ -10,7 +10,6 @@
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalUtilitiesKit/OWSUnreadIndicator.h>
 #import <SignalUtilitiesKit/SignalUtilitiesKit-Swift.h>
-#import <SessionMessagingKit/OWSBlockingManager.h>
 #import <SessionMessagingKit/OWSPrimaryStorage.h>
 #import <SessionMessagingKit/SSKEnvironment.h>
 #import <SessionMessagingKit/TSDatabaseView.h>
@@ -247,11 +246,6 @@ NS_ASSUME_NONNULL_BEGIN
     return self.primaryStorage.dbReadWriteConnection;
 }
 
-- (OWSBlockingManager *)blockingManager
-{
-    return OWSBlockingManager.sharedManager;
-}
-
 - (id<OWSTypingIndicators>)typingIndicators
 {
     return SSKEnvironment.shared.typingIndicators;
@@ -287,7 +281,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(blockListDidChange:)
-                                                 name:kNSNotificationName_BlockListDidChange
+                                                 name:NSNotification.contactBlockedStateChanged
                                                object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(localProfileDidChange:)
@@ -492,7 +486,6 @@ NS_ASSUME_NONNULL_BEGIN
 
     ThreadDynamicInteractions *dynamicInteractions =
         [ThreadUtil ensureDynamicInteractionsForThread:self.thread
-                                       blockingManager:self.blockingManager
                                           dbConnection:self.editingDatabaseConnection
                            hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator
                                    lastUnreadIndicator:self.dynamicInteractions.unreadIndicator

Session/Conversations/Settings/OWSConversationSettingsViewController.m

@@ -3,7 +3,6 @@
 //
 
 #import "OWSConversationSettingsViewController.h"
-#import "OWSBlockingManager.h"
 #import "OWSSoundSettingsViewController.h"
 #import "Session-Swift.h"
 #import "UIFont+OWS.h"
@@ -37,7 +36,6 @@ CGFloat kIconViewLength = 24;
 @property (nonatomic) NSArray<NSNumber *> *disappearingMessagesDurations;
 @property (nonatomic) OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration;
 @property (nullable, nonatomic) MediaGallery *mediaGallery;
-@property (nonatomic, readonly) ContactsViewHelper *contactsViewHelper;
 @property (nonatomic, readonly) UIImageView *avatarView;
 @property (nonatomic, readonly) UILabel *disappearingMessagesDurationLabel;
 @property (nonatomic) UILabel *displayNameLabel;
@@ -107,11 +105,6 @@ CGFloat kIconViewLength = 24;
     return SSKEnvironment.shared.tsAccountManager;
 }
 
-- (OWSBlockingManager *)blockingManager
-{
-    return [OWSBlockingManager sharedManager];
-}
-
 - (OWSProfileManager *)profileManager
 {
     return [OWSProfileManager sharedManager];
@@ -601,7 +594,7 @@ CGFloat kIconViewLength = 24;
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
 
             UISwitch *blockConversationSwitch = [UISwitch new];
-            blockConversationSwitch.on = [strongSelf.blockingManager isThreadBlocked:strongSelf.thread];
+            blockConversationSwitch.on = strongSelf.thread.isBlocked;
             [blockConversationSwitch addTarget:strongSelf action:@selector(blockConversationSwitchDidChange:)
                 forControlEvents:UIControlEventValueChanged];
             cell.accessoryView = blockConversationSwitch;
@@ -868,9 +861,13 @@ CGFloat kIconViewLength = 24;
     if (![sender isKindOfClass:[UISwitch class]]) {
         OWSFailDebug(@"Unexpected sender for block user switch: %@", sender);
     }
+    if (![self.thread isKindOfClass:[TSContactThread class]]) {
+        OWSFailDebug(@"unexpected thread type: %@", self.thread.class);
+    }
     UISwitch *blockConversationSwitch = (UISwitch *)sender;
+    TSContactThread *contactThread = (TSContactThread *)self.thread;
 
-    BOOL isCurrentlyBlocked = [self.blockingManager isThreadBlocked:self.thread];
+    BOOL isCurrentlyBlocked = contactThread.isBlocked;
 
     __weak OWSConversationSettingsViewController *weakSelf = self;
     if (blockConversationSwitch.isOn) {
@@ -878,12 +875,16 @@ CGFloat kIconViewLength = 24;
         if (isCurrentlyBlocked) {
             return;
         }
-        [BlockListUIUtils showBlockThreadActionSheet:self.thread
-                                  fromViewController:self
-                                     blockingManager:self.blockingManager
+        [BlockListUIUtils showBlockThreadActionSheet:contactThread
+                                                from:self
                                      completionBlock:^(BOOL isBlocked) {
                                          // Update switch state if user cancels action.
                                          blockConversationSwitch.on = isBlocked;
+            
+                                         // If we successfully blocked then force a config sync
+                                         if (isBlocked) {
+                                             [SNMessageSender forceSyncConfigurationNow];
+                                         }
 
                                          [weakSelf updateTableContents];
                                      }];
@@ -893,12 +894,16 @@ CGFloat kIconViewLength = 24;
         if (!isCurrentlyBlocked) {
             return;
         }
-        [BlockListUIUtils showUnblockThreadActionSheet:self.thread
-                                    fromViewController:self
-                                       blockingManager:self.blockingManager
+        [BlockListUIUtils showUnblockThreadActionSheet:contactThread
+                                                  from:self
                                        completionBlock:^(BOOL isBlocked) {
                                            // Update switch state if user cancels action.
                                            blockConversationSwitch.on = isBlocked;
+            
+                                           // If we successfully unblocked then force a config sync
+                                           if (!isBlocked) {
+                                               [SNMessageSender forceSyncConfigurationNow];
+                                           }
 
                                            [weakSelf updateTableContents];
                                        }];

Session/Conversations/Views & Modals/BlockedModal.swift

@@ -1,5 +1,6 @@
+import SessionMessagingKit
 
-final class BlockedModal : Modal {
+final class BlockedModal: Modal {
     private let publicKey: String
     
     // MARK: Lifecycle
@@ -68,7 +69,22 @@ final class BlockedModal : Modal {
     
     // MARK: Interaction
     @objc private func unblock() {
-        OWSBlockingManager.shared().removeBlockedPhoneNumber(publicKey)
+        let publicKey: String = self.publicKey
+        
+        Storage.shared.write(
+            with: { transaction in
+                guard let transaction = transaction as? YapDatabaseReadWriteTransaction, let contact: Contact = Storage.shared.getContact(with: publicKey, using: transaction) else {
+                    return
+                }
+                
+                contact.isBlocked = false
+                Storage.shared.setContact(contact, using: transaction as Any)
+            },
+            completion: {
+                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
+            }
+        )
+        
         presentingViewController?.dismiss(animated: true, completion: nil)
     }
 }

Session/Conversations/Views & Modals/JoinOpenGroupModal.swift

@@ -77,8 +77,7 @@ final class JoinOpenGroupModal : Modal {
         Storage.shared.write { [presentingViewController = self.presentingViewController!] transaction in
             OpenGroupManagerV2.shared.add(room: room, server: server, publicKey: publicKey, using: transaction)
             .done(on: DispatchQueue.main) { _ in
-                let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
+                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
             }
             .catch(on: DispatchQueue.main) { error in
                 let alert = UIAlertController(title: "Couldn't Join", message: error.localizedDescription, preferredStyle: .alert)

Session/Home/HomeVC.swift

@@ -522,22 +522,52 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
                 }
                 unpin.backgroundColor = Colors.pathsBuilding
                 
-                if let thread = thread as? TSContactThread {
+                if let thread = thread as? TSContactThread, !thread.isNoteToSelf() {
                     let publicKey = thread.contactSessionID()
-                    let blockingManager = SSKEnvironment.shared.blockingManager
-                    let isBlocked = blockingManager.isRecipientIdBlocked(publicKey)
+
                     let block = UITableViewRowAction(style: .normal, title: NSLocalizedString("BLOCK_LIST_BLOCK_BUTTON", comment: "")) { _, _ in
-                        blockingManager.addBlockedPhoneNumber(publicKey)
-                        tableView.reloadRows(at: [ indexPath ], with: UITableView.RowAnimation.fade)
+                        Storage.shared.write(
+                            with: { transaction in
+                                guard  let transaction = transaction as? YapDatabaseReadWriteTransaction, let contact: Contact = Storage.shared.getContact(with: publicKey, using: transaction) else {
+                                    return
+                                }
+                                
+                                contact.isBlocked = true
+                                Storage.shared.setContact(contact, using: transaction as Any)
+                            },
+                            completion: {
+                                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
+                                
+                                DispatchQueue.main.async {
+                                    tableView.reloadRows(at: [ indexPath ], with: UITableView.RowAnimation.fade)
+                                }
+                            }
+                        )
                     }
                     block.backgroundColor = Colors.unimportant
                     let unblock = UITableViewRowAction(style: .normal, title: NSLocalizedString("BLOCK_LIST_UNBLOCK_BUTTON", comment: "")) { _, _ in
-                        blockingManager.removeBlockedPhoneNumber(publicKey)
-                        tableView.reloadRows(at: [ indexPath ], with: UITableView.RowAnimation.fade)
+                        Storage.shared.write(
+                            with: { transaction in
+                                guard  let transaction = transaction as? YapDatabaseReadWriteTransaction, let contact: Contact = Storage.shared.getContact(with: publicKey, using: transaction) else {
+                                    return
+                                }
+                                
+                                contact.isBlocked = false
+                                Storage.shared.setContact(contact, using: transaction as Any)
+                            },
+                            completion: {
+                                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
+                                
+                                DispatchQueue.main.async {
+                                    tableView.reloadRows(at: [ indexPath ], with: UITableView.RowAnimation.fade)
+                                }
+                            }
+                        )
                     }
                     unblock.backgroundColor = Colors.unimportant
-                    return [ delete, (isBlocked ? unblock : block), (isPinned ? unpin : pin) ]
-                } else {
+                    return [ delete, (thread.isBlocked() ? unblock : block), (isPinned ? unpin : pin) ]
+                }
+                else {
                     return [ delete, (isPinned ? unpin : pin) ]
                 }
         }

Session/Home/Message Requests/MessageRequestsViewController.swift

@@ -347,23 +347,23 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
                                 needsSync = true
                             }
                         }
+                        
+                        // Block the contact
+                        if
+                            let sessionId: String = (thread as? TSContactThread)?.contactSessionID(),
+                            !thread.isBlocked(),
+                            let contact: Contact = Storage.shared.getContact(with: sessionId, using: transaction)
+                        {
+                            contact.isBlocked = true
+                            Storage.shared.setContact(contact, using: transaction)
+                            needsSync = true
+                        }
                     }
                 },
                 completion: {
-                    // Block all the contacts
-                    threads.forEach { thread in
-                        if let sessionId: String = (thread as? TSContactThread)?.contactSessionID(), !OWSBlockingManager.shared().isRecipientIdBlocked(sessionId) {
-                            OWSBlockingManager.shared().addBlockedPhoneNumber(sessionId)
-                        }
-                    }
-                    
-                    // Force a config sync (must run on the main thread)
+                    // Force a config sync
                     if needsSync {
-                        DispatchQueue.main.async {
-                            if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                                appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete()
-                            }
-                        }
+                        MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
                     }
                 }
             )
@@ -381,19 +381,20 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
                 with: { [weak self] transaction in
                     Storage.shared.cancelPendingMessageSendJobs(for: uniqueId, using: transaction)
                     self?.updateContactAndThread(thread: thread, with: transaction)
-                },
-                completion: {
-                    // Block the contact
-                    if let sessionId: String = (thread as? TSContactThread)?.contactSessionID(), !OWSBlockingManager.shared().isRecipientIdBlocked(sessionId) {
-                        OWSBlockingManager.shared().addBlockedPhoneNumber(sessionId)
-                    }
                     
-                    // Force a config sync (must run on the main thread)
-                    DispatchQueue.main.async {
-                        if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
-                            appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete()
-                        }
+                    // Block the contact
+                    if
+                        let sessionId: String = (thread as? TSContactThread)?.contactSessionID(),
+                        !thread.isBlocked(),
+                        let contact: Contact = Storage.shared.getContact(with: sessionId, using: transaction)
+                    {
+                        contact.isBlocked = true
+                        Storage.shared.setContact(contact, using: transaction)
                     }
+                },
+                completion: {
+                    // Force a config sync
+                    MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
                 }
             )
         })

Session/Meta/AppDelegate.m

@@ -173,10 +173,10 @@ static NSTimeInterval launchStartedAt;
             [AppEnvironment.shared setup];
             [SignalApp.sharedApp setup];
         }
-        migrationCompletion:^{
+        migrationCompletion:^(BOOL successful, BOOL needsConfigSync){
             OWSAssertIsOnMainThread();
 
-            [self versionMigrationsDidComplete];
+            [self versionMigrationsDidCompleteNeedingConfigSync:needsConfigSync];
         }];
 
     [SNConfiguration performMainSetup];
@@ -411,11 +411,16 @@ static NSTimeInterval launchStartedAt;
     }
 }
 
-- (void)versionMigrationsDidComplete
+- (void)versionMigrationsDidCompleteNeedingConfigSync:(BOOL)needsConfigSync
 {
     OWSAssertIsOnMainThread();
 
     self.areVersionMigrationsComplete = YES;
+    
+    // If we need a config sync then trigger it now
+    if (needsConfigSync) {
+        [SNMessageSender forceSyncConfigurationNow];
+    }
 
     [self checkIfAppIsReady];
 }

Session/Meta/AppDelegate.swift

@@ -145,39 +145,16 @@ extension AppDelegate {
         let userDefaults = UserDefaults.standard
         let lastSync = userDefaults[.lastConfigurationSync] ?? .distantPast
         guard Date().timeIntervalSince(lastSync) > 7 * 24 * 60 * 60 else { return } // Sync every 2 days
-        let destination = Message.Destination.contact(publicKey: getUserHexEncodedPublicKey())
-        Storage.write { transaction in
-            guard let configurationMessage = ConfigurationMessage.getCurrent(with: transaction) else { return }
-            
-            let job = MessageSendJob(message: configurationMessage, destination: destination)
-            JobQueue.shared.add(job, using: transaction)
-        }
-        
-        // Only update the 'lastConfigurationSync' timestamp if we have done the first sync (Don't want
-        // a new device config sync to override config syncs from other devices)
-        if userDefaults[.hasSyncedInitialConfiguration] {
-            userDefaults[.lastConfigurationSync] = Date()
-        }
-    }
-
-    func forceSyncConfigurationNowIfNeeded() -> Promise<Void> {
-        let destination = Message.Destination.contact(publicKey: getUserHexEncodedPublicKey())
-        let (promise, seal) = Promise<Void>.pending()
         
-        // Note: SQLite only supports a single write thread so we can be sure this will retrieve the most up-to-date data
-        Storage.writeSync { transaction in
-            guard Storage.shared.getUser(using: transaction)?.name != nil, let configurationMessage = ConfigurationMessage.getCurrent(with: transaction) else {
-                seal.fulfill(())
-                return
+        MessageSender.syncConfiguration(forceSyncNow: false)
+            .done {
+                // Only update the 'lastConfigurationSync' timestamp if we have done the first sync (Don't want
+                // a new device config sync to override config syncs from other devices)
+                if userDefaults[.hasSyncedInitialConfiguration] {
+                    userDefaults[.lastConfigurationSync] = Date()
+                }
             }
-            
-            MessageSender.send(configurationMessage, to: destination, using: transaction).done {
-                seal.fulfill(())
-            }.catch { _ in
-                seal.fulfill(()) // Fulfill even if this failed; the configuration in the swarm should be at most 2 days old
-            }.retainUntilComplete()
-        }
-        return promise
+            .retainUntilComplete()
     }
 
     // MARK: Closed group poller

Session/Open Groups/JoinOpenGroupVC.swift

@@ -144,8 +144,7 @@ final class JoinOpenGroupVC : BaseVC, UIPageViewControllerDataSource, UIPageView
                 OpenGroupManagerV2.shared.add(room: room, server: server, publicKey: publicKey, using: transaction)
                 .done(on: DispatchQueue.main) { [weak self] _ in
                     self?.presentingViewController?.dismiss(animated: true, completion: nil)
-                    let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                    appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
+                    MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
                 }
                 .catch(on: DispatchQueue.main) { [weak self] error in
                     self?.dismiss(animated: true, completion: nil) // Dismiss the loader

Session/Settings/NukeDataModal.swift

@@ -130,9 +130,8 @@ final class NukeDataModal : Modal {
     }
     
     @objc private func clearDeviceOnly() {
-        let appDelegate = UIApplication.shared.delegate as! AppDelegate
         ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: false) { [weak self] _ in
-            appDelegate.forceSyncConfigurationNowIfNeeded().ensure(on: DispatchQueue.main) {
+            MessageSender.syncConfiguration(forceSyncNow: true).ensure(on: DispatchQueue.main) {
                 self?.dismiss(animated: true, completion: nil) // Dismiss the loader
                 UserDefaults.removeAll() // Not done in the nuke data implementation as unlinking requires this to happen later
                 General.Cache.cachedEncodedPublicKey.mutate { $0 = nil } // Remove the cached key so it gets re-cached on next access

Session/Settings/SettingsVC.swift

@@ -1,4 +1,5 @@
 import UIKit
+import SessionMessagingKit
 
 final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
     private var profilePictureToBeUploaded: UIImage?
@@ -373,8 +374,7 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
                 if profilePictureToBeUploaded != nil {
                     userDefaults[.lastProfilePictureUpdate] = Date()
                 }
-                let appDelegate = UIApplication.shared.delegate as! AppDelegate
-                appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete()
+                MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete()
                 DispatchQueue.main.async {
                     modalActivityIndicator.dismiss {
                         guard let self = self else { return }

Session/Shared/ConversationCell.swift

@@ -286,16 +286,12 @@ final class ConversationCell : UITableViewCell {
         AssertIsOnMainThread()
         guard let thread = threadViewModel?.threadRecord else { return }
         backgroundColor = threadViewModel.isPinned ? Colors.cellPinned : Colors.cellBackground
-        let isBlocked: Bool
-        if let thread = thread as? TSContactThread {
-            isBlocked = SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(thread.contactSessionID())
-        } else {
-            isBlocked = false
-        }
-        if isBlocked {
+        
+        if thread.isBlocked() {
             accentLineView.backgroundColor = Colors.destructive
             accentLineView.alpha = 1
-        } else {
+        }
+        else {
             accentLineView.backgroundColor = Colors.accent
             accentLineView.alpha = threadViewModel.hasUnreadMessages ? 1 : 0.0001 // Setting the alpha to exactly 0 causes an issue on iOS 12
         }

SessionMessagingKit/Contacts/Contact.swift

@@ -1,3 +1,4 @@
+import Foundation
 
 @objc(SNContact)
 public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is needed for YapDatabase compatibility
@@ -15,9 +16,17 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is
     /// This flag is used to determine whether message requests from this contact are approved
     @objc public var isApproved = false
     /// This flag is used to determine whether message requests from this contact are blocked
-    @objc public var isBlocked = false
+    @objc public var isBlocked = false {
+        didSet {
+            if isBlocked {
+                hasBeenBlocked = true
+            }
+        }
+    }
     /// This flag is used to determine whether this contact has approved the current users message request
     @objc public var didApproveMe = false
+    /// This flag is used to determine whether this contact has ever been blocked (will be included in the config message if so)
+    @objc public var hasBeenBlocked = false
     
     // MARK: Name
     /// The name of the contact. Use this whenever you need the "real", underlying name of a user (e.g. when sending a message).
@@ -72,9 +81,11 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is
         if let profileEncryptionKey = coder.decodeObject(forKey: "profilePictureEncryptionKey") as! OWSAES256Key? { self.profileEncryptionKey = profileEncryptionKey }
         if let threadID = coder.decodeObject(forKey: "threadID") as! String? { self.threadID = threadID }
         
+        let isBlockedFlag: Bool = coder.decodeBool(forKey: "isBlocked")
         isApproved = coder.decodeBool(forKey: "isApproved")
-        isBlocked = coder.decodeBool(forKey: "isBlocked")
+        isBlocked = isBlockedFlag
         didApproveMe = coder.decodeBool(forKey: "didApproveMe")
+        hasBeenBlocked = (coder.decodeBool(forKey: "hasBeenBlocked") || isBlockedFlag)
     }
 
     public func encode(with coder: NSCoder) {
@@ -89,6 +100,7 @@ public class Contact : NSObject, NSCoding { // NSObject/NSCoding conformance is
         coder.encode(isApproved, forKey: "isApproved")
         coder.encode(isBlocked, forKey: "isBlocked")
         coder.encode(didApproveMe, forKey: "didApproveMe")
+        coder.encode(hasBeenBlocked, forKey: "hasBeenBlocked")
     }
     
     // MARK: Equality

SessionMessagingKit/Database/Notification+Contacts.swift

@@ -2,9 +2,11 @@
 public extension Notification.Name {
 
     static let contactUpdated = Notification.Name("contactUpdated")
+    static let contactBlockedStateChanged = Notification.Name("contactBlockedStateChanged")
 }
 
 @objc public extension NSNotification {
 
     @objc static let contactUpdated = Notification.Name.contactUpdated.rawValue as NSString
+    @objc static let contactBlockedStateChanged = Notification.Name.contactBlockedStateChanged.rawValue as NSString
 }

SessionMessagingKit/Database/Storage+Contacts.swift

@@ -43,12 +43,18 @@ extension Storage {
             // Post notification
             let notificationCenter = NotificationCenter.default
             notificationCenter.post(name: .contactUpdated, object: contact.sessionID)
+            
             if contact.sessionID == getUserHexEncodedPublicKey() {
                 notificationCenter.post(name: Notification.Name(kNSNotificationName_LocalProfileDidChange), object: nil)
-            } else {
+            }
+            else {
                 let userInfo = [ kNSNotificationKey_ProfileRecipientId : contact.sessionID ]
                 notificationCenter.post(name: Notification.Name(kNSNotificationName_OtherUsersProfileDidChange), object: nil, userInfo: userInfo)
             }
+            
+            if contact.isBlocked != oldContact?.isBlocked {
+                notificationCenter.post(name: .contactBlockedStateChanged, object: contact.sessionID)
+            }
         }
     }
     

SessionMessagingKit/Database/TSDatabaseView.m

@@ -9,7 +9,6 @@
 #import "TSIncomingMessage.h"
 #import "TSOutgoingMessage.h"
 #import "TSThread.h"
-#import "OWSBlockingManager.h"
 #import <YapDatabase/YapDatabaseAutoView.h>
 #import <YapDatabase/YapDatabaseCrossProcessNotification.h>
 #import <YapDatabase/YapDatabaseViewTypes.h>
@@ -264,7 +263,7 @@ NSString *const TSLazyRestoreAttachmentsGroup = @"TSLazyRestoreAttachmentsGroup"
 
         if ([thread isMessageRequestUsingTransaction:transaction]) {
             // Don't show blocked threads at all
-            if ([[OWSBlockingManager sharedManager] isThreadBlocked: thread]) {
+            if (thread.isBlocked) {
                 return nil;
             }
             

SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift

@@ -44,7 +44,7 @@ extension ConfigurationMessage {
                     if let threadId: String = thread.uniqueId, let v2OpenGroup = storage.getV2OpenGroup(for: threadId) {
                         openGroups.insert("\(v2OpenGroup.server)/\(v2OpenGroup.room)?public_key=\(v2OpenGroup.publicKey)")
                     }
-                    
+
                 default: break
             }
         }
@@ -66,7 +66,8 @@ extension ConfigurationMessage {
                         contact.didApproveMe ||
                         
                         // Sync blocked contacts
-                        SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID)
+                        contact.isBlocked ||
+                        contact.hasBeenBlocked
                     )
                 else {
                     return nil
@@ -85,7 +86,7 @@ extension ConfigurationMessage {
                     hasIsApproved: true,
                     isApproved: contact.isApproved,
                     hasIsBlocked: true,
-                    isBlocked: SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID),
+                    isBlocked: contact.isBlocked,
                     hasDidApproveMe: true,
                     didApproveMe: contact.didApproveMe
                 )