From f500fed69c3acbc4ed8ac34c46943d61354a26ed Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 12 Jun 2020 11:15:32 +1000
Subject: [PATCH] rename missing envelope type FR to SESSION_REQUEST

---
 libloki/crypto.js                 | 2 +-
 libloki/test/crypto_test.js       | 2 +-
 libtextsecure/message_receiver.js | 6 +++---
 libtextsecure/sendmessage.js      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libloki/crypto.js b/libloki/crypto.js
index e9a9988d2..e86b84528 100644
--- a/libloki/crypto.js
+++ b/libloki/crypto.js
@@ -153,7 +153,7 @@
         ivAndCiphertext
       ).toString('binary');
       return {
-        type: textsecure.protobuf.Envelope.Type.FRIEND_REQUEST,
+        type: textsecure.protobuf.Envelope.Type.SESSION_REQUEST,
         body: binaryIvAndCiphertext,
         registrationId: undefined,
       };
diff --git a/libloki/test/crypto_test.js b/libloki/test/crypto_test.js
index 9145f3af3..8a294c4ba 100644
--- a/libloki/test/crypto_test.js
+++ b/libloki/test/crypto_test.js
@@ -24,7 +24,7 @@ describe('Crypto', () => {
       const { type } = await fallbackCipher.encrypt(buffer);
       assert.strictEqual(
         type,
-        textsecure.protobuf.Envelope.Type.FRIEND_REQUEST
+        textsecure.protobuf.Envelope.Type.SESSION_REQUEST
       );
     });
 
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 4aecb96e2..45796d7ad 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -744,7 +744,7 @@ MessageReceiver.prototype.extend({
       case textsecure.protobuf.Envelope.Type.MEDIUM_GROUP_CIPHERTEXT:
         promise = this.decryptForMediumGroup(envelope, ciphertext);
         break;
-      case textsecure.protobuf.Envelope.Type.FRIEND_REQUEST: {
+      case textsecure.protobuf.Envelope.Type.SESSION_REQUEST: {
         window.log.info('friend-request message from ', envelope.source);
 
         const fallBackSessionCipher = new libloki.crypto.FallBackSessionCipher(
@@ -784,10 +784,10 @@ MessageReceiver.prototype.extend({
               }
 
               // We might have substituted the type based on decrypted content
-              if (type === textsecure.protobuf.Envelope.Type.FRIEND_REQUEST) {
+              if (type === textsecure.protobuf.Envelope.Type.SESSION_REQUEST) {
                 // eslint-disable-next-line no-param-reassign
                 envelope.type =
-                  textsecure.protobuf.Envelope.Type.FRIEND_REQUEST;
+                  textsecure.protobuf.Envelope.Type.SESSION_REQUEST;
               }
 
               if (this.isBlocked(sender.getName())) {
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 08774c4a0..faae1af35 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -1178,7 +1178,7 @@ MessageSender.prototype = {
     };
 
     // Loki - Temp hack for new protocol
-    // A session reset should be a `FRIEND_REQUEST`
+    // A session reset should be a `SESSION_REQUEST`
     const msgOptions = {
       messageType: 'friend-request',
       ...options,