Fix typos
This commit is contained in:
parent
8d8daf3a6c
commit
45042a1acf
|
@ -555,7 +555,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|||
}
|
||||
|
||||
func delete(_ viewItem: ConversationViewItem) {
|
||||
if (!self.isUnsendRequesEnabled) {
|
||||
if (!self.isUnsendRequestsEnabled) {
|
||||
viewItem.deleteAction()
|
||||
return
|
||||
}
|
||||
|
@ -599,7 +599,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|||
}
|
||||
}
|
||||
|
||||
private func buildUsendRequest(_ viewItem: ConversationViewItem) -> UnsendRequest? {
|
||||
private func buildUnsendRequest(_ viewItem: ConversationViewItem) -> UnsendRequest? {
|
||||
if let message = viewItem.interaction as? TSMessage,
|
||||
message.isOpenGroupMessage || message.serverHash == nil { return nil }
|
||||
let unsendRequest = UnsendRequest()
|
||||
|
@ -609,7 +609,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|||
unsendRequest.author = incomingMessage.authorId
|
||||
}
|
||||
case .outgoingMessage: unsendRequest.author = getUserHexEncodedPublicKey()
|
||||
default: return nil// Should never occur
|
||||
default: return nil // Should never occur
|
||||
}
|
||||
unsendRequest.timestamp = viewItem.interaction.timestamp
|
||||
return unsendRequest
|
||||
|
@ -617,7 +617,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|||
|
||||
func deleteLocally(_ viewItem: ConversationViewItem) {
|
||||
viewItem.deleteLocallyAction()
|
||||
if let unsendRequest = buildUsendRequest(viewItem) {
|
||||
if let unsendRequest = buildUnsendRequest(viewItem) {
|
||||
SNMessagingKitConfiguration.shared.storage.write { transaction in
|
||||
MessageSender.send(unsendRequest, to: .contact(publicKey: getUserHexEncodedPublicKey()), using: transaction).retainUntilComplete()
|
||||
}
|
||||
|
@ -627,7 +627,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
|
|||
func deleteForEveryone(_ viewItem: ConversationViewItem) {
|
||||
viewItem.deleteLocallyAction()
|
||||
viewItem.deleteRemotelyAction()
|
||||
if let unsendRequest = buildUsendRequest(viewItem) {
|
||||
if let unsendRequest = buildUnsendRequest(viewItem) {
|
||||
SNMessagingKitConfiguration.shared.storage.write { transaction in
|
||||
MessageSender.send(unsendRequest, in: self.thread, using: transaction as! YapDatabaseReadWriteTransaction)
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
// • Remaining search glitchiness
|
||||
|
||||
final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversationSettingsViewDelegate, ConversationSearchControllerDelegate, UITableViewDataSource, UITableViewDelegate {
|
||||
let isUnsendRequesEnabled = false // Switch this to true if unsend request is done on all platforms
|
||||
let isUnsendRequestsEnabled = false // Set to true once unsend requests are done on all platforms
|
||||
let thread: TSThread
|
||||
let focusedMessageID: String? // This isn't actually used ATM
|
||||
var unreadViewItems: [ConversationViewItem] = []
|
||||
|
|
|
@ -228,9 +228,11 @@ extension MessageReceiver {
|
|||
let transaction = transaction as! YapDatabaseReadWriteTransaction
|
||||
if let author = message.author, let timestamp = message.timestamp {
|
||||
let localMessage: TSMessage?
|
||||
if userPublicKey == message.sender { localMessage = TSOutgoingMessage.find(withTimestamp: timestamp) }
|
||||
else { localMessage = TSIncomingMessage.find(withAuthorId: author, timestamp: timestamp, transaction: transaction) }
|
||||
|
||||
if userPublicKey == message.sender {
|
||||
localMessage = TSOutgoingMessage.find(withTimestamp: timestamp)
|
||||
} else {
|
||||
localMessage = TSIncomingMessage.find(withAuthorId: author, timestamp: timestamp, transaction: transaction)
|
||||
}
|
||||
if let messageToDelete = localMessage {
|
||||
if let incomingMessage = messageToDelete as? TSIncomingMessage {
|
||||
incomingMessage.markAsReadNow(withSendReadReceipt: false, transaction: transaction)
|
||||
|
@ -248,6 +250,7 @@ extension MessageReceiver {
|
|||
}
|
||||
|
||||
|
||||
|
||||
// MARK: - Visible Messages
|
||||
|
||||
@discardableResult
|
||||
|
|
|
@ -67,7 +67,7 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
|
|||
return self.completeSilenty()
|
||||
}
|
||||
}
|
||||
// Store the notification identifier for unsend request to cancel this notification
|
||||
// Store the notification ID for unsend requests to later cancel this notification
|
||||
tsIncomingMessage.setNotificationIdentifier(request.identifier, transaction: transaction)
|
||||
case let unsendRequest as UnsendRequest:
|
||||
MessageReceiver.handleUnsendRequest(unsendRequest, using: transaction)
|
||||
|
|
Loading…
Reference in New Issue