Merge pull request #838 from loki-project/friend-request-fix

Friend request bug fix

js/modules/loki_app_dot_net_api.js

@@ -614,7 +614,9 @@ class LokiAppDotNetServerAPI {
           `serverRequest ${mode} error`,
           e.code,
           e.message,
-          `json: ${txtResponse}`, 'attempting connection to', url
+          `json: ${txtResponse}`,
+          'attempting connection to',
+          url
         );
       } else {
         log.info(

libtextsecure/outgoing_message.js

@@ -484,6 +484,7 @@ OutgoingMessage.prototype = {
           sourceDevice: 1,
           content,
           pubKey: devicePubKey,
+          isFriendRequest: enableFallBackEncryption,
         };
       })
     )
@@ -504,10 +505,7 @@ OutgoingMessage.prototype = {
               this.timestamp,
               outgoingObject.ttl
             );
-            if (
-              outgoingObject.type ===
-              textsecure.protobuf.Envelope.Type.FRIEND_REQUEST
-            ) {
+            if (outgoingObject.isFriendRequest) {
               const conversation = ConversationController.get(destination);
               if (conversation) {
                 // Redundant for primary device but marks secondary devices as pending