Update action

fanyu · fanyu · commit 84fc1eba4994 · 2022-05-07T11:23:26.000+08:00
diff --git a/Mixin.xcodeproj/project.pbxproj b/Mixin.xcodeproj/project.pbxproj
@@ -625,7 +625,7 @@
 		7CF9503F277D8839000AECC7 /* MediasPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF9503E277D8839000AECC7 /* MediasPreviewViewController.swift */; };
 		7CF95041277D8904000AECC7 /* SelectedMediaCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF95040277D8904000AECC7 /* SelectedMediaCell.swift */; };
 		7CFF1387277D5C3400FA745D /* MediasPreviewWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CFF1386277D5C3400FA745D /* MediasPreviewWindow.swift */; };
-		7CFF1389277D5C6600FA745D /* MediaPreviewWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7CFF1388277D5C6600FA745D /* MediaPreviewWindow.xib */; };
+		7CFF1389277D5C6600FA745D /* MediasPreviewWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7CFF1388277D5C6600FA745D /* MediasPreviewWindow.xib */; };
 		811C8154F03C8CBB72DBA1F4 /* Pods_MixinShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A8E0E9B65F16ADB27E6F25 /* Pods_MixinShare.framework */; };
 		842347EE2695BA6400009A39 /* InitializeBotJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842347ED2695BA6400009A39 /* InitializeBotJob.swift */; };
 		94046B91272DC265007C1D4A /* GroupCallMembersDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94046B90272DC265007C1D4A /* GroupCallMembersDataSource.swift */; };
@@ -1619,7 +1619,7 @@
 		7CF9503E277D8839000AECC7 /* MediasPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediasPreviewViewController.swift; sourceTree = "<group>"; };
 		7CF95040277D8904000AECC7 /* SelectedMediaCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedMediaCell.swift; sourceTree = "<group>"; };
 		7CFF1386277D5C3400FA745D /* MediasPreviewWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediasPreviewWindow.swift; sourceTree = "<group>"; };
-		7CFF1388277D5C6600FA745D /* MediaPreviewWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MediaPreviewWindow.xib; sourceTree = "<group>"; };
+		7CFF1388277D5C6600FA745D /* MediasPreviewWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MediasPreviewWindow.xib; sourceTree = "<group>"; };
 		842347ED2695BA6400009A39 /* InitializeBotJob.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitializeBotJob.swift; sourceTree = "<group>"; };
 		8C43D9D96FCB101481DFD90F /* Pods-Mixin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mixin.release.xcconfig"; path = "Pods/Target Support Files/Pods-Mixin/Pods-Mixin.release.xcconfig"; sourceTree = "<group>"; };
 		94046B90272DC265007C1D4A /* GroupCallMembersDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupCallMembersDataSource.swift; sourceTree = "<group>"; };
@@ -2177,7 +2177,6 @@
 				94D63DD52646C29100FD7EE8 /* MessageViewModelFactory.swift */,
 				7CC7304F2745F95D002780F5 /* StickerStore.swift */,
 				7CF7416D27DAD93000DA0004 /* SnapCenterFlowLayout.swift */,
