Fixed the background crash issues

• Updated GRDB and SQLCipher
• Shifted the ThreadSettingsViewModel code into a separate function to fix a compilation issue

LibSession-Util

@@ -1 +1 @@
-Subproject commit 6c86cc0d374bf0b3372512c31ab6d0d5727be643
+Subproject commit c7c68fb6b344d431f6a5b7652eab0fd8f7be8286

Podfile

@@ -12,7 +12,7 @@ abstract_target 'GlobalDependencies' do
   pod 'GRDB.swift/SQLCipher'
   
   # FIXME: Would be nice to migrate from CocoaPods to SwiftPackageManager (should allow us to speed up build time), haven't gone through all of the dependencies but currently unfortunately SQLCipher doesn't support SPM (for more info see: https://github.com/sqlcipher/sqlcipher/issues/371)
-  pod 'SQLCipher', '~> 4.5.3'
+  pod 'SQLCipher', '~> 4.5.7'
   pod 'WebRTC-lib'
   
   target 'Session' do

Podfile.lock

@@ -11,7 +11,7 @@ PODS:
   - DifferenceKit/Core (1.3.0)
   - DifferenceKit/UIKitExtension (1.3.0):
     - DifferenceKit/Core
-  - GRDB.swift/SQLCipher (6.13.0):
+  - GRDB.swift/SQLCipher (6.24.1):
     - SQLCipher (>= 3.4.2)
   - libwebp (1.3.2):
     - libwebp/demux (= 1.3.2)
@@ -37,10 +37,10 @@ PODS:
     - CocoaLumberjack
     - OpenSSL-Universal
   - Sodium (0.9.1)
-  - SQLCipher (4.5.3):
+  - SQLCipher (4.5.7):
-    - SQLCipher/standard (= 4.5.3)
+    - SQLCipher/standard (= 4.5.7)
-  - SQLCipher/common (4.5.3)
+  - SQLCipher/common (4.5.7)
-  - SQLCipher/standard (4.5.3):
+  - SQLCipher/standard (4.5.7):
     - SQLCipher/common
   - SwiftProtobuf (1.5.0)
   - WebRTC-lib (114.0.0)
@@ -60,7 +60,7 @@ DEPENDENCIES:
   - SAMKeychain
   - SignalCoreKit (from `https://github.com/oxen-io/session-ios-core-kit`, commit `3acbfe5`)
   - Sodium (from `https://github.com/oxen-io/session-ios-swift-sodium.git`, commit `310c343`)
-  - SQLCipher (~> 4.5.3)
+  - SQLCipher (~> 4.5.7)
   - SwiftProtobuf (~> 1.5.0)
   - WebRTC-lib
   - YYImage/libwebp (from `https://github.com/signalapp/YYImage`)
@@ -112,7 +112,7 @@ SPEC CHECKSUMS:
   CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
   Curve25519Kit: e63f9859ede02438ae3defc5e1a87e09d1ec7ee6
   DifferenceKit: ab185c4d7f9cef8af3fcf593e5b387fb81e999ca
-  GRDB.swift: fe420b1af49ec519c7e96e07887ee44f5dfa2b78
+  GRDB.swift: 136dcb5d8dddca50aae3ba7d77475f79e7232cd8
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   Nimble: f8a8219d16f176429b951e8f7e72df5c23ceddc0
   NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
@@ -122,11 +122,11 @@ SPEC CHECKSUMS:
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   SignalCoreKit: 1fbd8732163ef76de16cd1107d1fa3684b607e5d
   Sodium: a7d42cb46e789d2630fa552d35870b416ed055ae
-  SQLCipher: 57fa9f863fa4a3ed9dd3c90ace52315db8c0fdca
+  SQLCipher: 5e6bfb47323635c8b657b1b27d25c5f1baf63bf5
   SwiftProtobuf: 241400280f912735c1e1b9fe675fdd2c6c4d42e2
   WebRTC-lib: d83df8976fa608b980f1d85796b3de66d60a1953
   YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
 
-PODFILE CHECKSUM: 92bc475070c02411caf98ca5e543dbcb188098e2
+PODFILE CHECKSUM: 6d85dee189f35e1e9a49cf8e95799a7087cfbdd5
 
 COCOAPODS: 1.15.2

Session.xcodeproj/project.pbxproj

@@ -7977,7 +7977,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 441;
+				CURRENT_PROJECT_VERSION = 442;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -8055,7 +8055,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 441;
+				CURRENT_PROJECT_VERSION = 442;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;

Session/Calls/Call Management/SessionCallManager.swift

@@ -198,6 +198,7 @@ public final class SessionCallManager: NSObject, CallManagerProtocol {
             // Stop all jobs except for message sending and when completed suspend the database
             JobRunner.stopAndClearPendingJobs(exceptForVariant: .messageSend, using: dependencies) {
                 Storage.suspendDatabaseAccess()
+                LibSession.closeNetworkConnections()
             }
         }
     }

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -216,11 +216,13 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                 disappearingMessagesConfig: disappearingMessagesConfig
             )
         }
