From c2e34fb36ea5c4853ef213958e2b593f7ec0e8d4 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Wed, 6 May 2020 13:38:07 +1000
Subject: [PATCH] Fix auto accept friend request condition.

---
 .../Loki/Protocol/Friend Requests/FriendRequestProtocol.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocol.swift
index 1819fcc04..5c7f76b76 100644
--- a/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocol.swift	
@@ -245,7 +245,9 @@ public final class FriendRequestProtocol : NSObject {
         // Signal cipher decryption and thus that we have a session with the other person.
         let friendRequestStatus = storage.getFriendRequestStatus(for: hexEncodedPublicKey, transaction: transaction);
         // We shouldn't be able to skip from none to friends
-        guard friendRequestStatus != .none && friendRequestStatus != .friends else { return }
+        guard friendRequestStatus == .requestSending ||
+            friendRequestStatus == .requestSent ||
+            friendRequestStatus == .requestReceived else { return }
         // Become friends
         storage.setFriendRequestStatus(.friends, for: hexEncodedPublicKey, transaction: transaction)
         // Send a contact sync message if needed