Merge branch 'charlesmchen/quoteReplyToYourself'

Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m

@@ -301,13 +301,20 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (UILabel *)createQuotedAuthorLabel
 {
-    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];
+    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];
+    }
 
     UILabel *quotedAuthorLabel = [UILabel new];
     quotedAuthorLabel.text = quotedAuthorText;

Signal/translations/en.lproj/Localizable.strings

@@ -1411,6 +1411,9 @@
 /* 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" = "Replying to Yourself";
+
 /* Indicates this message is a quoted reply to an attachment of unknown type. */
 "QUOTED_REPLY_TYPE_ATTACHMENT" = "Attachment";
 

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:oversizeText.length / 2];
+                    truncatedText = [truncatedText substringToIndex:truncatedText.length / 2];
                 }
                 if ([truncatedText dataUsingEncoding:NSUTF8StringEncoding].length < kOversizeTextMessageSizeThreshold) {
                     quotedText = truncatedText;