oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typos

This commit is contained in:
Niels Andriesse 2021-08-10 11:17:04 +10:00
parent 8d8daf3a6c
commit 45042a1acf
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Session/Conversations/ConversationVC+Interaction.swift
View File

@ -555,7 +555,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
} }
func delete(_ viewItem: ConversationViewItem) { func delete(_ viewItem: ConversationViewItem) {
if (!self.isUnsendRequesEnabled) { if (!self.isUnsendRequestsEnabled) {
viewItem.deleteAction() viewItem.deleteAction()
return 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, if let message = viewItem.interaction as? TSMessage,
message.isOpenGroupMessage || message.serverHash == nil { return nil } message.isOpenGroupMessage || message.serverHash == nil { return nil }
let unsendRequest = UnsendRequest() let unsendRequest = UnsendRequest()
@ -609,7 +609,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
unsendRequest.author = incomingMessage.authorId unsendRequest.author = incomingMessage.authorId
} }
case .outgoingMessage: unsendRequest.author = getUserHexEncodedPublicKey() case .outgoingMessage: unsendRequest.author = getUserHexEncodedPublicKey()
default: return nil// Should never occur default: return nil // Should never occur
} }
unsendRequest.timestamp = viewItem.interaction.timestamp unsendRequest.timestamp = viewItem.interaction.timestamp
return unsendRequest return unsendRequest
@ -617,7 +617,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
func deleteLocally(_ viewItem: ConversationViewItem) { func deleteLocally(_ viewItem: ConversationViewItem) {
viewItem.deleteLocallyAction() viewItem.deleteLocallyAction()
if let unsendRequest = buildUsendRequest(viewItem) { if let unsendRequest = buildUnsendRequest(viewItem) {
SNMessagingKitConfiguration.shared.storage.write { transaction in SNMessagingKitConfiguration.shared.storage.write { transaction in
MessageSender.send(unsendRequest, to: .contact(publicKey: getUserHexEncodedPublicKey()), using: transaction).retainUntilComplete() MessageSender.send(unsendRequest, to: .contact(publicKey: getUserHexEncodedPublicKey()), using: transaction).retainUntilComplete()
} }
@ -627,7 +627,7 @@ extension ConversationVC : InputViewDelegate, MessageCellDelegate, ContextMenuAc
func deleteForEveryone(_ viewItem: ConversationViewItem) { func deleteForEveryone(_ viewItem: ConversationViewItem) {
viewItem.deleteLocallyAction() viewItem.deleteLocallyAction()
viewItem.deleteRemotelyAction() viewItem.deleteRemotelyAction()
if let unsendRequest = buildUsendRequest(viewItem) { if let unsendRequest = buildUnsendRequest(viewItem) {
SNMessagingKitConfiguration.shared.storage.write { transaction in SNMessagingKitConfiguration.shared.storage.write { transaction in
MessageSender.send(unsendRequest, in: self.thread, using: transaction as! YapDatabaseReadWriteTransaction) MessageSender.send(unsendRequest, in: self.thread, using: transaction as! YapDatabaseReadWriteTransaction)
} }

4
Session/Conversations/ConversationVC.swift
View File

@ -4,8 +4,8 @@
// • Photo rounding (the small corners don't have the correct rounding) // • Photo rounding (the small corners don't have the correct rounding)
// • Remaining search glitchiness // • Remaining search glitchiness
final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversationSettingsViewDelegate, ConversationSearchControllerDelegate, UITableViewDataSource, UITableViewDelegate { 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 thread: TSThread
let focusedMessageID: String? // This isn't actually used ATM let focusedMessageID: String? // This isn't actually used ATM
var unreadViewItems: [ConversationViewItem] = [] var unreadViewItems: [ConversationViewItem] = []

9
SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
View File

@ -228,9 +228,11 @@ extension MessageReceiver {
let transaction = transaction as! YapDatabaseReadWriteTransaction let transaction = transaction as! YapDatabaseReadWriteTransaction
if let author = message.author, let timestamp = message.timestamp { if let author = message.author, let timestamp = message.timestamp {
let localMessage: TSMessage? let localMessage: TSMessage?
if userPublicKey == message.sender { localMessage = TSOutgoingMessage.find(withTimestamp: timestamp) } if userPublicKey == message.sender {
else { localMessage = TSIncomingMessage.find(withAuthorId: author, timestamp: timestamp, transaction: transaction) } localMessage = TSOutgoingMessage.find(withTimestamp: timestamp)
} else {
localMessage = TSIncomingMessage.find(withAuthorId: author, timestamp: timestamp, transaction: transaction)
}
if let messageToDelete = localMessage { if let messageToDelete = localMessage {
if let incomingMessage = messageToDelete as? TSIncomingMessage { if let incomingMessage = messageToDelete as? TSIncomingMessage {
incomingMessage.markAsReadNow(withSendReadReceipt: false, transaction: transaction) incomingMessage.markAsReadNow(withSendReadReceipt: false, transaction: transaction)
@ -248,6 +250,7 @@ extension MessageReceiver {
} }
// MARK: - Visible Messages // MARK: - Visible Messages
@discardableResult @discardableResult

2
SessionNotificationServiceExtension/NotificationServiceExtension.swift
View File

@ -67,7 +67,7 @@ public final class NotificationServiceExtension : UNNotificationServiceExtension
return self.completeSilenty() 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) tsIncomingMessage.setNotificationIdentifier(request.identifier, transaction: transaction)
case let unsendRequest as UnsendRequest: case let unsendRequest as UnsendRequest:
MessageReceiver.handleUnsendRequest(unsendRequest, using: transaction) MessageReceiver.handleUnsendRequest(unsendRequest, using: transaction)