Merge branch 'mkirk/quote-2'

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -110,6 +110,8 @@ static const int kYapDatabaseRangeMinLength = 0;
 
 static const CGFloat kLoadMoreHeaderHeight = 60.f;
 
+static const CGFloat kToastInset = 10;
+
 typedef enum : NSUInteger {
     kMediaTypePicture,
     kMediaTypeVideo,
@@ -2370,6 +2372,11 @@ typedef enum : NSUInteger {
     __block NSUInteger threadInteractionCount = 0;
     __block NSNumber *_Nullable groupIndex = nil;
 
+    if (quotedReply.isRemotelySourced) {
+        [self presentRemotelySourcedQuotedReplyToast];
+        return;
+    }
+
     [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
         quotedInteraction = [ThreadUtil findInteractionInThreadByTimestamp:quotedReply.timestamp
                                                                   authorId:quotedReply.authorId
@@ -5317,13 +5324,28 @@ typedef enum : NSUInteger {
 {
     DDLogInfo(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
 
-    NSString *toastText = NSLocalizedString(@"QUOTED_REPLY_MISSING_ORIGINAL_MESSAGE",
-        @"Toast alert text shown when tapping on a quoted message which we cannot scroll to, because the local copy of "
-        @"the message doesn't exist.");
+    NSString *toastText = NSLocalizedString(@"QUOTED_REPLY_ORIGINAL_MESSAGE_DELETED",
+        @"Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of "
+        @"the message was since deleted.");
+
+    ToastController *toastController = [[ToastController alloc] initWithText:toastText];
+
+    CGFloat bottomInset = kToastInset + self.collectionView.contentInset.bottom + self.view.layoutMargins.bottom;
+
+    [toastController presentToastViewFromBottomOfView:self.view inset:bottomInset];
+}
+
+- (void)presentRemotelySourcedQuotedReplyToast
+{
+    DDLogInfo(@"%@ in %s", self.logTag, __PRETTY_FUNCTION__);
+
+    NSString *toastText = NSLocalizedString(@"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED",
+        @"Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of "
+        @"the message didn't exist when the quote was received.");
 
     ToastController *toastController = [[ToastController alloc] initWithText:toastText];
 
-    CGFloat bottomInset = 10 + self.collectionView.contentInset.bottom + self.view.layoutMargins.bottom;
+    CGFloat bottomInset = kToastInset + self.collectionView.contentInset.bottom + self.view.layoutMargins.bottom;
 
     [toastController presentToastViewFromBottomOfView:self.view inset:bottomInset];
 }

Signal/src/views/Toast.swift

@@ -67,6 +67,8 @@ class ToastView: UIView {
 @objc
 class ToastController: NSObject, ToastViewDelegate {
 
+    static var currentToastController: ToastController?
+
     private let toastView: ToastView
     private var isDismissing: Bool
 
@@ -98,6 +100,12 @@ class ToastController: NSObject, ToastViewDelegate {
         toastView.autoPinEdge(.bottom, to: .bottom, of: view, withOffset: -inset)
         toastView.autoPinWidthToSuperview(withMargin: 24)
 
+        if let currentToastController = type(of: self).currentToastController {
+            currentToastController.dismissToastView()
+            type(of: self).currentToastController = nil
+        }
+        type(of: self).currentToastController = self
+
         UIView.animate(withDuration: 0.1) {
             self.toastView.alpha = 1
         }
@@ -131,6 +139,11 @@ class ToastController: NSObject, ToastViewDelegate {
             return
         }
         isDismissing = true
+
+        if type(of: self).currentToastController == self {
+            type(of: self).currentToastController = nil
+        }
+
         UIView.animate(withDuration: 0.1,
                        animations: {
             self.toastView.alpha = 0

Signal/translations/en.lproj/Localizable.strings

@@ -1263,12 +1263,6 @@
 /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */
 "MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer marked as verified. Tap for options.";
 
-/* Action sheet title after tapping on failed download. */
-"MESSAGES_VIEW_FAILED_DOWNLOAD_ACTIONSHEET_TITLE" = "Download Failed.";
-
-/* Action sheet button text */
-"MESSAGES_VIEW_FAILED_DOWNLOAD_RETRY_ACTION" = "Download Again";
-
 /* Indicates that a single member of this group has been blocked. */
 "MESSAGES_VIEW_GROUP_1_MEMBER_BLOCKED" = "You Blocked 1 Member of this Group";
 
@@ -1610,8 +1604,11 @@
 /* Footer label that appears below quoted messages when the quoted content was note derived locally. When the local user doesn't have a copy of the message being quoted, e.g. if it had since been deleted, we instead show the content specified by the sender. */
 "QUOTED_REPLY_CONTENT_FROM_REMOTE_SOURCE" = "Original message not found.";
 
-/* Toast alert text shown when tapping on a quoted message which we cannot scroll to, because the local copy of the message doesn't exist. */
-"QUOTED_REPLY_MISSING_ORIGINAL_MESSAGE" = "Original message not found.";
+/* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message was since deleted. */
+"QUOTED_REPLY_ORIGINAL_MESSAGE_DELETED" = "Original message no longer available.";
+
+/* Toast alert text shown when tapping on a quoted message which we cannot scroll to because the local copy of the message didn't exist when the quote was received. */
+"QUOTED_REPLY_ORIGINAL_MESSAGE_REMOTELY_SOURCED" = "Original message not found.";
 
 /* Indicates this message is a quoted reply to an attachment of unknown type. */
 "QUOTED_REPLY_TYPE_ATTACHMENT" = "Attachment";