From f6698501df5c824eeb51b4ab8f0a2b0dda29098a Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 11 Apr 2018 11:48:08 -0400
Subject: [PATCH] Revert "Label quoted replies to yourself as such."

This reverts commit 24d7492f611c49d1da8f423ee03c40cdd17e4092.
---
 .../Cells/OWSQuotedMessageView.m              | 21 +++++++------------
 .../translations/en.lproj/Localizable.strings |  3 ---
 SignalMessaging/Models/OWSQuotedReplyModel.m  |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index 6215a6818..be41b18b8 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -301,20 +301,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (UILabel *)createQuotedAuthorLabel
 {
-    NSString *_Nullable localNumber = [TSAccountManager localNumber];
-    NSString *quotedAuthorText;
-    if ([localNumber isEqualToString:self.quotedMessage.authorId]) {
-        quotedAuthorText = NSLocalizedString(
-            @"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF", @"Indicates the author of a quoted message is yourself.");
-    } else {
-        OWSContactsManager *contactsManager = Environment.current.contactsManager;
-        NSString *quotedAuthor = [contactsManager displayNameForPhoneIdentifier:self.quotedMessage.authorId];
-        quotedAuthorText = [NSString
-            stringWithFormat:
-                NSLocalizedString(@"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT",
-                    @"Indicates the author of a quoted message. Embeds {{the author's name or phone number}}."),
-            quotedAuthor];
-    }
+    OWSContactsManager *contactsManager = Environment.current.contactsManager;
+    NSString *quotedAuthor = [contactsManager displayNameForPhoneIdentifier:self.quotedMessage.authorId];
+    NSString *quotedAuthorText =
+        [NSString stringWithFormat:
+                      NSLocalizedString(@"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT",
+                          @"Indicates the author of a quoted message. Embeds {{the author's name or phone number}}."),
+                  quotedAuthor];
 
     UILabel *quotedAuthorLabel = [UILabel new];
     quotedAuthorLabel.text = quotedAuthorText;
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index fadb47e96..e3735813e 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -1411,9 +1411,6 @@
 /* Indicates the author of a quoted message. Embeds {{the author's name or phone number}}. */
 "QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT" = "Replying to %@";
 
-/* Indicates the author of a quoted message is yourself. */
-"QUOTED_REPLY_AUTHOR_INDICATOR_YOURSELF" = "Yourself";
-
 /* Indicates this message is a quoted reply to an attachment of unknown type. */
 "QUOTED_REPLY_TYPE_ATTACHMENT" = "Attachment";
 
diff --git a/SignalMessaging/Models/OWSQuotedReplyModel.m b/SignalMessaging/Models/OWSQuotedReplyModel.m
index 18356df83..06e2ad124 100644
--- a/SignalMessaging/Models/OWSQuotedReplyModel.m
+++ b/SignalMessaging/Models/OWSQuotedReplyModel.m
@@ -154,7 +154,7 @@
                     // The search will always converge since in the worst case (namely
                     // a single character which in utf-8 is >= 1024 bytes) the loop will
                     // exit when the string is empty.
-                    truncatedText = [truncatedText substringToIndex:truncatedText.length / 2];
+                    truncatedText = [truncatedText substringToIndex:oversizeText.length / 2];
                 }
                 if ([truncatedText dataUsingEncoding:NSUTF8StringEncoding].length < kOversizeTextMessageSizeThreshold) {
                     quotedText = truncatedText;