From 2a054c34ba1ef058d77460a4fbeab33de23a2e51 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 26 Nov 2019 09:48:06 +1100
Subject: [PATCH] Fix note to self

---
 .../ConversationView/ConversationViewController.m             | 4 +++-
 SignalServiceKit/src/Messages/OWSMessageSender.m              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 3fc99a19c..32c82814b 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1649,12 +1649,14 @@ typedef enum : NSUInteger {
     if ([self.thread isKindOfClass:TSContactThread.class]) {
         NSString *senderID = ((TSContactThread *)self.thread).contactIdentifier;
         __block NSSet<TSContactThread *> *linkedDeviceThreads;
+        __block BOOL isNoteToSelf;
         [OWSPrimaryStorage.sharedManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
             linkedDeviceThreads = [LKDatabaseUtilities getLinkedDeviceThreadsFor:senderID in:transaction];
+            isNoteToSelf = [LKDatabaseUtilities isUserLinkedDevice:senderID in:transaction];
         }];
         if ([linkedDeviceThreads contains:^BOOL(TSContactThread *thread) {
             return thread.isContactFriend;
-        }]) {
+        }] || isNoteToSelf) {
             isEnabled = true;
             isAttachmentButtonHidden = false;
         } else if (![linkedDeviceThreads contains:^BOOL(TSContactThread *thread) {
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 21a818a8b..91f21a3f5 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -678,7 +678,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
             isNoteToSelf = [LKDatabaseUtilities isUserLinkedDevice:((TSContactThread *)thread).contactIdentifier in:transaction];
         }];
-        if (isNoteToSelf && message.shouldSyncTranscript) {
+        if (isNoteToSelf) {
             [self sendSyncTranscriptForMessage:message isRecipientUpdate:NO success:^{ } failure:^(NSError *error) { }];
             successHandler();
             return;