Fixed a number of issues found during testing, and some QA issues

• Updated the SyncPushTokensJob to wait for a bit for paths to build before failing
• Updated the PushNotification service to be selectable via the dev settings
• Updated the database timeout code to be a little more developer friendly
• Updated the code to stop blocked contacts from appearing in the main conversation list
• Removed the invalid "push-testnet" push server
• Removed the logic to configure the APNS push service based on the service network (was incorrect)
• Removed the 'Int' raw type constraint for the 'FeatureOption'
• Fixed an issue where the initial conversation query for groups would fail due to an invalid join
• Fixed an issue where the initial conversation query wouldn't include the 'markedUnread' flag (meaning the conversation wouldn't correctly get marked as read)
• Fixed a rare bad memory crash
• Fixed an issue where the modal wouldn't be dismissed after updating the group display name
• Fixed an issue where the "Recreate Group" button was the wrong height

Session.xcodeproj/project.pbxproj

@@ -7923,7 +7923,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 535;
+				CURRENT_PROJECT_VERSION = 536;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7999,7 +7999,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 535;
+				CURRENT_PROJECT_VERSION = 536;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Session/Conversations/ConversationVC.swift

@@ -250,7 +250,10 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                 onTap: { [weak self] in self?.openUrl(Features.legacyGroupDepricationUrl) }
             )
         )
-        result.isHidden = (self.viewModel.threadData.threadVariant != .legacyGroup)
+        result.isHidden = (
+            viewModel.threadData.threadVariant != .legacyGroup ||
+            !viewModel.dependencies[feature: .updatedGroups]
+        )
         
         return result
     }()
@@ -331,7 +334,8 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
         let result: UIView = UIView()
         result.isHidden = (
             viewModel.threadData.threadVariant != .legacyGroup ||
-            viewModel.threadData.currentUserIsClosedGroupAdmin != true
+            viewModel.threadData.currentUserIsClosedGroupAdmin != true ||
+            !viewModel.dependencies[feature: .updatedGroups]
         )
         
         return result
@@ -345,7 +349,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
             .backgroundPrimary,
             .backgroundPrimary
         ]
-        result.set(.height, to: 80)
+        result.set(.height, to: 92)
         
         return result
     }()
@@ -358,7 +362,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
     }()
     
     private lazy var legacyGroupsFooterButton: SessionButton = {
-        let result: SessionButton = SessionButton(style: .bordered, size: .medium)
+        let result: SessionButton = SessionButton(style: .bordered, size: .large)
         result.translatesAutoresizingMaskIntoConstraints = false
         result.setTitle("Recreate Group", for: .normal)
         result.addTarget(self, action: #selector(recreateLegacyGroupTapped), for: .touchUpInside)

Session/Conversations/ConversationViewModel.swift

@@ -118,6 +118,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             currentUserIsClosedGroupMember: Bool?,
             currentUserIsClosedGroupAdmin: Bool?,
             openGroupPermissions: OpenGroup.Permissions?,
+            threadWasMarkedUnread: Bool,
             blinded15SessionId: SessionId?,
             blinded25SessionId: SessionId?
         )
@@ -203,6 +204,12 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                     .asRequest(of: OpenGroup.Permissions.self)
                     .fetchOne(db)
             )
+            let threadWasMarkedUnread: Bool = (try? SessionThread
+                .filter(id: threadId)
+                .select(.markedAsUnread)
+                .asRequest(of: Bool.self)
+                .fetchOne(db))
+                .defaulting(to: false)
             let blinded15SessionId: SessionId? = SessionThread.getCurrentUserBlindedSessionId(
                 db,
                 threadId: threadId,
@@ -227,6 +234,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                 currentUserIsClosedGroupMember,
                 currentUserIsClosedGroupAdmin,
                 openGroupPermissions,
+                threadWasMarkedUnread,
                 blinded15SessionId,
                 blinded25SessionId
             )
@@ -247,6 +255,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             currentUserIsClosedGroupMember: initialData?.currentUserIsClosedGroupMember,
             currentUserIsClosedGroupAdmin: initialData?.currentUserIsClosedGroupAdmin,
             openGroupPermissions: initialData?.openGroupPermissions,
