Merge remote-tracking branch 'upstream/dev' into fix/crashes-and-improvements

# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Calls/Call Management/SessionCallManager.swift
#	Session/Meta/AppDelegate.swift
#	Session/Notifications/PushRegistrationManager.swift
#	SessionNotificationServiceExtension/NotificationServiceExtension.swift
#	SessionShareExtension/ThreadPickerVC.swift
#	SessionUtilitiesKit/Database/Storage.swift

Session/Calls/Call Management/SessionCallManager.swift

@@ -205,7 +205,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) { _ in
                 LibSession.suspendNetworkAccess()
-                Storage.shared.suspendDatabaseAccess()
+                dependencies.storage.suspendDatabaseAccess()
                 Log.flush()
             }
         }

Session/Notifications/PushRegistrationManager.swift

@@ -293,7 +293,7 @@ public enum PushRegistrationError: Error {
         // FIXME: Initialise the `PushRegistrationManager` with a dependencies instance
         let dependencies: Dependencies = Dependencies()
         
-        Storage.shared.resumeDatabaseAccess()
+        dependencies.storage.resumeDatabaseAccess()
         LibSession.resumeNetworkAccess()
         
         let maybeCall: SessionCall? = Storage.shared.write { db in

SessionMessagingKit/Sending & Receiving/Attachments/SignalAttachment.swift

@@ -104,7 +104,7 @@ public enum TSImageQuality: UInt {
 // [SignalAttachment hasError] will be true for non-valid attachments.
 //
 // TODO: Perhaps do conversion off the main thread?
-public class SignalAttachment: Equatable, Hashable {
+public class SignalAttachment: Equatable {
 
     // MARK: Properties
 
@@ -1131,20 +1131,4 @@ public class SignalAttachment: Equatable, Hashable {
             lhs.isVoiceMessage == rhs.isVoiceMessage
         )
     }
-    
-    // MARK: - Hashable
-    
-    public func hash(into hasher: inout Hasher) {
-        dataUTI.hash(into: &hasher)
-        captionText.hash(into: &hasher)
-        linkPreviewDraft.hash(into: &hasher)
-        isConvertibleToTextMessage.hash(into: &hasher)
-        isConvertibleToContactShare.hash(into: &hasher)
-        isVoiceMessage.hash(into: &hasher)
-        dataSource.hash(into: &hasher)
-        cachedImage?.size.width.hash(into: &hasher)
-        cachedImage?.size.height.hash(into: &hasher)
-        cachedVideoPreview?.size.width.hash(into: &hasher)
-        cachedVideoPreview?.size.height.hash(into: &hasher)
-    }
 }

SessionUtilitiesKit/Media/DataSource.swift

@@ -4,7 +4,7 @@ import Foundation
 
 // MARK: - DataSource
 
-public protocol DataSource: Equatable, Hashable {
+public protocol DataSource: Equatable {
     var data: Data { get }
     var dataUrl: URL? { get }
 
@@ -140,13 +140,6 @@ public class DataSourceValue: DataSource {
         try data.write(to: URL(fileURLWithPath: path), options: .atomic)
     }
     
-    public func hash(into hasher: inout Hasher) {
-        data.hash(into: &hasher)
-        sourceFilename.hash(into: &hasher)
-        fileExtension.hash(into: &hasher)
-        shouldDeleteOnDeinit.hash(into: &hasher)
-    }
-    
     public static func == (lhs: DataSourceValue, rhs: DataSourceValue) -> Bool {
         return (
             lhs.data == rhs.data &&
@@ -234,12 +227,6 @@ public class DataSourcePath: DataSource {
         try FileManager.default.copyItem(atPath: filePath, toPath: path)
     }
     
-    public func hash(into hasher: inout Hasher) {
-        filePath.hash(into: &hasher)
-        sourceFilename.hash(into: &hasher)
-        shouldDeleteOnDeinit.hash(into: &hasher)
-    }
-    
     public static func == (lhs: DataSourcePath, rhs: DataSourcePath) -> Bool {
         return (
             lhs.filePath == rhs.filePath &&

SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift

@@ -95,7 +95,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         set { setCurrentItem(newValue, direction: .forward, animated: false) }
     }
     
-    private var cachedPages: [SignalAttachmentItem: AttachmentPrepViewController] = [:]
+    private var cachedPages: [UUID: AttachmentPrepViewController] = [:]
 
     public var shouldHideControls: Bool {
         guard let pageViewController: AttachmentPrepViewController = pageViewControllers?.first else {
@@ -477,7 +477,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
     }
 
     private func buildPage(item: SignalAttachmentItem) -> AttachmentPrepViewController? {
-        if let cachedPage = cachedPages[item] {
+        if let cachedPage = cachedPages[item.uniqueIdentifier] {
             Log.debug("[AttachmentApprovalViewController] cache hit.")
             return cachedPage
         }
@@ -485,7 +485,7 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         Log.debug("[AttachmentApprovalViewController] cache miss.")
         let viewController = AttachmentPrepViewController(attachmentItem: item, using: dependencies)
         viewController.prepDelegate = self
-        cachedPages[item] = viewController
+        cachedPages[item.uniqueIdentifier] = viewController
 
         return viewController
     }

SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentItemCollection.swift

@@ -24,12 +24,13 @@ class AddMoreRailItem: GalleryRailItem {
     }
 }
 
-class SignalAttachmentItem: Hashable {
+class SignalAttachmentItem: Equatable {
 
     enum SignalAttachmentItemError: Error {
         case noThumbnail
     }
 
+    let uniqueIdentifier: UUID = UUID()
     let attachment: SignalAttachment
 
     // This might be nil if the attachment is not a valid image.
@@ -63,12 +64,6 @@ class SignalAttachmentItem: Hashable {
         return attachment.staticThumbnail()
     }
 
-    // MARK: Hashable
-    
-    func hash(into hasher: inout Hasher) {
-        attachment.hash(into: &hasher)
-    }
-
     // MARK: Equatable
 
     static func == (lhs: SignalAttachmentItem, rhs: SignalAttachmentItem) -> Bool {