Fixed some build errors

pull/1023/head
Morgan Pretty 8 months ago
parent 2bcd8e28ab
commit a0ad92defa

@ -2175,7 +2175,7 @@ extension ConversationVC:
}(), }(),
style: .destructive style: .destructive
) { [weak self] _ in ) { [weak self] _ in
let completeServerDeletion = { [weak self] in let completeServerDeletion = {
Storage.shared.writeAsync { db in Storage.shared.writeAsync { db in
try MessageSender try MessageSender
.send( .send(
@ -2187,24 +2187,24 @@ extension ConversationVC:
using: dependencies using: dependencies
) )
} }
}
// We can only delete messages on the server for `contact` and `group` conversations // We can only delete messages on the server for `contact` and `group` conversations
guard cellViewModel.threadVariant == .contact || cellViewModel.threadVariant == .group else { guard cellViewModel.threadVariant == .contact || cellViewModel.threadVariant == .group else {
return completeServerDeletion() return completeServerDeletion()
} }
deleteRemotely( deleteRemotely(
from: self, from: self,
request: SnodeAPI request: SnodeAPI
.deleteMessages( .deleteMessages(
swarmPublicKey: targetPublicKey, swarmPublicKey: targetPublicKey,
serverHashes: [serverHash] serverHashes: [serverHash]
) )
.map { _ in () } .map { _ in () }
.eraseToAnyPublisher() .eraseToAnyPublisher()
) { completeServerDeletion() } ) { completeServerDeletion() }
}) })
}
actionSheet.addAction(UIAlertAction.init(title: "cancel".localized(), style: .cancel) { [weak self] _ in actionSheet.addAction(UIAlertAction.init(title: "cancel".localized(), style: .cancel) { [weak self] _ in
self?.showInputAccessoryView() self?.showInputAccessoryView()

@ -362,8 +362,8 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate {
guard self?.pushApprovalViewController() == true else { guard self?.pushApprovalViewController() == true else {
let modal: ConfirmationModal = ConfirmationModal( let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info( info: ConfirmationModal.Info(
title: "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS".localized(), title: "attachmentsErrorMediaSelection".localized(),
cancelTitle: "BUTTON_OK".localized(), cancelTitle: "okay".localized(),
cancelStyle: .alert_text cancelStyle: .alert_text
) )
) )

@ -2,7 +2,7 @@
// stringlint:disable // stringlint:disable
import Foundation import UIKit
public extension NSAttributedString { public extension NSAttributedString {
/// These are the tags we current support formatting for /// These are the tags we current support formatting for

Loading…
Cancel
Save