-        .mapWithPrevious { [weak self, dependencies] previous, current -> [SectionModel] in
+        .compactMapWithPrevious { [weak self] prev, current -> [SectionModel]? in self?.content(prev, current) }
+    
+    private func content(_ previous: State?, _ current: State) -> [SectionModel] {
         // If we don't get a `SessionThreadViewModel` then it means the thread was probably deleted
         // so dismiss the screen
         guard let threadViewModel: SessionThreadViewModel = current.threadViewModel else {
-                self?.dismissScreen(type: .popToRoot)
+            self.dismissScreen(type: .popToRoot)
             return []
         }
         
@@ -262,7 +264,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                             customPadding: SessionCell.Padding(bottom: Values.smallSpacing),
                             backgroundStyle: .noBackground
                         ),
-                            onTap: { self?.viewProfilePicture(threadViewModel: threadViewModel) }
+                        onTap: { [weak self] in self?.viewProfilePicture(threadViewModel: threadViewModel) }
                     ),
                     SessionCell.Info(
                         id: .nickname,
@@ -300,7 +302,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                             identifier: "Username",
                             label: threadViewModel.displayName
                         ),
-                            onTap: {
+                        onTap: { [weak self] in
                             self?.textChanged(self?.oldDisplayName, for: .nickname)
                             self?.setIsEditing(true)
                         }
@@ -348,7 +350,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                 identifier: "\(ThreadSettingsViewModel.self).copy_thread_id",
                                 label: "Copy Session ID"
                             ),
