From 6d356e4b67de76413ce4a1bd854815b1b42cd1f4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Sat, 4 Feb 2017 13:15:15 -0500 Subject: [PATCH 1/2] Automatically mark as read any messages sent by current user from another device. // FREEBIE --- src/Messages/TSMessagesManager.m | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Messages/TSMessagesManager.m b/src/Messages/TSMessagesManager.m index d907be6f6..ccea8873c 100644 --- a/src/Messages/TSMessagesManager.m +++ b/src/Messages/TSMessagesManager.m @@ -633,6 +633,15 @@ NS_ASSUME_NONNULL_BEGIN if (thread && incomingMessage) { [incomingMessage saveWithTransaction:transaction]; + // Any messages sent from the current user - from this device or another - should be + // automatically marked as read. + if ([TSAccountManager isRegistered]) { + BOOL shouldMarkMessageAsRead = [envelope.source isEqualToString:[TSAccountManager localNumber]]; + if (shouldMarkMessageAsRead) { + [incomingMessage markAsReadLocallyWithTransaction:transaction]; + } + } + // Android allows attachments to be sent with body. if ([attachmentIds count] > 0 && body != nil && ![body isEqualToString:@""]) { // We want the text to be displayed under the attachment From df1b3418d27613d856cc05bf23ad8a7edfd85743 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 6 Feb 2017 11:25:56 -0500 Subject: [PATCH 2/2] Respond to CR. // FREEBIE --- src/Messages/TSMessagesManager.m | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Messages/TSMessagesManager.m b/src/Messages/TSMessagesManager.m index ccea8873c..2387e8576 100644 --- a/src/Messages/TSMessagesManager.m +++ b/src/Messages/TSMessagesManager.m @@ -635,11 +635,10 @@ NS_ASSUME_NONNULL_BEGIN // Any messages sent from the current user - from this device or another - should be // automatically marked as read. - if ([TSAccountManager isRegistered]) { - BOOL shouldMarkMessageAsRead = [envelope.source isEqualToString:[TSAccountManager localNumber]]; - if (shouldMarkMessageAsRead) { - [incomingMessage markAsReadLocallyWithTransaction:transaction]; - } + OWSAssert([TSAccountManager isRegistered]); + BOOL shouldMarkMessageAsRead = [envelope.source isEqualToString:[TSAccountManager localNumber]]; + if (shouldMarkMessageAsRead) { + [incomingMessage markAsReadLocallyWithTransaction:transaction]; } // Android allows attachments to be sent with body.