From ec64ad80b4807f8f4e9a1937d9571a9c9ead1d0d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 11 Sep 2020 16:21:48 +1000
Subject: [PATCH] rename LOKI_FRIEND_REQUEST to FALLBACK_MESSAGE

---
 js/modules/metadata/CiphertextMessage.js   |  2 +-
 js/modules/metadata/SecretSessionCipher.js | 10 +++++-----
 protos/UnidentifiedDelivery.proto          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/modules/metadata/CiphertextMessage.js b/js/modules/metadata/CiphertextMessage.js
index 1e2ddb6ea..20274e204 100644
--- a/js/modules/metadata/CiphertextMessage.js
+++ b/js/modules/metadata/CiphertextMessage.js
@@ -11,5 +11,5 @@ module.exports = {
 
   ENCRYPTED_MESSAGE_OVERHEAD: 53,
 
-  LOKI_FRIEND_REQUEST: 101,
+  FALLBACK_MESSAGE: 101,
 };
diff --git a/js/modules/metadata/SecretSessionCipher.js b/js/modules/metadata/SecretSessionCipher.js
index 5f8d38495..3e0166c42 100644
--- a/js/modules/metadata/SecretSessionCipher.js
+++ b/js/modules/metadata/SecretSessionCipher.js
@@ -199,8 +199,8 @@ function _createUnidentifiedSenderMessageContentFromBuffer(serialized) {
     case TypeEnum.PREKEY_MESSAGE:
       type = CiphertextMessage.PREKEY_TYPE;
       break;
-    case TypeEnum.LOKI_FRIEND_REQUEST:
-      type = CiphertextMessage.LOKI_FRIEND_REQUEST;
+    case TypeEnum.FALLBACK_MESSAGE:
+      type = CiphertextMessage.FALLBACK_MESSAGE;
       break;
     default:
       throw new Error(`Unknown type: ${message.type}`);
@@ -226,8 +226,8 @@ function _getProtoMessageType(type) {
       return TypeEnum.MESSAGE;
     case CiphertextMessage.PREKEY_TYPE:
       return TypeEnum.PREKEY_MESSAGE;
-    case CiphertextMessage.LOKI_FRIEND_REQUEST:
-      return TypeEnum.LOKI_FRIEND_REQUEST;
+    case CiphertextMessage.FALLBACK_MESSAGE:
+      return TypeEnum.FALLBACK_MESSAGE;
     default:
       throw new Error(`_getProtoMessageType: type '${type}' does not exist`);
   }
@@ -481,7 +481,7 @@ SecretSessionCipher.prototype = {
           signalProtocolStore,
           sender
         ).decryptPreKeyWhisperMessage(message.content);
-      case CiphertextMessage.LOKI_FRIEND_REQUEST:
+      case CiphertextMessage.FALLBACK_MESSAGE:
         return new libloki.crypto.FallBackSessionCipher(sender).decrypt(
           message.content
         );
diff --git a/protos/UnidentifiedDelivery.proto b/protos/UnidentifiedDelivery.proto
index 9b49b8c9b..ee7422d65 100644
--- a/protos/UnidentifiedDelivery.proto
+++ b/protos/UnidentifiedDelivery.proto
@@ -25,7 +25,7 @@ message UnidentifiedSenderMessage {
         enum Type {
             PREKEY_MESSAGE = 1;
             MESSAGE        = 2;
-            LOKI_FRIEND_REQUEST = 3;
+            FALLBACK_MESSAGE = 3;
         }
 
         optional Type              type              = 1;