+            threadWasMarkedUnread: initialData?.threadWasMarkedUnread,
             using: dependencies
         ).populatingPostQueryData(
             currentUserBlinded15SessionIdForThisThread: initialData?.blinded15SessionId?.hexString,

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -1257,7 +1257,6 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
                         )
                     },
                     cancelStyle: .danger,
-                    dismissOnConfirm: false,
                     onConfirm: { [weak self, dependencies, threadId] modal in
                         guard
                             let finalName: String = (self?.updatedName ?? "")

Session/Meta/asan_ignorelist.txt

@@ -0,0 +1,2 @@
+# Exclude all code in the libwebp module from the Address Sanitiser (otherwise it won't build)
+module:libwebp

Session/Notifications/SyncPushTokensJob.swift

@@ -116,16 +116,24 @@ public enum SyncPushTokensJob: JobExecutor {
         dependencies[singleton: .pushRegistrationManager].requestPushTokens()
             .flatMap { (pushToken: String, voipToken: String) -> AnyPublisher<(String, String)?, Error> in
                 dependencies[cache: .libSessionNetwork].paths
+                    .filter { !$0.isEmpty }
                     .first()    // Only listen for the first callback
-                    .map { paths in
-                        guard !paths.isEmpty else {
-                            Log.info(.cat, "OS subscription completed, skipping server subscription due to lack of paths")
-                            return nil
+                    .map { _ in (pushToken, voipToken) }
+                    .setFailureType(to: Error.self)
+                    .timeout(
+                        .seconds(5),     // Give the paths a chance to build on launch
+                        scheduler: scheduler,
+                        customError: { NetworkError.timeout(error: "", rawData: nil) }
+                    )
+                    .catch { error -> AnyPublisher<(String, String)?, Error> in
+                        switch error {
+                            case NetworkError.timeout:
+                                Log.info(.cat, "OS subscription completed, skipping server subscription due to path build timeout")
+                                return Just(nil).setFailureType(to: Error.self).eraseToAnyPublisher()
+                            
+                            default: return Fail(error: error).eraseToAnyPublisher()
                         }
-                        
-                        return (pushToken, voipToken)
                     }
-                    .setFailureType(to: Error.self)
                     .eraseToAnyPublisher()
             }
             .flatMap { (tokenInfo: (String, String)?) -> AnyPublisher<Void, Error> in
@@ -197,24 +205,44 @@ public enum SyncPushTokensJob: JobExecutor {
             )
     }
     
-    public static func run(uploadOnlyIfStale: Bool, using dependencies: Dependencies) {
-        guard let job: Job = Job(
-            variant: .syncPushTokens,
-            behaviour: .runOnce,
-            details: SyncPushTokensJob.Details(
-                uploadOnlyIfStale: uploadOnlyIfStale
-            )
-        )
-        else { return }
-                                 
-        SyncPushTokensJob.run(
-            job,
-            scheduler: DispatchQueue.global(qos: .default),
-            success: { _, _ in },
-            failure: { _, _, _ in },
-            deferred: { _ in },
-            using: dependencies
-        )
+    public static func run(uploadOnlyIfStale: Bool, using dependencies: Dependencies) -> AnyPublisher<Void, Error> {
+        return Deferred {
+            Future<Void, Error> { resolver in
+                guard let job: Job = Job(
+                    variant: .syncPushTokens,
+                    behaviour: .runOnce,
+                    details: SyncPushTokensJob.Details(
+                        uploadOnlyIfStale: uploadOnlyIfStale
+                    )
+                )
+                else { return resolver(Result.failure(NetworkError.parsingFailed)) }
+                
+                SyncPushTokensJob.run(
+                    job,
+                    scheduler: DispatchQueue.global(qos: .userInitiated),
+                    success: { _, _ in resolver(Result.success(())) },
+                    failure: { _, error, _ in resolver(Result.failure(error)) },
+                    deferred: { job in
+                        dependencies[singleton: .jobRunner]
+                            .afterJob(job)
+                            .first()
+                            .sinkUntilComplete(
+                                receiveValue: { result in
+                                    switch result {
+                                        /// If it gets deferred a second time then we should probably just fail - no use waiting on something
+                                        /// that may never run (also means we can avoid another potential defer loop)
+                                        case .notFound, .deferred: resolver(Result.failure(NetworkError.unknown))
+                                        case .failed(let error, _): resolver(Result.failure(error))
+                                        case .succeeded: resolver(Result.success(()))
+                                    }
+                                }
+                            )
+                    },
+                    using: dependencies
+                )
+            }
+        }
+        .eraseToAnyPublisher()
     }
 }
 

Session/Onboarding/DisplayNameScreen.swift

@@ -128,7 +128,11 @@ struct DisplayNameScreen: View {
                 onboarding.completeRegistration {
                     // Trigger the 'SyncPushTokensJob' directly as we don't want to wait for paths to build
                     // before requesting the permission from the user
-                    if shouldSyncPushTokens { SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies) }
+                    if shouldSyncPushTokens {
+                        SyncPushTokensJob
+                            .run(uploadOnlyIfStale: false, using: dependencies)
+                            .sinkUntilComplete()
+                    }
                     
                     // Go to the home screen
                     let homeVC: HomeVC = HomeVC(using: dependencies)

Session/Onboarding/LoadingScreen.swift

@@ -41,7 +41,11 @@ struct LoadingScreen: View {
                 onboarding.completeRegistration {
                     // Trigger the 'SyncPushTokensJob' directly as we don't want to wait for paths to build
                     // before requesting the permission from the user
-                    if shouldSyncPushTokens { SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies) }
+                    if shouldSyncPushTokens {
+                        SyncPushTokensJob
+                            .run(uploadOnlyIfStale: false, using: dependencies)
+                            .sinkUntilComplete()
+                    }
                     
                     onComplete()
                 }

Session/Onboarding/PNModeScreen.swift

@@ -156,7 +156,11 @@ struct PNModeScreen: View {
             onboarding.completeRegistration {
                 // Trigger the 'SyncPushTokensJob' directly as we don't want to wait for paths to build
                 // before requesting the permission from the user
-                if shouldSyncPushTokens { SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies) }
+                if shouldSyncPushTokens {
+                    SyncPushTokensJob
+                        .run(uploadOnlyIfStale: false, using: dependencies)
+                        .sinkUntilComplete()
+                }
                 
                 let homeVC: HomeVC = HomeVC(using: dependencies)
                 dependencies[singleton: .app].setHomeViewController(homeVC)

Session/Settings/DeveloperSettingsViewModel.swift

@@ -73,6 +73,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         case serviceNetwork
         case forceOffline
         case resetSnodeCache
+        case pushNotificationService
         
         case updatedDisappearingMessages
         case debugDisappearingMessageDurations
@@ -109,6 +110,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                 case .serviceNetwork: return "serviceNetwork"
                 case .forceOffline: return "forceOffline"
                 case .resetSnodeCache: return "resetSnodeCache"
+                case .pushNotificationService: return "pushNotificationService"
                 
                 case .updatedDisappearingMessages: return "updatedDisappearingMessages"
                 case .debugDisappearingMessageDurations: return "debugDisappearingMessageDurations"
@@ -148,6 +150,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                 case .serviceNetwork: result.append(.serviceNetwork); fallthrough
                 case .forceOffline: result.append(.forceOffline); fallthrough
                 case .resetSnodeCache: result.append(.resetSnodeCache); fallthrough
+                case .pushNotificationService: result.append(.pushNotificationService); fallthrough
                 
                 case .updatedDisappearingMessages: result.append(.updatedDisappearingMessages); fallthrough
                 case .debugDisappearingMessageDurations: result.append(.debugDisappearingMessageDurations); fallthrough
@@ -187,6 +190,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         
         let serviceNetwork: ServiceNetwork
         let forceOffline: Bool
+        let pushNotificationService: PushNotificationAPI.Service
         
         let debugDisappearingMessageDurations: Bool
         let updatedDisappearingMessages: Bool
@@ -219,6 +223,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                 
                 serviceNetwork: dependencies[feature: .serviceNetwork],
                 forceOffline: dependencies[feature: .forceOffline],
+                pushNotificationService: dependencies[feature: .pushNotificationService],
                 
                 debugDisappearingMessageDurations: dependencies[feature: .debugDisappearingMessageDurations],
                 updatedDisappearingMessages: dependencies[feature: .updatedDisappearingMessages],
@@ -429,6 +434,32 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                     """,
                     trailingAccessory: .highlightingBackgroundLabel(title: "Reset Cache"),
                     onTap: { [weak self] in self?.resetServiceNodeCache() }
+                ),
+                SessionCell.Info(
+                    id: .pushNotificationService,
+                    title: "Push Notification Service",
+                    subtitle: """
+                    The service used for subscribing for push notifications. The production service only works for production builds and neither service work in the Simulator. 
+                    
+                    <b>Warning:</b>
+                    Changing this option will result in unsubscribing from the current service and subscribing to the new service which may take a few minutes.
+                    """,
+                    trailingAccessory: .dropDown { current.pushNotificationService.title },
+                    onTap: { [weak self, dependencies] in
+                        self?.transitionToScreen(
+                            SessionTableViewController(
+                                viewModel: SessionListViewModel<PushNotificationAPI.Service>(
+                                    title: "Push Notification Service",
+                                    options: PushNotificationAPI.Service.allCases,
+                                    behaviour: .autoDismiss(
+                                        initialSelection: current.pushNotificationService,
+                                        onOptionSelected: self?.updatePushNotificationService
+                                    ),
+                                    using: dependencies
+                                )
+                            )
+                        )
+                    }
                 )
             ]
         )
@@ -745,7 +776,8 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
                 case .loggingCategory: resetLoggingCategories()
                 
                 case .serviceNetwork: updateServiceNetwork(to: nil)
-                case .forceOffline:  updateFlag(for: .forceOffline, to: nil)
+                case .forceOffline: updateFlag(for: .forceOffline, to: nil)
+                case .pushNotificationService: updatePushNotificationService(to: nil)
                     
                 case .debugDisappearingMessageDurations:
                     updateFlag(for: .debugDisappearingMessageDurations, to: nil)
@@ -805,6 +837,30 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
         forceRefresh(type: .databaseQuery)
     }
     
+    private func updatePushNotificationService(to updatedService: PushNotificationAPI.Service?) {
+        guard
+            dependencies[defaults: .standard, key: .isUsingFullAPNs],
+            updatedService != dependencies[feature: .pushNotificationService]
+        else {
+            forceRefresh(type: .databaseQuery)
+            return
+        }
+        
+        /// Disable push notifications to trigger the unsubscribe, then re-enable them after updating the feature setting
+        dependencies[defaults: .standard, key: .isUsingFullAPNs] = false
+        SyncPushTokensJob
+            .run(uploadOnlyIfStale: false, using: dependencies)
+            .handleEvents(
+                receiveOutput: { [weak self, dependencies] _ in
+                    dependencies.set(feature: .pushNotificationService, to: updatedService)
+                    dependencies[defaults: .standard, key: .isUsingFullAPNs] = true
+                    self?.forceRefresh(type: .databaseQuery)
+                }
+            )
+            .flatMap { [dependencies] _ in SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies) }
+            .sinkUntilComplete()
+    }
+    
     private static func updateServiceNetwork(
         to updatedNetwork: ServiceNetwork?,
         using dependencies: Dependencies
@@ -914,7 +970,7 @@ class DeveloperSettingsViewModel: SessionTableViewModel, NavigatableStateHolder,
             dependencies[singleton: .currentUserPoller].startIfNeeded()
             
             /// Re-sync the push tokens (if there are any)
-            SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies)
+            SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies).sinkUntilComplete()
             
             Log.info("[DevSettings] Completed swap to \(String(describing: updatedNetwork))")
         }
@@ -1425,6 +1481,9 @@ private class DocumentPickerResult: NSObject, UIDocumentPickerDelegate {
 extension ServiceNetwork: @retroactive ContentIdentifiable {}
 extension ServiceNetwork: @retroactive ContentEquatable {}
 extension ServiceNetwork: Listable {}
+extension PushNotificationAPI.Service: @retroactive ContentIdentifiable {}
+extension PushNotificationAPI.Service: @retroactive ContentEquatable {}
+extension PushNotificationAPI.Service: Listable {}
 extension Log.Level: @retroactive ContentIdentifiable {}
 extension Log.Level: @retroactive ContentEquatable {}
 extension Log.Level: Listable {}

Session/Settings/NotificationSettingsViewModel.swift

@@ -105,7 +105,9 @@ class NotificationSettingsViewModel: SessionTableViewModel, NavigatableStateHold
                                 dependencies[defaults: .standard, key: .isUsingFullAPNs] = !dependencies[defaults: .standard, key: .isUsingFullAPNs]
 
                                 // Force sync the push tokens on change
-                                SyncPushTokensJob.run(uploadOnlyIfStale: false, using: dependencies)
+                                SyncPushTokensJob
+                                    .run(uploadOnlyIfStale: false, using: dependencies)
+                                    .sinkUntilComplete()
                                 self?.forceRefresh(type: .postDatabaseQuery)
                             }
                         ),

SessionMessagingKit/Database/Models/Profile.swift

@@ -12,7 +12,7 @@ public struct Profile: Codable, Identifiable, Equatable, Hashable, FetchableReco
     public static var databaseTableName: String { "profile" }
     internal static let interactionForeignKey = ForeignKey([Columns.id], to: [Interaction.Columns.authorId])
     internal static let contactForeignKey = ForeignKey([Columns.id], to: [Contact.Columns.id])
-    internal static let groupMemberForeignKey = ForeignKey([Columns.id], to: [GroupMember.Columns.profileId])
+    internal static let groupMemberForeignKey = ForeignKey([GroupMember.Columns.profileId], to: [Columns.id])
     internal static let contact = hasOne(Contact.self, using: contactForeignKey)
     public static let groupMembers = hasMany(GroupMember.self, using: groupMemberForeignKey)
     

SessionMessagingKit/LibSession/Config Handling/LibSession+ConvoInfoVolatile.swift

@@ -265,7 +265,8 @@ internal extension LibSession {
         let targetThreads: [SessionThread] = threads
             .filter {
                 $0.id != userSessionId.hexString &&
-                (try? SessionId(from: $0.id))?.prefix == .standard
+                (try? SessionId(from: $0.id))?.prefix != .blinded15 &&
+                (try? SessionId(from: $0.id))?.prefix != .blinded25
             }
         
         // If we have no updated threads then no need to continue

SessionMessagingKit/Sending & Receiving/Notifications/Models/SubscribeRequest.swift

@@ -95,10 +95,10 @@ extension PushNotificationAPI {
                 try container.encode(serviceInfo, forKey: .serviceInfo)
                 try container.encode(notificationsEncryptionKey.toHexString(), forKey: .notificationsEncryptionKey)
                 
-                // Use the correct APNS service based on the serviceNetwork (default to mainnet)
-                switch encoder.dependencies?[feature: .serviceNetwork] {
-                    case .testnet: try container.encode(Service.sandbox, forKey: .service)
-                    case .mainnet, .none: try container.encode(Service.apns, forKey: .service)
+                // Use the desired APNS service (default to apns)
+                switch encoder.dependencies?[feature: .pushNotificationService] {
+                    case .sandbox: try container.encode(Service.sandbox, forKey: .service)
+                    case .apns, .none: try container.encode(Service.apns, forKey: .service)
                 }
                 
                 try super.encode(to: encoder)

SessionMessagingKit/Sending & Receiving/Notifications/PushNotificationAPI.swift

@@ -25,13 +25,7 @@ public enum PushNotificationAPI {
     private static let maxRetryCount: Int = 4
     private static let tokenExpirationInterval: TimeInterval = (12 * 60 * 60)
     
-    public static let server: FeatureValue<String> = FeatureValue(feature: .serviceNetwork) { feature in
-        switch feature {
-            case .mainnet: return "https://push.getsession.org"
-            case .testnet: return "http://push-testnet.getsession.org"
-        }
-    }
-    
+    public static let server: String = "https://push.getsession.org"
     public static let serverPublicKey = "d7557fe563e2610de876c0ac7341b62f3c82d5eea4b62c702392ea4368f51b3b"
     public static let legacyServer = "https://live.apns.getsession.org"
     public static let legacyServerPublicKey = "642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049"

SessionMessagingKit/Sending & Receiving/Notifications/Types/PushNotificationAPIEndpoint.swift

@@ -45,7 +45,7 @@ public extension PushNotificationAPI {
                     .legacyGroupsOnlySubscribe, .legacyGroupSubscribe, .legacyGroupUnsubscribe:
                     return PushNotificationAPI.legacyServer
                     
-                default: return PushNotificationAPI.server.value(using: dependencies)
+                default: return PushNotificationAPI.server
             }
         }
         

SessionMessagingKit/Sending & Receiving/Notifications/Types/Service.swift

@@ -1,10 +1,40 @@
 // Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
 
 import Foundation
+import SessionUtilitiesKit
 
-extension PushNotificationAPI {
-    enum Service: String, Codable {
+// MARK: - FeatureStorage
+
+public extension FeatureStorage {
+    static let pushNotificationService: FeatureConfig<PushNotificationAPI.Service> = Dependencies.create(
+        identifier: "pushNotificationService",
+        defaultOption: .apns
+    )
+}
+
+// MARK: - PushNotificationAPI.Service
+
+public extension PushNotificationAPI {
+    enum Service: String, Codable, CaseIterable, FeatureOption {
         case apns
         case sandbox = "apns-sandbox"   // Use for push notifications in Testnet
+        
+        // MARK: - Feature Option
+        
+        public static var defaultOption: Service = .apns
+        
+        public var title: String {
+            switch self {
+                case .apns: return "Production"
+                case .sandbox: return "Sandbox"
+            }
+        }
+        
+        public var subtitle: String? {
+            switch self {
+                case .apns: return "This is the production push notification service."
+                case .sandbox: return "This is the sandbox push notification service, it should be used when running builds from Xcode on a device to test notifications."
+            }
+        }
     }
 }

SessionMessagingKit/Shared Models/SessionThreadViewModel.swift

@@ -469,6 +469,7 @@ public extension SessionThreadViewModel {
         currentUserIsClosedGroupMember: Bool? = nil,
         currentUserIsClosedGroupAdmin: Bool? = nil,
         openGroupPermissions: OpenGroup.Permissions? = nil,
+        threadWasMarkedUnread: Bool? = nil,
         unreadCount: UInt = 0,
         hasUnreadMessagesOfAnyKind: Bool = false,
         threadCanWrite: Bool = true,
@@ -494,7 +495,7 @@ public extension SessionThreadViewModel {
         self.threadIsDraft = nil
         
         self.threadContactIsTyping = nil
-        self.threadWasMarkedUnread = nil
+        self.threadWasMarkedUnread = threadWasMarkedUnread
         self.threadUnreadCount = unreadCount
         self.threadUnreadMentionCount = nil
         self.threadHasUnreadMessagesOfAnyKind = hasUnreadMessagesOfAnyKind
@@ -1031,6 +1032,11 @@ public extension SessionThreadViewModel {
                 \(SQL("\(thread[.variant]) != \(SessionThread.Variant.contact)")) OR
                 \(SQL("\(thread[.id]) = \(userSessionId.hexString)")) OR
                 \(contact[.isApproved]) = true
+            ) AND
+            -- Is not a blocked contact
+            (
+                \(SQL("\(thread[.variant]) != \(SessionThread.Variant.contact)")) OR
+                \(contact[.isBlocked]) != true
             )
         """
     }

SessionUIKit/Components/ConfirmationModal.swift

@@ -313,9 +313,9 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
                 textField.accessibilityIdentifier = inputInfo.accessibility?.identifier
                 textField.accessibilityLabel = inputInfo.accessibility?.label ?? textField.text
                 textFieldContainer.isHidden = false
-                internalOnTextChanged = { [weak confirmButton, weak cancelButton] text, _ in
+                internalOnTextChanged = { [weak textField, weak confirmButton, weak cancelButton] text, _ in
                     onTextChanged(text)
-                    self.textField.accessibilityLabel = text
+                    textField?.accessibilityLabel = text
                     confirmButton?.isEnabled = info.confirmEnabled.isValid(with: info)
                     cancelButton?.isEnabled = info.cancelEnabled.isValid(with: info)
                 }
@@ -327,17 +327,21 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
                 textField.placeholder = firstInputInfo.placeholder
                 textField.text = (firstInputInfo.initialValue ?? "")
                 textField.clearButtonMode = (firstInputInfo.clearButton ? .always : .never)
+                textField.isAccessibilityElement = true
                 textField.accessibilityIdentifier = firstInputInfo.accessibility?.identifier
                 textField.accessibilityLabel = firstInputInfo.accessibility?.label
                 textFieldContainer.isHidden = false
                 textView.text = (secondInputInfo.initialValue ?? "")
+                textView.isAccessibilityElement = true
                 textView.accessibilityIdentifier = secondInputInfo.accessibility?.identifier
                 textView.accessibilityLabel = secondInputInfo.accessibility?.label
                 textViewPlaceholder.text = secondInputInfo.placeholder
                 textViewPlaceholder.isHidden = !textView.text.isEmpty
                 textViewContainer.isHidden = false
-                internalOnTextChanged = { [weak confirmButton, weak cancelButton] firstText, secondText in
+                internalOnTextChanged = { [weak textField, weak textView, weak confirmButton, weak cancelButton] firstText, secondText in
                     onTextChanged(firstText, secondText)
+                    textField?.accessibilityLabel = firstText
+                    textView?.accessibilityLabel = secondText
                     confirmButton?.isEnabled = info.confirmEnabled.isValid(with: info)
                     cancelButton?.isEnabled = info.cancelEnabled.isValid(with: info)
                 }

SessionUtilitiesKit/Database/Storage.swift

@@ -7,6 +7,10 @@ import CryptoKit
 import Combine
 import GRDB
 
+#if DEBUG
+import Darwin
+#endif
+
 // MARK: - Singleton
 
 public extension Singleton {
@@ -718,7 +722,42 @@ open class Storage {
         
         /// If this is a synchronous operation then `semaphore` will exist and will block here waiting on the signal from one of the
         /// above closures to be sent
-        let semaphoreResult: DispatchTimeoutResult? = semaphore?.wait(timeout: .now() + .seconds(Storage.transactionDeadlockTimeoutSeconds))
+        ///
+        /// **Note:** Unfortunately this timeout can be really annoying when debugging because the semaphore timeout is based on
+        /// system time which doesn't get paused when stopping on a breakpoint (which means if you break in the middle of a database
+        /// query it's pretty much guaranteed to timeout)
+        ///
+        /// To try to avoid this we have the below code to try to replicate the behaviour of the proper semaphore timeout while the debugger
+        /// is attached as this approach does seem to get paused (or at least only perform a single iteration per debugger step)
+        var semaphoreResult: DispatchTimeoutResult?
+        
+        #if DEBUG
+        if !isDebuggerAttached() {
+            semaphoreResult = semaphore?.wait(timeout: .now() + .seconds(Storage.transactionDeadlockTimeoutSeconds))
+        }
+        else if !info.isAsync {
+            let timerSemaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
+            let timerQueue = DispatchQueue(label: "org.session.debugSemaphoreTimer", qos: .userInteractive)
+            let timer = DispatchSource.makeTimerSource(queue: timerQueue)
+            var iterations: UInt64 = 0
+            timer.schedule(deadline: .now(), repeating: .milliseconds(100))
+                        
+            timer.setEventHandler {
+                iterations += 1
+                semaphoreResult = semaphore?.wait(timeout: .now())  // Get the result from the original semaphore
+                
+                if semaphoreResult == .success || iterations >= 50 {
+                    timer.cancel()
+                    timerSemaphore.signal()
+                }
+            }
+            
+            timer.resume()
+            timerSemaphore.wait()   // Wait indefinitely for the timer semaphore
+        }
+        #else
+        semaphoreResult = semaphore?.wait(timeout: .now() + .seconds(Storage.transactionDeadlockTimeoutSeconds))
+        #endif
         
         /// If the transaction timed out then log the error and report a failure
         guard semaphoreResult != .timedOut else {
@@ -1100,3 +1139,14 @@ public extension Storage {
         return try ChaChaPoly.open(sealedBox, using: key, authenticating: Data())
     }
 }
+
+#if DEBUG
+func isDebuggerAttached() -> Bool {
+    var info = kinfo_proc()
+    var size = MemoryLayout<kinfo_proc>.stride
+    var mib: [Int32] = [CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()]
+    let sysctlResult = sysctl(&mib, UInt32(mib.count), &info, &size, nil, 0)
+    guard sysctlResult == 0 else { return false }
+    return (info.kp_proc.p_flag & P_TRACED) != 0
+}
+#endif

SessionUtilitiesKit/General/Feature.swift

@@ -5,7 +5,8 @@
 import Foundation
 
 public final class Features {
-    public static let legacyGroupDepricationDate: Date = Date.distantFuture            // TODO: [GROUPS REBUILD] Set this date
+    public static let createUpdatedGroupFromDate: Date = Date.distantFuture
+    public static let legacyGroupDepricationDate: Date = Date.distantFuture
     public static let legacyGroupDepricationUrl: String = "https://getsession.org/groups"
 }
 
@@ -40,7 +41,7 @@ public extension FeatureStorage {
         defaultOption: true,
         automaticChangeBehaviour: Feature<Bool>.ChangeBehaviour(
             value: true,
-            condition: .after(timestamp: Features.legacyGroupDepricationDate.timeIntervalSince1970)
+            condition: .after(timestamp: Features.createUpdatedGroupFromDate.timeIntervalSince1970)
         )
     )
     
@@ -91,7 +92,7 @@ public extension FeatureStorage {
 
 // MARK: - FeatureOption
 
-public protocol FeatureOption: RawRepresentable, CaseIterable, Equatable where RawValue == Int {
+public protocol FeatureOption: RawRepresentable, CaseIterable, Equatable {
     static var defaultOption: Self { get }
     
     var isValidOption: Bool { get }
@@ -138,9 +139,10 @@ public struct Feature<T: FeatureOption>: FeatureType {
         defaultOption: T,
         automaticChangeBehaviour: ChangeBehaviour? = nil
     ) {
-        guard T.self == Bool.self || !options.appending(defaultOption).contains(where: { $0.rawValue == 0 }) else {
-            preconditionFailure("A rawValue of '0' is a protected value (it indicates unset)")
-        }
+        guard
+            T.self == Bool.self ||
+            !options.appending(defaultOption).contains(where: { ($0.rawValue as? Int) == 0 })
+        else { preconditionFailure("A rawValue of '0' is a protected value (it indicates unset)") }
         
         self.identifier = identifier
         self.options = options
@@ -157,8 +159,11 @@ public struct Feature<T: FeatureOption>: FeatureType {
             // if an entry exists and return `nil` if not before retrieving an `Int` representation of
             // the value and converting to the desired type
             guard dependencies[defaults: .appGroup].object(forKey: identifier) != nil else { return nil }
+            guard let selectedOption: T.RawValue = dependencies[defaults: .appGroup].object(forKey: identifier) as? T.RawValue else {
+                Log.error("Unable to retrieve feature option for \(identifier) due to incorrect storage type")
+                return nil
+            }
             
-            let selectedOption: Int = dependencies[defaults: .appGroup].integer(forKey: identifier)
             return T(rawValue: selectedOption)
         }()
         

SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift

@@ -23,10 +23,24 @@ public extension String {
 
 public extension Array where Element == String {
     init?(pointer: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>?, count: Int?) {
+        /// If `count` was provided but is `0` then accessing the pointer could crash (as it could be bad memory) so just return an empty array
+        guard let count: Int = count else { return nil }
+        guard count > 0 else {
+            self = []
+            return
+        }
+        
         self.init(pointee: pointer.map { $0.pointee.map { UnsafePointer($0) } }, count: count)
     }
     
     init?(pointer: UnsafeMutablePointer<UnsafePointer<CChar>?>?, count: Int?) {
+        /// If `count` was provided but is `0` then accessing the pointer could crash (as it could be bad memory) so just return an empty array
+        guard let count: Int = count else { return nil }
+        guard count > 0 else {
+            self = []
+            return
+        }
+        
         self.init(pointee: pointer.map { $0.pointee }, count: count)
     }
     
@@ -55,8 +69,7 @@ public extension Array where Element == String {
             let pointee: UnsafePointer<CChar> = pointee
         else { return nil }
         
-        // If we were given a count but it's 0 then trying to access the pointer could
-        // crash (as it could be bad memory) so just return an empty array
+        /// If `count` was provided but is `0` then accessing the pointer could crash (as it could be bad memory) so just return an empty array
         guard count > 0 else {
             self = []
             return