Merge pull request #30 from sachaaaaa/fix_enum_clash

change FRIEND_REQUEST value to prevent clash with upstream

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,
       };

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;