From a7ea2f01a2fc674a3922e33b622849742dda6954 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Fri, 31 Jan 2020 16:15:04 +1100
Subject: [PATCH] Don't use envelope to determine friend request

---
 src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index de0af32553..393c1989e3 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -292,7 +292,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       acceptFriendRequestIfNeeded(content);
 
       // Loki - Session requests
-      handleSessionRequestIfNeeded(envelope, content);
+      handleSessionRequestIfNeeded(content);
 
       // Loki - Store pre key bundle
       // We shouldn't store it if it's a pairing message
@@ -1226,8 +1226,8 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     becomeFriendsWithContact(content.getSender(), true, false);
   }
 
-  private void handleSessionRequestIfNeeded(@NonNull SignalServiceEnvelope envelope, @NonNull SignalServiceContent content) {
-    if (envelope.isFriendRequest() && isSessionRequest(content)) {
+  private void handleSessionRequestIfNeeded(@NonNull SignalServiceContent content) {
+    if (content.isFriendRequest() && isSessionRequest(content)) {
       // TODO: Check if member is in one of our private groups
       boolean isInOneOfOurGroups = false;
       if (isInOneOfOurGroups) {