Disable Loki News Feed & add missing message action

pull/101/head
Niels Andriesse 5 years ago
parent a586c9db2d
commit c8a265258a

@ -1614,7 +1614,7 @@ static NSTimeInterval launchStartedAt;
- (void)createRSSFeedsIfNeeded - (void)createRSSFeedsIfNeeded
{ {
NSArray *feeds = @[ self.lokiNewsFeed, self.lokiMessengerUpdatesFeed ]; NSArray *feeds = @[ /*self.lokiNewsFeed,*/ self.lokiMessengerUpdatesFeed ];
NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey; NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;
for (LKRSSFeed *feed in feeds) { for (LKRSSFeed *feed in feeds) {
NSString *userDefaultsKey = [@"isRSSFeedSetUp." stringByAppendingString:feed.id]; NSString *userDefaultsKey = [@"isRSSFeedSetUp." stringByAppendingString:feed.id];

@ -131,6 +131,7 @@ class ConversationViewItemActions: NSObject {
var actions: [MenuAction] = [] var actions: [MenuAction] = []
let isGroup = conversationViewItem.isGroupThread; let isGroup = conversationViewItem.isGroupThread;
let isRSSFeed = conversationViewItem.isRSSFeed;
if shouldAllowReply { if shouldAllowReply {
let replyAction = MessageActionBuilder.reply(conversationViewItem: conversationViewItem, delegate: delegate) let replyAction = MessageActionBuilder.reply(conversationViewItem: conversationViewItem, delegate: delegate)
@ -148,6 +149,11 @@ class ConversationViewItemActions: NSObject {
} }
} }
if isGroup && !isRSSFeed && conversationViewItem.interaction is TSIncomingMessage {
let copyPublicKeyAction = MessageActionBuilder.copyPublicKey(conversationViewItem: conversationViewItem, delegate: delegate)
actions.append(copyPublicKeyAction)
}
if !isGroup || conversationViewItem.userCanDeleteGroupMessage { if !isGroup || conversationViewItem.userCanDeleteGroupMessage {
let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate) let deleteAction = MessageActionBuilder.deleteMessage(conversationViewItem: conversationViewItem, delegate: delegate)
actions.append(deleteAction) actions.append(deleteAction)

@ -1738,7 +1738,7 @@ NS_ASSUME_NONNULL_BEGIN
return NSLog(@"[Loki] Ignoring friend request in group chat.", @""); return NSLog(@"[Loki] Ignoring friend request in group chat.", @"");
} }
if (envelope.type != SSKProtoEnvelopeTypeFriendRequest) { 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]) { if ([self canFriendRequestBeAutoAcceptedForThread:thread transaction:transaction]) {
[thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction]; [thread saveFriendRequestStatus:LKThreadFriendRequestStatusFriends withTransaction:transaction];

Loading…
Cancel
Save