Add channel id field to invitations

js/background.js

@@ -809,6 +809,7 @@
         if (convo) {
           convo.sendMessage('', null, null, null, {
             serverName: serverInfo.name,
+            channelId: serverInfo.channelId,
             serverAddress: serverInfo.address,
           });
         }
@@ -833,10 +834,11 @@
       }
     });
 
-    Whisper.events.on('invitationAccepted', async serverAddress => {
+    Whisper.events.on(
+      'invitationAccepted',
+      async (serverAddress, channelId) => {
         // To some degree this has been copy-pasted
         // form connection_to_server_dialog_view.js:
-      const channelId = 1;
         const rawServerUrl = serverAddress
           .replace(/^https?:\/\//i, '')
           .replace(/[/\\]+$/i, '');
@@ -869,7 +871,8 @@
         );
 
         appView.openConversation(conversationId, {});
-    });
+      }
+    );
 
     Whisper.events.on('leaveGroup', async groupConvo => {
       if (appView) {

js/models/messages.js

@@ -464,7 +464,8 @@
         onClick: () => {
           Whisper.events.trigger(
             'invitationAccepted',
-            invitation.serverAddress
+            invitation.serverAddress,
+            invitation.channelId
           );
         },
       };

js/views/invite_friends_dialog_view.js

@@ -21,6 +21,7 @@
       this.friends = friends;
       this.chatName = convo.get('name');
       this.chatServer = convo.get('server');
+      this.channelId = convo.get('channelId');
 
       this.$el.focus();
       this.render();
@@ -45,7 +46,11 @@
     },
     submit(pubkeys) {
       window.sendGroupInvitations(
-        { address: this.chatServer, name: this.chatName },
+        {
+          address: this.chatServer,
+          name: this.chatName,
+          channelId: this.channelId,
+        },
         pubkeys
       );
     },

libtextsecure/sendmessage.js

@@ -165,6 +165,7 @@ Message.prototype = {
       proto.groupInvitation = new textsecure.protobuf.DataMessage.GroupInvitation(
         {
           serverAddress: this.groupInvitation.serverAddress,
+          channelId: this.groupInvitation.channelId,
           serverName: this.groupInvitation.serverName,
         }
       );

protos/SignalService.proto

@@ -202,7 +202,8 @@ message DataMessage {
 
   message GroupInvitation {
     optional string serverAddress = 1;
-    optional string serverName = 2;
+    optional string channelId = 2;
+    optional string serverName = 3;
   }
 
   optional string             body        = 1;