-				7C247AA6277AEDD100112A30 /* StackedPhotoLayout.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -2568,13 +2567,6 @@
 			path = ReCaptcha;
 			sourceTree = "<group>";
 		};
-		7C0E1D0B2786E9F400762FBE /* Model */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
 		7C35D1CF2689C04F002B5BBC /* Cells */ = {
 			isa = PBXGroup;
 			children = (
@@ -2933,7 +2925,6 @@
 		DF016B2C2098B35F00B8FFDE /* Windows */ = {
 			isa = PBXGroup;
 			children = (
-				7C0E1D0B2786E9F400762FBE /* Model */,
 				DF53BB6D202362A9002BF028 /* Cells */,
 				DF53BB6620233647002BF028 /* Views */,
 				DF43304422648B32006D971D /* AssetInfoWindow.swift */,
@@ -2973,7 +2964,7 @@
 				7C6132B527953B15002777EE /* DeleteAccountAbortWindow.swift */,
 				7C6132B727953B4F002777EE /* DeleteAccountAbortWindow.xib */,
 				7CFF1386277D5C3400FA745D /* MediasPreviewWindow.swift */,
-				7CFF1388277D5C6600FA745D /* MediaPreviewWindow.xib */,
+				7CFF1388277D5C6600FA745D /* MediasPreviewWindow.xib */,
 			);
 			path = Windows;
 			sourceTree = "<group>";
@@ -3933,7 +3924,7 @@
 				DF44B0CE20C6897D00A099B6 /* EmptyView.xib in Resources */,
 				277FF70C1F909A1200DBB2EB /* Assets.xcassets in Resources */,
 				7BF19C20241D40FA00B192D5 /* LocationSearchView.xib in Resources */,
-				7CFF1389277D5C6600FA745D /* MediaPreviewWindow.xib in Resources */,
+				7CFF1389277D5C6600FA745D /* MediasPreviewWindow.xib in Resources */,
 				7B8BB590234F36C000991ACB /* Colors.xcassets in Resources */,
 				94B8D18A266E41D300F43CBB /* DatabaseDiagnosticView.xib in Resources */,
 				7BFCB7762419FC5B00E7BC43 /* LocationCell.xib in Resources */,
diff --git a/Mixin/UserInterface/Controllers/Chat/Cells/PhotoInputGridCell.swift b/Mixin/UserInterface/Controllers/Chat/Cells/PhotoInputGridCell.swift
@@ -35,7 +35,7 @@ class PhotoInputGridCell: UICollectionViewCell {
         overlayView.isHidden = true
     }
     
-    func updateSelectedIndex(_ index: Int?) {
+    func updateBadge(with index: Int?) {
         if let index = index {
             badge.text = "\(index + 1)"
             badge.borderWidth = 0
diff --git a/Mixin/UserInterface/Controllers/Chat/Cells/SelectedMediaCell.swift b/Mixin/UserInterface/Controllers/Chat/Cells/SelectedMediaCell.swift
@@ -9,7 +9,7 @@ class SelectedMediaCell: UICollectionViewCell {
     @IBOutlet weak var imageView: SDAnimatedImageView!
     @IBOutlet weak var mediaTypeView: MediaTypeOverlayView!
     
-    var onRemove: (() -> Void)?
+    var deselectAsset: (() -> Void)?
     
     private lazy var imageRequestOptions: PHImageRequestOptions = {
         let options = PHImageRequestOptions()
@@ -43,7 +43,7 @@ class SelectedMediaCell: UICollectionViewCell {
     }
     
     @IBAction func closeAction(_ sender: Any) {
-        onRemove?()
+        deselectAsset?()
     }
     
 }
diff --git a/Mixin/UserInterface/Controllers/Chat/ConversationViewController.swift b/Mixin/UserInterface/Controllers/Chat/ConversationViewController.swift
@@ -1965,7 +1965,7 @@ extension ConversationViewController {
             SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .pin)
         case .unpin:
             dataSource.postponeMessagePinningUpdate(with: message.messageId)
-            SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .pin)
+            SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .unpin)
         }
     }
     
diff --git a/Mixin/UserInterface/Controllers/Chat/MediasPreviewViewController.swift b/Mixin/UserInterface/Controllers/Chat/MediasPreviewViewController.swift
@@ -37,11 +37,13 @@ final class MediasPreviewViewController: UIViewController {
 extension MediasPreviewViewController {
     
     func add(_ asset: PHAsset) {
+        guard !assets.contains(asset) else {
+            return
+        }
         assets.append(asset)
-        collectionView.insertItems(at: [IndexPath(item: assets.count - 1, section: 0)])
-        collectionView.scrollToItem(at: IndexPath(item: assets.count - 1, section: 0),
-                                    at: .centeredHorizontally,
-                                    animated: true)
+        let index = IndexPath(item: assets.count - 1, section: 0)
+        collectionView.insertItems(at: [index])
+        collectionView.scrollToItem(at: index, at: .centeredHorizontally, animated: true)
     }
     
     func remove(_ asset: PHAsset) {
@@ -78,7 +80,7 @@ extension MediasPreviewViewController: UICollectionViewDataSource {
         if indexPath.item < assets.count {
             let asset = assets[indexPath.item]
             cell.load(asset: asset, size: cellSizeForItemAt(indexPath.item))
-            cell.onRemove = { [weak self] in
+            cell.deselectAsset = { [weak self] in
                 guard let self = self else {
                     return
                 }
@@ -117,13 +119,13 @@ extension MediasPreviewViewController {
             let width: CGFloat
             let ratio = CGFloat(asset.pixelWidth) / CGFloat(asset.pixelHeight)
             if ratio > 1 {
-                width = height / 3 * 4
+                width = ceil(height / 3 * 4)
             } else if ratio < 1 {
-                width = height / 4 * 3
+                width = ceil(height / 4 * 3)
             } else {
                 width = height
             }
-            let size = CGSize(width: ceil(width), height: ceil(height))
+            let size = CGSize(width: width, height: height)
             cellSizeCache[asset.localIdentifier] = size
             return size
         }
diff --git a/Mixin/UserInterface/Controllers/Chat/Model/ConversationDataSource.swift b/Mixin/UserInterface/Controllers/Chat/Model/ConversationDataSource.swift
@@ -47,7 +47,6 @@ class ConversationDataSource {
     private var messageProcessingIsCancelled = false
     private var didInitializedData = false
     private var pendingPinningUpdateMessageId: String?
-    private var stackedPhotoMessages = [MessageItem]()
     
     var layoutSize: CGSize {
         Queue.main.autoSync {
diff --git a/Mixin/UserInterface/Controllers/Chat/PhotoInputGridViewController.swift b/Mixin/UserInterface/Controllers/Chat/PhotoInputGridViewController.swift
@@ -139,7 +139,7 @@ extension PhotoInputGridViewController: UICollectionViewDataSource {
             cell.imageView.contentMode = .scaleAspectFill
             cell.imageView.backgroundColor = .background
             cell.badge.isHidden = false
-            cell.updateSelectedIndex(selectedAssets.firstIndex(of: asset))
+            cell.updateBadge(with: selectedAssets.firstIndex(of: asset))
             imageManager.requestImage(for: asset, targetSize: thumbnailSize, contentMode: .aspectFill, options: imageRequestOptions) { [weak cell] (image, _) in
                 guard let cell = cell, cell.identifier == asset.localIdentifier else {
                     return
diff --git a/Mixin/UserInterface/Controllers/Chat/PhotoInputViewController.swift b/Mixin/UserInterface/Controllers/Chat/PhotoInputViewController.swift
@@ -22,7 +22,7 @@ class PhotoInputViewController: UIViewController, ConversationInputAccessible {
     }
     
     private weak var mediasPreviewControllerIfLoaded: MediasPreviewViewController?
-    private lazy var mediasPreviewViewController: MediasPreviewViewController = {
+    private lazy var mediasPreviewController: MediasPreviewViewController = {
         let controller = R.storyboard.chat.selected_medias()!
         controller.delegate = self
         mediasPreviewControllerIfLoaded = controller
@@ -235,14 +235,14 @@ extension PhotoInputViewController: PhotoInputGridViewControllerDelegate {
         if !controller.selectedAssets.isEmpty {
             presentMediasPreviewControllerAnimated()
         }
-        mediasPreviewViewController.add(asset)
+        mediasPreviewController.add(asset)
     }
     
     func photoInputGridViewController(_ controller: PhotoInputGridViewController, didDeselect asset: PHAsset) {
         if controller.selectedAssets.isEmpty {
             dismissMediasPreviewControllerAnimated()
         } else {
-            mediasPreviewViewController.remove(asset)
+            mediasPreviewController.remove(asset)
         }
     }
     
@@ -282,21 +282,21 @@ extension PhotoInputViewController: MediasPreviewViewControllerDelegate {
 
 extension PhotoInputViewController: MediasPreviewWindowDelegate {
 
-    func mediasPreviewWindow(_ window: MediasPreviewWindow, willDismiss assets: [PHAsset]) {
+    func mediasPreviewWindow(_ window: MediasPreviewWindow, willDismissWindow assets: [PHAsset]) {
         if assets.isEmpty {
             gridViewController.deselectAll()
             dismissMediasPreviewControllerAnimated()
         } else {
             gridViewController.updateSelectdAssets(assets)
-            mediasPreviewViewController.updateAssets(assets)
+            mediasPreviewController.updateAssets(assets)
         }
     }
     
-    func mediasPreviewWindow(_ window: MediasPreviewWindow, didSendItems assets: [PHAsset]) {
+    func mediasPreviewWindow(_ window: MediasPreviewWindow, didTapSendItems assets: [PHAsset]) {
         sendItems(assets: assets)
     }
     
-    func mediasPreviewWindow(_ window: MediasPreviewWindow, didSendFiles assets: [PHAsset]) {
+    func mediasPreviewWindow(_ window: MediasPreviewWindow, didTapSendFiles assets: [PHAsset]) {
         sendAsFiles(assets: assets)
     }
     
@@ -345,16 +345,16 @@ extension PhotoInputViewController {
     
     private func presentMediasPreviewControllerAnimated() {
         guard
-            mediasPreviewViewController.parent == nil,
+            mediasPreviewController.parent == nil,
             let conversationInputViewController = conversationInputViewController,
             let inputBarView = conversationInputViewController.inputBarView,
             let conversationViewController = conversationInputViewController.parent
         else {
             return
         }
         gridViewController.view.isUserInteractionEnabled = false
-        let previewController = mediasPreviewViewController
-        let previewViewHeight = mediasPreviewViewController.viewHeight
+        let previewController = mediasPreviewController
+        let previewViewHeight = mediasPreviewController.viewHeight
         addChild(previewController)
         view.insertSubview(previewController.view, at: 0)
         previewController.view.snp.makeConstraints({ (make) in
@@ -380,15 +380,15 @@ extension PhotoInputViewController {
     
     private func dismissMediasPreviewControllerAnimated() {
         guard
-            mediasPreviewViewController.parent != nil,
+            mediasPreviewController.parent != nil,
             let conversationInputViewController = conversationInputViewController,
             let inputBarView = conversationInputViewController.inputBarView
         else {
             return
         }
         gridViewController.view.isUserInteractionEnabled = false
-        let previewController = mediasPreviewViewController
-        let previewViewHeight = mediasPreviewViewController.viewHeight
+        let previewController = mediasPreviewController
+        let previewViewHeight = mediasPreviewController.viewHeight
         addChild(previewController)
         view.insertSubview(previewController.view, at: 0)
         previewController.view.snp.remakeConstraints({ (make) in
diff --git a/Mixin/UserInterface/Controllers/Chat/PinMessagesPreviewViewController.swift b/Mixin/UserInterface/Controllers/Chat/PinMessagesPreviewViewController.swift
@@ -19,6 +19,12 @@ final class PinMessagesPreviewViewController: StaticMessagesViewController {
     private var ignoresPinMessageChangeNotification = false
     private var canUnpinMessages = false
     
+    private var layoutWidth: CGFloat {
+        Queue.main.autoSync {
+            AppDelegate.current.mainWindow.bounds.width
+        }
+    }
+    
     private weak var bottomBarViewIfAdded: UIView?
     
     init(conversationId: String, isGroup: Bool) {
diff --git a/Mixin/UserInterface/Controllers/Chat/StaticMessagesViewController.swift b/Mixin/UserInterface/Controllers/Chat/StaticMessagesViewController.swift
@@ -17,11 +17,6 @@ class StaticMessagesViewController: UIViewController {
     
     var dates: [String] = []
     var viewModels: [String: [MessageViewModel]] = [:]
-    var layoutWidth: CGFloat {
-        Queue.main.autoSync {
-            AppDelegate.current.mainWindow.bounds.width
-        }
-    }
     
     private let conversationId: String
     private let audioManager: StaticAudioMessagePlayingManager
@@ -184,41 +179,12 @@ class StaticMessagesViewController: UIViewController {
         }
     }
     
-    func removeViewModel(at indexPath: IndexPath) -> (didRemoveRow: Bool, didRemoveSection: Bool) {
-        var didRemoveRow = false
-        var didRemoveSection = false
-        let date = dates[indexPath.section]
-        if let _ = viewModels[date]?.remove(at: indexPath.row) {
-            didRemoveRow = true
-        }
-        if let viewModels = viewModels[date], viewModels.isEmpty {
-            if let index = dates.firstIndex(of: date) {
-                didRemoveSection = true
-                dates.remove(at: index)
-            }
-            self.viewModels[date] = nil
-        }
-        if let viewModels = self.viewModels[date] {
-            let indexBeforeDeletedMessage = indexPath.row - 1
-            let indexAfterDeletedMessage = indexPath.row
-            if indexBeforeDeletedMessage >= 0 {
-                let style = factory.style(forIndex: indexBeforeDeletedMessage, viewModels: viewModels)
-                self.viewModels[date]?[indexBeforeDeletedMessage].style = style
-            }
-            if indexAfterDeletedMessage < viewModels.count {
-                let style = factory.style(forIndex: indexAfterDeletedMessage, viewModels: viewModels)
-                self.viewModels[date]?[indexAfterDeletedMessage].style = style
-            }
-        }
-        return (didRemoveRow, didRemoveSection)
-    }
-    
 }
 
 // MARK: - Actions
 extension StaticMessagesViewController {
     
-    @objc func tapAction(_ recognizer: UIGestureRecognizer) {
+    @objc private func tapAction(_ recognizer: UIGestureRecognizer) {
         let tappedIndexPath = tableView.indexPathForRow(at: recognizer.location(in: tableView))
         let tappedViewModel: MessageViewModel? = {
             if let indexPath = tappedIndexPath {
@@ -588,9 +554,10 @@ extension StaticMessagesViewController {
                     return
                 }
                 DispatchQueue.main.sync {
+                    let layoutWidth = AppDelegate.current.mainWindow.bounds.width
                     let date = DateFormatter.yyyymmdd.string(from: message.createdAt.toUTCDate())
                     if let style = self.viewModels[date]?[indexPath.row].style {
-                        let viewModel = self.factory.viewModel(withMessage: message, style: style, fits: self.layoutWidth)
+                        let viewModel = self.factory.viewModel(withMessage: message, style: style, fits: layoutWidth)
                         self.viewModels[date]?[indexPath.row] = viewModel
                         self.tableView.reloadData()
                     }
diff --git a/Mixin/UserInterface/Controllers/Chat/TranscriptPreviewViewController.swift b/Mixin/UserInterface/Controllers/Chat/TranscriptPreviewViewController.swift
@@ -143,6 +143,7 @@ extension TranscriptPreviewViewController {
     }
     
     private func reloadData() {
+        let layoutWidth = AppDelegate.current.mainWindow.bounds.width
         queue.async { [weak self] in
             guard let self = self else {
                 return
@@ -152,7 +153,7 @@ extension TranscriptPreviewViewController {
             let children = items.compactMap { item in
                 TranscriptMessage(transcriptId: transcriptId, mediaUrl: item.mediaUrl, thumbImage: item.thumbImage, messageItem: item)
             }
-            let (dates, viewModels) = self.categorizedViewModels(with: items, fits: self.layoutWidth)
+            let (dates, viewModels) = self.categorizedViewModels(with: items, fits: layoutWidth)
             DispatchQueue.main.async {
                 self.childMessages = children
                 self.dates = dates
diff --git a/Mixin/UserInterface/Windows/Cells/MediaPreviewCell.xib b/Mixin/UserInterface/Windows/Cells/MediaPreviewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,11 +23,6 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MqO-Z8-zEn" customClass="MediaTypeOverlayView" customModule="Mixin" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="312" height="312"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="typeViewBottomSpace">
-                                <real key="value" value="1"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
                     </view>
                     <imageView clipsSubviews="YES" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_photo_checkmark" translatesAutoresizingMaskIntoConstraints="NO" id="qiu-YU-Oii">
                         <rect key="frame" x="278" y="278" width="28" height="28"/>
diff --git a/Mixin/UserInterface/Windows/MediasPreviewWindow.swift b/Mixin/UserInterface/Windows/MediasPreviewWindow.swift
diff --git a/Mixin/UserInterface/Windows/MediasPreviewWindow.xib b/Mixin/UserInterface/Windows/MediasPreviewWindow.xib

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class PhotoInputGridCell: UICollectionViewCell {`
`35`	`35`	`overlayView.isHidden = true`
`36`	`36`	`}`
`37`	`37`
`38`		`- func updateSelectedIndex(_ index: Int?) {`
	`38`	`+ func updateBadge(with index: Int?) {`
`39`	`39`	`if let index = index {`
`40`	`40`	`badge.text = "\(index + 1)"`
`41`	`41`	`badge.borderWidth = 0`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class SelectedMediaCell: UICollectionViewCell {`
`9`	`9`	`@IBOutlet weak var imageView: SDAnimatedImageView!`
`10`	`10`	`@IBOutlet weak var mediaTypeView: MediaTypeOverlayView!`
`11`	`11`
`12`		`- var onRemove: (() -> Void)?`
	`12`	`+ var deselectAsset: (() -> Void)?`
`13`	`13`
`14`	`14`	`private lazy var imageRequestOptions: PHImageRequestOptions = {`
`15`	`15`	`let options = PHImageRequestOptions()`
`@@ -43,7 +43,7 @@ class SelectedMediaCell: UICollectionViewCell {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@IBAction func closeAction(_ sender: Any) {`
`46`		`- onRemove?()`
	`46`	`+ deselectAsset?()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1965,7 +1965,7 @@ extension ConversationViewController {`
`1965`	`1965`	`SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .pin)`
`1966`	`1966`	`case .unpin:`
`1967`	`1967`	`dataSource.postponeMessagePinningUpdate(with: message.messageId)`
`1968`		`- SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .pin)`
	`1968`	`+ SendMessageService.shared.sendPinMessages(items: [message], conversationId: conversationId, action: .unpin)`
`1969`	`1969`	`}`
`1970`	`1970`	`}`
`1971`	`1971`