From 7216a33dc838f365c47661bf6819b2f0d50ffeb3 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 1 May 2020 10:39:43 +1000 Subject: [PATCH] Don't update friend request logic when generating messages --- .../Multi Device/MultiDeviceProtocol.swift | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift index 7aebf37a6..6106e21c6 100644 --- a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift +++ b/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocol.swift @@ -131,30 +131,9 @@ public final class MultiDeviceProtocol : NSObject { recipientUDAccess = udManager.udAccess(forRecipientId: hexEncodedPublicKey, requireSyncAccess: true) } - let friendRequestStatus = storage.getFriendRequestStatus(for: hexEncodedPublicKey, transaction: transaction) - if (friendRequestStatus == .none || friendRequestStatus == .requestExpired) { - storage.setFriendRequestStatus(.requestSending, for: hexEncodedPublicKey, transaction: transaction) - } - return OWSMessageSend(message: message, thread: thread, recipient: recipient, senderCertificate: senderCertificate, udAccess: recipientUDAccess, localNumber: getUserHexEncodedPublicKey(), success: { - DispatchQueue.main.async { - storage.dbReadWriteConnection.readWrite { transaction in - let friendRequestStatus = storage.getFriendRequestStatus(for: hexEncodedPublicKey, transaction: transaction) - if (friendRequestStatus != .friends || friendRequestStatus != .requestReceived || friendRequestStatus != .requestSent) { - storage.setFriendRequestStatus(.requestSent, for: hexEncodedPublicKey, transaction: transaction) - } - } - } }, failure: { _ in - DispatchQueue.main.async { - storage.dbReadWriteConnection.readWrite { transaction in - let friendRequestStatus = storage.getFriendRequestStatus(for: hexEncodedPublicKey, transaction: transaction) - if (friendRequestStatus != .friends || friendRequestStatus != .requestReceived || friendRequestStatus != .requestSent) { - storage.setFriendRequestStatus(.none, for: hexEncodedPublicKey, transaction: transaction) - } - } - } }) }