diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 531e1760e..3039232bf 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1614,7 +1614,7 @@ static NSTimeInterval launchStartedAt; - (void)createRSSFeedsIfNeeded { - NSArray *feeds = @[ self.lokiNewsFeed, self.lokiMessengerUpdatesFeed ]; + NSArray *feeds = @[ /*self.lokiNewsFeed,*/ self.lokiMessengerUpdatesFeed ]; NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey; for (LKRSSFeed *feed in feeds) { NSString *userDefaultsKey = [@"isRSSFeedSetUp." stringByAppendingString:feed.id]; diff --git a/Signal/src/Models/MessageActions.swift b/Signal/src/Models/MessageActions.swift index 02170d8e5..5d99a6c91 100644 --- a/Signal/src/Models/MessageActions.swift +++ b/Signal/src/Models/MessageActions.swift @@ -131,6 +131,7 @@ class ConversationViewItemActions: NSObject { var actions: [MenuAction] = [] let isGroup = conversationViewItem.isGroupThread; + let isRSSFeed = conversationViewItem.isRSSFeed; if shouldAllowReply { let replyAction = MessageActionBuilder.reply(conversationViewItem: conversationViewItem, delegate: delegate) @@ -147,6 +148,11 @@ class ConversationViewItemActions: NSObject { actions.append(saveMediaAction) } } + + if isGroup && !isRSSFeed && conversationViewItem.interaction is TSIncomingMessage { + let copyPublicKeyAction = MessageActionBuilder.copyPublicKey(conversationViewItem: conversationViewItem, delegate: delegate) + actions.append(copyPublicKeyAction) + } if !isGroup || conversationViewItem.userCanDeleteGroupMessage { let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 4af814e77..d5dfb14dc 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1738,7 +1738,7 @@ NS_ASSUME_NONNULL_BEGIN return NSLog(@"[Loki] Ignoring friend request in group chat.", @""); } if (envelope.type != SSKProtoEnvelopeTypeFriendRequest) { - return NSLog(@"[Loki] handleFriendRequestMessageIfNeededWithEnvelope:data:message:thread:transaction was called with an envelope that isn't of type SSKProtoEnvelopeTypeFriendRequest."); + return NSLog(@"[Loki] Ignoring friend request logic for non friend request type envelope."); } if ([self canFriendRequestBeAutoAcceptedForThread:thread transaction:transaction]) { [thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction];