Merge pull request #789 from Mikunj/closed-group-fixes

Closed group fixes

js/background.js

@@ -2112,13 +2112,16 @@
       const { wrap, sendOptions } = ConversationController.prepareForSend(
         data.source
       );
-      await wrap(
-        textsecure.messaging.sendDeliveryReceipt(
-          data.source,
-          data.timestamp,
-          sendOptions
-        )
-      );
+      const isGroup = data && data.message && data.message.group;
+      if (!isGroup) {
+        await wrap(
+          textsecure.messaging.sendDeliveryReceipt(
+            data.source,
+            data.timestamp,
+            sendOptions
+          )
+        );
+      }
     } catch (error) {
       window.log.error(
         `Failed to send delivery receipt to ${data.source} for message ${

js/models/conversations.js

@@ -382,6 +382,11 @@
     },
 
     sendTypingMessage(isTyping) {
+      // Loki - Temporarily disable typing messages for groups
+      if (!this.isPrivate()) {
+        return;
+      }
+
       const groupId = !this.isPrivate() ? this.id : null;
       const recipientId = this.isPrivate() ? this.id : null;
       const groupNumbers = this.getRecipients();
@@ -1518,11 +1523,14 @@
           now
         );
 
+        const conversationType = this.get('type');
+
         let messageWithSchema = null;
 
         // If we are a friend with any of the devices, send the message normally
         const canSendNormalMessage = await this.isFriendWithAnyDevice();
-        if (canSendNormalMessage) {
+        const isGroup = conversationType === Message.GROUP;
+        if (canSendNormalMessage || isGroup) {
           messageWithSchema = await upgradeMessageSchema({
             type: 'outgoing',
             body,
@@ -1668,8 +1676,6 @@
           return message.sendSyncMessageOnly(dataMessage);
         }
 
-        const conversationType = this.get('type');
-
         const options = this.getSendOptions();
         options.messageType = message.get('type');
         options.isPublic = this.isPublic();
@@ -2321,7 +2327,7 @@
         return;
       }
 
-      if (!this.isPublic() && read.length && options.sendReadReceipts) {
+      if (this.isPrivate() && read.length && options.sendReadReceipts) {
         window.log.info(`Sending ${read.length} read receipts`);
         // Because syncReadMessages sends to our other devices, and sendReadReceipts goes
         //   to a contact, we need accessKeys for both.

libtextsecure/outgoing_message.js

@@ -72,6 +72,11 @@ function OutgoingMessage(
     options || {};
   this.numberInfo = numberInfo;
   this.isPublic = isPublic;
+  this.isGroup = !!(
+    this.message &&
+    this.message.dataMessage &&
+    this.message.dataMessage.group
+  );
   this.publicSendData = publicSendData;
   this.senderCertificate = senderCertificate;
   this.online = online;
@@ -348,7 +353,8 @@ OutgoingMessage.prototype = {
           if (
             conversation &&
             !conversation.isFriend() &&
-            !conversation.hasReceivedFriendRequest()
+            !conversation.hasReceivedFriendRequest() &&
+            !this.isGroup
           ) {
             // We want to send an automated friend request if:
             // - We aren't already friends

libtextsecure/sendmessage.js

@@ -409,6 +409,8 @@ MessageSender.prototype = {
       options
     );
 
+    const ourNumber = textsecure.storage.user.getNumber();
+
     numbers.forEach(number => {
       // Note: if we are sending a private group message, we do our best to
       // ensure we have signal protocol sessions with every member, but if we
@@ -419,7 +421,7 @@ MessageSender.prototype = {
       );
 
       if (
-        number === textsecure.storage.user.getNumber() ||
+        number === ourNumber ||
         haveSession ||
         options.isPublic ||
         options.messageType === 'friend-request'
@@ -427,6 +429,20 @@ MessageSender.prototype = {
         this.queueJobForNumber(number, () => outgoing.sendToNumber(number));
       } else {
         window.log.error(`No session for number: ${number}`);
+        // If it was a message to a group then we need to send a session request
+        if (outgoing.isGroup) {
+          this.sendMessageToNumber(
+            number,
+            '(If you see this message, you must be using an out-of-date client)',
+            [],
+            undefined,
+            [],
+            Date.now(),
+            undefined,
+            undefined,
+            { messageType: 'friend-request', sessionRequest: true }
+          );
+        }
       }
     });
   },