From 9cdf8d06fd7e20cfa58575f9b63408a530d3fd99 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 7 Nov 2018 10:09:11 -0500
Subject: [PATCH 1/2] Ignore typing indicators from self.

---
 SignalServiceKit/src/Messages/OWSMessageManager.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 6c546e03f..f4e000542 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -667,6 +667,10 @@ NS_ASSUME_NONNULL_BEGIN
         OWSFailDebug(@"typingMessage has invalid timestamp.");
         return;
     }
+    NSString *localNumber = self.tsAccountManager.localNumber;
+    if ([localNumber isEqualToString:envelope.source]) {
+        OWSLogVerbose(@"Ignoring typing indicators from self or linked device.");
+    }
 
     TSThread *_Nullable thread;
     if (typingMessage.hasGroupID) {

From b7fd48ec400ba591bcf91979b24583db810dec71 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 7 Nov 2018 10:56:40 -0500
Subject: [PATCH 2/2] Respond to CR.

---
 SignalServiceKit/src/Messages/OWSMessageManager.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index f4e000542..0b2fd266c 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -670,6 +670,7 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *localNumber = self.tsAccountManager.localNumber;
     if ([localNumber isEqualToString:envelope.source]) {
         OWSLogVerbose(@"Ignoring typing indicators from self or linked device.");
+        return;
     }
 
     TSThread *_Nullable thread;