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 1/2] 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;

From 2451ffdca4bfa827fd55dd00b9bf83f24c9054f3 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Tue, 13 Nov 2018 13:32:41 +1100
Subject: [PATCH 2/2] Comment out signal-specific logic introduced in latest
 merge

---
 js/background.js | 50 ++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/js/background.js b/js/background.js
index 8d20a06e2..8c0df8d69 100644
--- a/js/background.js
+++ b/js/background.js
@@ -453,12 +453,12 @@
 
       // listeners
       Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion);
-      window.Signal.RefreshSenderCertificate.initialize({
-        events: Whisper.events,
-        storage,
-        navigator,
-        logger: window.log,
-      });
+      // window.Signal.RefreshSenderCertificate.initialize({
+      //   events: Whisper.events,
+      //   storage,
+      //   navigator,
+      //   logger: window.log,
+      // });
 
       connect(true);
     });
@@ -478,12 +478,12 @@
     } else if (Whisper.Registration.everDone()) {
       // listeners
       Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion);
-      window.Signal.RefreshSenderCertificate.initialize({
-        events: Whisper.events,
-        storage,
-        navigator,
-        logger: window.log,
-      });
+      // window.Signal.RefreshSenderCertificate.initialize({
+      //   events: Whisper.events,
+      //   storage,
+      //   navigator,
+      //   logger: window.log,
+      // });
 
       connect();
       appView.openInbox({
@@ -676,19 +676,19 @@
       window.getSyncRequest();
     }
 
-    const udSupportKey = 'hasRegisterSupportForUnauthenticatedDelivery';
-    if (!storage.get(udSupportKey)) {
-      const server = WebAPI.connect({ username: USERNAME, password: PASSWORD });
-      try {
-        await server.registerSupportForUnauthenticatedDelivery();
-        storage.put(udSupportKey, true);
-      } catch (error) {
-        window.log.error(
-          'Error: Unable to register for unauthenticated delivery support.',
-          error && error.stack ? error.stack : error
-        );
-      }
-    }
+    // const udSupportKey = 'hasRegisterSupportForUnauthenticatedDelivery';
+    // if (!storage.get(udSupportKey)) {
+    //   const server = WebAPI.connect({ username: USERNAME, password: PASSWORD });
+    //   try {
+    //     await server.registerSupportForUnauthenticatedDelivery();
+    //     storage.put(udSupportKey, true);
+    //   } catch (error) {
+    //     window.log.error(
+    //       'Error: Unable to register for unauthenticated delivery support.',
+    //       error && error.stack ? error.stack : error
+    //     );
+    //   }
+    // }
 
     const deviceId = textsecure.storage.user.getDeviceId();
     const ourNumber = textsecure.storage.user.getNumber();