Merge branch 'dev' of github.com:loki-project/loki-messenger-ios into bug-fix

Signal/src/Loki/LokiGroupChatPoller.swift

@@ -56,6 +56,11 @@ public final class LokiGroupChatPoller : NSObject {
             let x2 = SSKProtoDataMessage.builder()
             x2.setTimestamp(message.timestamp)
             x2.setGroup(try! x1.build())
+            if let quote = message.quote {
+                let x5 = SSKProtoDataMessageQuote.builder(id: quote.quotedMessageTimestamp, author: quote.quoteeHexEncodedPublicKey)
+                x5.setText(quote.quotedMessageBody)
+                x2.setQuote(try! x5.build())
+            }
             x2.setBody(message.body)
             if let messageServerID = message.serverID {
                 let publicChatInfo = SSKProtoPublicChatInfo.builder()
@@ -68,7 +73,6 @@ public final class LokiGroupChatPoller : NSObject {
             x4.setSource(senderHexEncodedPublicKey)
             x4.setSourceDevice(OWSDevicePrimaryDeviceId)
             x4.setContent(try! x3.build().serializedData())
-        
             let storage = OWSPrimaryStorage.shared()
             storage.dbReadWriteConnection.readWrite { transaction in
                 transaction.setObject(senderDisplayName, forKey: senderHexEncodedPublicKey, inCollection: group.id)
@@ -87,8 +91,14 @@ public final class LokiGroupChatPoller : NSObject {
             guard !isDuplicate else { return }
             guard let groupID = group.id.data(using: .utf8) else { return }
             let thread = TSGroupThread.getOrCreateThread(withGroupId: groupID)
+            let signalQuote: TSQuotedMessage?
+            if let quote = message.quote {
+                signalQuote = TSQuotedMessage(timestamp: quote.quotedMessageTimestamp, authorId: quote.quoteeHexEncodedPublicKey, body: quote.quotedMessageBody, quotedAttachmentsForSending: [])
+            } else {
+                signalQuote = nil
+            }
             let message = TSOutgoingMessage(outgoingMessageWithTimestamp: message.timestamp, in: thread, messageBody: message.body, attachmentIds: [], expiresInSeconds: 0,
-                expireStartedAt: 0, isVoiceMessage: false, groupMetaMessage: .deliver, quotedMessage: nil, contactShare: nil, linkPreview: nil)
+                expireStartedAt: 0, isVoiceMessage: false, groupMetaMessage: .deliver, quotedMessage: signalQuote, contactShare: nil, linkPreview: nil)
             storage.dbReadWriteConnection.readWrite { transaction in
                 message.update(withSentRecipient: group.server, wasSentByUD: false, transaction: transaction)
                 message.saveGroupChatMessageID(messageServerID, in: transaction)

Signal/src/Models/MessageActions.swift

@@ -74,9 +74,10 @@ class ConversationViewItemActions: NSObject {
     class func textActions(conversationViewItem: ConversationViewItem, shouldAllowReply: Bool, delegate: MessageActionsDelegate) -> [MenuAction] {
         var actions: [MenuAction] = []
 
-        let isGroup = conversationViewItem.isGroupThread
+        let isGroup = conversationViewItem.isGroupThread;
+        let isRSSFeed = conversationViewItem.isRSSFeed;
         
-        if shouldAllowReply && !isGroup {
+        if shouldAllowReply && !isRSSFeed {
             let replyAction = MessageActionBuilder.reply(conversationViewItem: conversationViewItem, delegate: delegate)
             actions.append(replyAction)
         }

Signal/src/ViewControllers/ColorPickerViewController.swift

@@ -306,6 +306,7 @@ class ColorPickerView: UIView, ColorViewDelegate {
 @objc
 private class MockConversationViewItem: NSObject, ConversationViewItem {
     var userCanDeleteGroupMessage: Bool = false
+    var isRSSFeed: Bool = false
     var interaction: TSInteraction = TSMessage()
     var interactionType: OWSInteractionType = OWSInteractionType.unknown
     var quotedReply: OWSQuotedReplyModel?

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

@@ -361,7 +361,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 3;
     OWSAssertDebug(CGSizeEqualToSize(
         CGSizeMake(kRemotelySourcedContentGlyphLength, kRemotelySourcedContentGlyphLength), glyphImage.size));
     UIImageView *glyphView = [[UIImageView alloc] initWithImage:glyphImage];
-    glyphView.tintColor = Theme.secondaryColor;
+    glyphView.tintColor = UIColor.whiteColor;
     [glyphView
         autoSetDimensionsToSize:CGSizeMake(kRemotelySourcedContentGlyphLength, kRemotelySourcedContentGlyphLength)];
 
@@ -549,7 +549,16 @@ const CGFloat kRemotelySourcedContentRowSpacing = 3;
         }
     } else {
         OWSContactsManager *contactsManager = Environment.shared.contactsManager;
-        NSString *quotedAuthor = [contactsManager contactOrProfileNameForPhoneIdentifier:self.quotedMessage.authorId];
+        __block NSString *quotedAuthor = [contactsManager contactOrProfileNameForPhoneIdentifier:self.quotedMessage.authorId];
+        
+        if (quotedAuthor == self.quotedMessage.authorId) {
+            [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+                NSString *collection = [NSString stringWithFormat:@"%@.%@", LKGroupChatAPI.publicChatServer, @(LKGroupChatAPI.publicChatServerID)];
+                NSString *displayName = [transaction stringForKey:self.quotedMessage.authorId inCollection:collection];
+                if (displayName != nil) { quotedAuthor = displayName; }
+            }];
+        }
+        
         quotedAuthorText = [NSString
             stringWithFormat:
                 NSLocalizedString(@"QUOTED_REPLY_AUTHOR_INDICATOR_FORMAT",

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -513,7 +513,7 @@ typedef enum : NSUInteger {
     _conversationStyle = [[ConversationStyle alloc] initWithThread:thread];
 
     _conversationViewModel =
-        [[ConversationViewModel alloc] initWithThread:thread focusMessageIdOnOpen:focusMessageId delegate:self];
+        [[ConversationViewModel alloc] initWithThread:thread focusMessageIdOnOpen:focusMessageId isRSSFeed:self.isRSSFeed delegate:self];
 
     _searchController = [[ConversationSearchController alloc] initWithThread:thread];
     _searchController.delegate = self;

Signal/src/ViewControllers/ConversationView/ConversationViewItem.h

@@ -67,6 +67,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 @property (nonatomic, readonly, nullable) OWSQuotedReplyModel *quotedReply;
 
 @property (nonatomic, readonly) BOOL isGroupThread;
+@property (nonatomic, readonly) BOOL isRSSFeed;
 @property (nonatomic, readonly) BOOL userCanDeleteGroupMessage;
 
 @property (nonatomic, readonly) BOOL hasBodyText;
@@ -162,6 +163,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 - (instancetype)init NS_UNAVAILABLE;
 - (instancetype)initWithInteraction:(TSInteraction *)interaction
                       isGroupThread:(BOOL)isGroupThread
+                          isRSSFeed:(BOOL)isRSSFeed
                         transaction:(YapDatabaseReadTransaction *)transaction
                   conversationStyle:(ConversationStyle *)conversationStyle;
 

Signal/src/ViewControllers/ConversationView/ConversationViewItem.m

@@ -119,6 +119,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 @synthesize interaction = _interaction;
 @synthesize isFirstInCluster = _isFirstInCluster;
 @synthesize isGroupThread = _isGroupThread;
+@synthesize isRSSFeed = _isRSSFeed;
 @synthesize isLastInCluster = _isLastInCluster;
 @synthesize lastAudioMessageView = _lastAudioMessageView;
 @synthesize senderName = _senderName;
@@ -126,6 +127,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 
 - (instancetype)initWithInteraction:(TSInteraction *)interaction
                       isGroupThread:(BOOL)isGroupThread
+                          isRSSFeed:(BOOL)isRSSFeed
                         transaction:(YapDatabaseReadTransaction *)transaction
                   conversationStyle:(ConversationStyle *)conversationStyle
 {
@@ -141,6 +143,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 
     _interaction = interaction;
     _isGroupThread = isGroupThread;
+    _isRSSFeed = isRSSFeed;
     _conversationStyle = conversationStyle;
 
     [self updateAuthorConversationColorNameWithTransaction:transaction];

Signal/src/ViewControllers/ConversationView/ConversationViewModel.h

@@ -98,10 +98,12 @@ typedef NS_ENUM(NSUInteger, ConversationUpdateItemType) {
 @property (nonatomic, readonly) ConversationViewState *viewState;
 @property (nonatomic, nullable) NSString *focusMessageIdOnOpen;
 @property (nonatomic, readonly, nullable) ThreadDynamicInteractions *dynamicInteractions;
+@property (nonatomic, readonly) BOOL isRSSFeed;
 
 - (instancetype)init NS_UNAVAILABLE;
 - (instancetype)initWithThread:(TSThread *)thread
           focusMessageIdOnOpen:(nullable NSString *)focusMessageIdOnOpen
+                     isRSSFeed:(BOOL)isRSSFeed
                       delegate:(id<ConversationViewModelDelegate>)delegate NS_DESIGNATED_INITIALIZER;
 
 - (void)ensureDynamicInteractionsAndUpdateIfNecessary:(BOOL)updateIfNecessary;

Signal/src/ViewControllers/ConversationView/ConversationViewModel.m

@@ -218,6 +218,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
 
 - (instancetype)initWithThread:(TSThread *)thread
           focusMessageIdOnOpen:(nullable NSString *)focusMessageIdOnOpen
+                     isRSSFeed:(BOOL)isRSSFeed
                       delegate:(id<ConversationViewModelDelegate>)delegate
 {
     self = [super init];
@@ -233,6 +234,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
     _persistedViewItems = @[];
     _unsavedOutgoingMessages = @[];
     self.focusMessageIdOnOpen = focusMessageIdOnOpen;
+    _isRSSFeed = isRSSFeed;
     _viewState = [[ConversationViewState alloc] initWithViewItems:@[]];
 
     [self configure];
@@ -1205,6 +1207,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
 
     NSArray<NSString *> *loadedUniqueIds = [self.messageMapping loadedUniqueIds];
     BOOL isGroupThread = self.thread.isGroupThread;
+    BOOL isRSSFeed = self.isRSSFeed;
     ConversationStyle *conversationStyle = self.delegate.conversationStyle;
 
     [self ensureConversationProfileState];
@@ -1218,6 +1221,7 @@ static const int kYapDatabaseRangeMaxLength = 25000;
               if (!viewItem) {
                   viewItem = [[ConversationInteractionViewItem alloc] initWithInteraction:interaction
                                                                             isGroupThread:isGroupThread
+                                                                                isRSSFeed:isRSSFeed
                                                                               transaction:transaction
                                                                         conversationStyle:conversationStyle];
               }

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -2012,6 +2012,7 @@ NS_ASSUME_NONNULL_BEGIN
                 id<ConversationViewItem> viewItem =
                     [[ConversationInteractionViewItem alloc] initWithInteraction:messageToQuote
                                                                    isGroupThread:thread.isGroupThread
+                                                                       isRSSFeed:NO
                                                                      transaction:transaction
                                                                conversationStyle:conversationStyle];
                 quotedMessage = [
@@ -2033,6 +2034,7 @@ NS_ASSUME_NONNULL_BEGIN
                 id<ConversationViewItem> viewItem =
                     [[ConversationInteractionViewItem alloc] initWithInteraction:messageToQuote
                                                                    isGroupThread:thread.isGroupThread
+                                                                       isRSSFeed:NO
                                                                      transaction:transaction
                                                                conversationStyle:conversationStyle];
                 quotedMessage = [

Signal/src/ViewControllers/MediaPageViewController.swift

@@ -579,6 +579,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
             let conversationStyle = ConversationStyle(thread: thread)
             fetchedItem = ConversationInteractionViewItem(interaction: message,
                                                           isGroupThread: thread.isGroupThread(),
+                                                          isRSSFeed: false,
                                                           transaction: transaction,
                                                           conversationStyle: conversationStyle)
         }

SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift

@@ -139,6 +139,8 @@ public final class LokiGroupChatAPI : NSObject {
                 throw Error.parsingFailed
             }
             return rawMessages.flatMap { message in
+                let isDeleted = (message["is_deleted"] as? Int == 1)
+                guard !isDeleted else { return nil }
                 guard let annotations = message["annotations"] as? [JSON], let annotation = annotations.first, let value = annotation["value"] as? JSON,
                     let serverID = message["id"] as? UInt64, let body = message["text"] as? String, let hexEncodedPublicKey = value["source"] as? String, let displayName = value["from"] as? String,
                     let timestamp = value["timestamp"] as? UInt64 else {
@@ -147,7 +149,13 @@ public final class LokiGroupChatAPI : NSObject {
                 }
                 let lastMessageServerID = getLastMessageServerID(for: group, on: server)
                 if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: group, on: server, to: serverID) }
-                return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
+                let quote: LokiGroupMessage.Quote?
+                if let quoteAsJSON = value["quote"] as? JSON, let quotedMessageTimestamp = quoteAsJSON["id"] as? UInt64, let quoteeHexEncodedPublicKey = quoteAsJSON["author"] as? String, let quotedMessageBody = quoteAsJSON["text"] as? String {
+                    quote = LokiGroupMessage.Quote(quotedMessageTimestamp: quotedMessageTimestamp, quoteeHexEncodedPublicKey: quoteeHexEncodedPublicKey, quotedMessageBody: quotedMessageBody)
+                } else {
+                    quote = nil
+                }
+                return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp, quote: quote)
             }
         }
     }
@@ -170,7 +178,7 @@ public final class LokiGroupChatAPI : NSObject {
                     throw Error.parsingFailed
                 }
                 let timestamp = UInt64(date.timeIntervalSince1970) * 1000
-                return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp)
+                return LokiGroupMessage(serverID: serverID, hexEncodedPublicKey: userHexEncodedPublicKey, displayName: displayName, body: body, type: publicChatMessageType, timestamp: timestamp, quote: message.quote)
             }
         }.recover { error -> Promise<LokiGroupMessage> in
             if let error = error as? NetworkManagerError, error.statusCode == 401 {

SignalServiceKit/src/Loki/API/LokiGroupMessage.swift

@@ -9,26 +9,43 @@ public final class LokiGroupMessage : NSObject {
     /// - Note: Expressed as milliseconds since 00:00:00 UTC on 1 January 1970.
     public let timestamp: UInt64
     public let type: String
+    public let quote: Quote?
     
     @objc(serverID)
     public var objc_serverID: UInt64 { return serverID ?? 0 }
     
-    public init(serverID: UInt64?, hexEncodedPublicKey: String, displayName: String, body: String, type: String, timestamp: UInt64) {
+    public struct Quote {
+        public let quotedMessageTimestamp: UInt64
+        public let quoteeHexEncodedPublicKey: String
+        public let quotedMessageBody: String
+    }
+    
+    public init(serverID: UInt64?, hexEncodedPublicKey: String, displayName: String, body: String, type: String, timestamp: UInt64, quote: Quote?) {
         self.serverID = serverID
         self.hexEncodedPublicKey = hexEncodedPublicKey
         self.displayName = displayName
         self.body = body
         self.type = type
         self.timestamp = timestamp
+        self.quote = quote
         super.init()
     }
     
-    @objc public convenience init(hexEncodedPublicKey: String, displayName: String, body: String, type: String, timestamp: UInt64) {
+    @objc public convenience init(hexEncodedPublicKey: String, displayName: String, body: String, type: String, timestamp: UInt64, quotedMessageTimestamp: UInt64, quoteeHexEncodedPublicKey: String?, quotedMessageBody: String?) {
-        self.init(serverID: nil, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: type, timestamp: timestamp)
+        let quote: Quote?
+        if quotedMessageTimestamp != 0, let quoteeHexEncodedPublicKey = quoteeHexEncodedPublicKey, let quotedMessageBody = quotedMessageBody {
+            quote = Quote(quotedMessageTimestamp: quotedMessageTimestamp, quoteeHexEncodedPublicKey: quoteeHexEncodedPublicKey, quotedMessageBody: quotedMessageBody)
+        } else {
+            quote = nil
+        }
+        self.init(serverID: nil, hexEncodedPublicKey: hexEncodedPublicKey, displayName: displayName, body: body, type: type, timestamp: timestamp, quote: quote)
     }
     
     internal func toJSON() -> JSON {
-        let value: JSON = [ "timestamp" : timestamp, "from" : displayName, "source" : hexEncodedPublicKey ]
+        var value: JSON = [ "timestamp" : timestamp, "from" : displayName, "source" : hexEncodedPublicKey ]
+        if let quote = quote {
+            value["quote"] = [ "id" : quote.quotedMessageTimestamp, "author" : quote.quoteeHexEncodedPublicKey, "text" : quote.quotedMessageBody ]
+        }
         return [ "text" : body, "annotations": [ [ "type" : type, "value" : value ] ] ]
     }
 }

SignalServiceKit/src/Messages/Interactions/TSQuotedMessage.m

@@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
         }
     }
 
-    OWSAssertDebug(bodySource != TSQuotedMessageContentSourceUnknown);
+    // OWSAssertDebug(bodySource != TSQuotedMessageContentSourceUnknown);
 
     NSMutableArray<OWSAttachmentInfo *> *attachmentInfos = [NSMutableArray new];
     for (SSKProtoDataMessageQuoteQuotedAttachment *quotedAttachment in quoteProto.attachments) {

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -1113,7 +1113,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;
         NSString *displayName = SSKEnvironment.shared.profileManager.localProfileName;
         if (displayName == nil) { displayName = @"Anonymous"; }
-        LKGroupMessage *groupMessage = [[LKGroupMessage alloc] initWithHexEncodedPublicKey:userHexEncodedPublicKey displayName:displayName body:message.body type:LKGroupChatAPI.publicChatMessageType timestamp:message.timestamp];
+        TSQuotedMessage *quote = message.quotedMessage;
+        LKGroupMessage *groupMessage = [[LKGroupMessage alloc] initWithHexEncodedPublicKey:userHexEncodedPublicKey displayName:displayName body:message.body type:LKGroupChatAPI.publicChatMessageType
+            timestamp:message.timestamp quotedMessageTimestamp:quote.timestamp quoteeHexEncodedPublicKey:quote.authorId quotedMessageBody:quote.body];
         [[LKGroupChatAPI sendMessage:groupMessage toGroup:LKGroupChatAPI.publicChatServerID onServer:LKGroupChatAPI.publicChatServer]
         .thenOn(OWSDispatch.sendingQueue, ^(LKGroupMessage *groupMessage) {
             [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {