From c605fff58d2a9a83d254088c3a0d5ed444ac29c2 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Tue, 13 Nov 2018 12:16:59 +1100
Subject: [PATCH] change FRIEND_REQUEST value to prevent clash with upstream

---
 libloki/libloki-protocol.js | 2 +-
 protos/SignalService.proto  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libloki/libloki-protocol.js b/libloki/libloki-protocol.js
index 4409c286c..5b4109735 100644
--- a/libloki/libloki-protocol.js
+++ b/libloki/libloki-protocol.js
@@ -32,7 +32,7 @@
       ivAndCiphertext.set(new Uint8Array(ciphertext), iv.byteLength);
 
       return {
-        type: 6, // friend request
+        type: textsecure.protobuf.Envelope.Type.FRIEND_REQUEST, // friend request
         body: ivAndCiphertext,
         registrationId: null,
       };
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 1ff3bf7dc..e76ff9218 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -12,7 +12,7 @@ message Envelope {
     PREKEY_BUNDLE = 3;
     RECEIPT       = 5;
     UNIDENTIFIED_SENDER = 6;
-    FRIEND_REQUEST = 7; // contains prekeys + message and is using simple encryption
+    FRIEND_REQUEST = 101; // contains prekeys + message and is using simple encryption
   }
 
   optional Type   type            = 1;