-                                onTap: {
+                            onTap: { [weak self] in
                                 switch threadViewModel.threadVariant {
                                     case .contact, .legacyGroup, .group:
                                         UIPasteboard.general.string = threadViewModel.threadId
@@ -546,7 +548,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                 confirmStyle: .danger,
                                 cancelStyle: .alert_text
                             ),
-                                onTap: { [weak self] in
+                            onTap: { [dependencies] in
                                 dependencies.storage.write { db in
                                     try SessionThread.deleteOrLeave(
                                         db,
@@ -607,7 +609,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                 identifier: "Mentions only notification setting",
                                 label: "Mentions only"
                             ),
-                                onTap: {
+                            onTap: { [dependencies] in
                                 let newValue: Bool = !(threadViewModel.threadOnlyNotifyForMentions == true)
                                 
                                 dependencies.storage.writeAsync { db in
@@ -648,7 +650,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                 identifier: "\(ThreadSettingsViewModel.self).mute",
                                 label: "Mute notifications"
                             ),
-                                onTap: {
+                            onTap: { [dependencies] in
                                 dependencies.storage.writeAsync { db in
                                     let currentValue: TimeInterval? = try SessionThread
                                         .filter(id: threadViewModel.threadId)
@@ -715,7 +717,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                 confirmStyle: .danger,
                                 cancelStyle: .alert_text
                             ),
-                                onTap: {
+                            onTap: { [weak self] in
                                 let isBlocked: Bool = (threadViewModel.threadIsBlocked == true)
                                 
                                 self?.updateBlockedState(

Session/Meta/AppDelegate.swift

@@ -204,6 +204,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         JobRunner.stopAndClearPendingJobs(exceptForVariant: .messageSend, using: dependencies) {
             if !self.hasCallOngoing() {
                 Storage.suspendDatabaseAccess()
+                LibSession.closeNetworkConnections()
             }
         }
     }
@@ -284,6 +285,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             
             if Singleton.hasAppContext && Singleton.appContext.isInBackground {
                 Storage.suspendDatabaseAccess()
+                LibSession.closeNetworkConnections()
             }
             
             SNLog("Background poll failed due to manual timeout")
@@ -310,6 +312,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 
                 if Singleton.hasAppContext && Singleton.appContext.isInBackground {
                     Storage.suspendDatabaseAccess()
+                    LibSession.closeNetworkConnections()
                 }
                 
                 cancelTimer.invalidate()

Session/Shared/Types/ObservableTableSource.swift

@@ -216,6 +216,15 @@ public extension TableObservation {
                 .eraseToAnyPublisher()
         }
     }
+    
+    func compactMapWithPrevious<R>(transform: @escaping (T?, T) -> R?) -> TableObservation<R> {
+        return TableObservation<R> { viewModel, dependencies in
+            self.generatePublisher(viewModel, dependencies)
+                .withPrevious()
+                .compactMap(transform)
+                .eraseToAnyPublisher()
+        }
+    }
 }
 
 public extension Array {

SessionMessagingKit/Database/Models/Profile.swift

@@ -112,8 +112,8 @@ public extension Profile {
         
         // If we have both a `profileKey` and a `profilePicture` then the key MUST be valid
         if
-            let profileKeyData: Data = try? container.decode(Data.self, forKey: .profileEncryptionKey),
+            let profileKeyData: Data = try? container.decode(Data?.self, forKey: .profileEncryptionKey),
-            let profilePictureUrlValue: String = try? container.decode(String.self, forKey: .profilePictureUrl)
+            let profilePictureUrlValue: String = try? container.decode(String?.self, forKey: .profilePictureUrl)
         {
             profileKey = profileKeyData
             profilePictureUrl = profilePictureUrlValue
@@ -122,14 +122,14 @@ public extension Profile {
         self = Profile(
             id: try container.decode(String.self, forKey: .id),
             name: try container.decode(String.self, forKey: .name),
-            lastNameUpdate: try? container.decode(TimeInterval.self, forKey: .lastNameUpdate),
+            lastNameUpdate: try? container.decode(TimeInterval?.self, forKey: .lastNameUpdate),
-            nickname: try? container.decode(String.self, forKey: .nickname),
+            nickname: try? container.decode(String?.self, forKey: .nickname),
             profilePictureUrl: profilePictureUrl,
-            profilePictureFileName: try? container.decode(String.self, forKey: .profilePictureFileName),
+            profilePictureFileName: try? container.decode(String?.self, forKey: .profilePictureFileName),
             profileEncryptionKey: profileKey,
-            lastProfilePictureUpdate: try? container.decode(TimeInterval.self, forKey: .lastProfilePictureUpdate),
+            lastProfilePictureUpdate: try? container.decode(TimeInterval?.self, forKey: .lastProfilePictureUpdate),
-            blocksCommunityMessageRequests: try? container.decode(Bool.self, forKey: .blocksCommunityMessageRequests),
+            blocksCommunityMessageRequests: try? container.decode(Bool?.self, forKey: .blocksCommunityMessageRequests),
-            lastBlocksCommunityMessageRequests: try? container.decode(TimeInterval.self, forKey: .lastBlocksCommunityMessageRequests)
+            lastBlocksCommunityMessageRequests: try? container.decode(TimeInterval?.self, forKey: .lastBlocksCommunityMessageRequests)
         )
     }
     

SessionMessagingKit/Shared Models/MessageViewModel.swift

@@ -557,7 +557,7 @@ public extension MessageViewModel {
     struct ReactionInfo: FetchableRecordWithRowId, Decodable, Identifiable, Equatable, Comparable, Hashable, Differentiable, ColumnExpressible {
         public typealias Columns = CodingKeys
         public enum CodingKeys: String, CodingKey, ColumnExpression, CaseIterable {
-            case rowId
+            case rowId = "rowid"
             case reaction
             case profile
         }

SessionNotificationServiceExtension/NotificationServiceExtension.swift

@@ -319,6 +319,7 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
             .map { NSNumber(value: $0) }
             .defaulting(to: NSNumber(value: 0))
         Storage.suspendDatabaseAccess()
+        LibSession.closeNetworkConnections()
         
         self.contentHandler!(silentContent)
     }
@@ -385,6 +386,7 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
         SNLog("[NotificationServiceExtension] Show generic failure message due to error: \(error)", forceNSLog: true)
         DDLog.flushLog()
         Storage.suspendDatabaseAccess()
+        LibSession.closeNetworkConnections()
         
         content.title = "Session"
         content.body = "APN_Message".localized()

SessionShareExtension/ThreadPickerVC.swift

@@ -310,6 +310,7 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
                     receiveCompletion: { [weak self] result in
                         DDLog.flushLog()
                         Storage.suspendDatabaseAccess()
+                        LibSession.closeNetworkConnections()
                         activityIndicator.dismiss { }
                         
                         switch result {

SessionSnodeKit/LibSession/LibSession+Networking.swift

@@ -112,6 +112,12 @@ public extension LibSession {
         })
     }
     
+    static func closeNetworkConnections() {
+        guard let network: UnsafeMutablePointer<network_object> = networkCache.wrappedValue else { return }
+        
+        network_close_connections(network)
+    }
+    
     static func clearSnodeCache() {
         guard let network: UnsafeMutablePointer<network_object> = networkCache.wrappedValue else { return }
         
@@ -388,8 +394,16 @@ public extension LibSession {
                 }
                 return nodes
             }
+            
+            // Need to free the nodes within the path as we are the owner
+            cPaths.forEach { cPath in
+                cPath.nodes.deallocate()
+            }
         }
         
+        // Need to free the cPathsPtr as we are the owner
+        cPathsPtr?.deallocate()
+        
         lastPaths.mutate { lastPaths in
             lastPaths = paths
             

SessionUtilitiesKit/LibSession/Utilities/TypeConversion+Utilities.swift

@@ -139,8 +139,9 @@ public extension Array where Element == String {
         count: Int?
     ) {
         guard
-            let pointee: UnsafeMutablePointer<CChar> = pointer?.pointee,
+            let count: Int = count,
-            let count: Int = count
+            count > 0,
+            let pointee: UnsafeMutablePointer<CChar> = pointer?.pointee
         else { return nil }
         
         self = (0..<count)