Revert sending id

js/background.js

@@ -1411,7 +1411,6 @@
     const { isError } = options;
 
     let messageData = {
-      id: data.id,
       source: data.source,
       sourceDevice: data.sourceDevice,
       sent_at: data.timestamp,

js/models/conversations.js

@@ -1357,7 +1357,6 @@
         options.messageType = message.get('type');
         if (this.isPublic()) {
           options.publicEndpoint = this.getEndpoint();
-          options.messageId = id;
         }
 
         const groupNumbers = this.getRecipients();

js/models/messages.js

@@ -2014,9 +2014,7 @@
           } else {
             await conversation.onFriendRequestAccepted();
           }
-          // Force save if the message already has an id, used for public channels
           const id = await window.Signal.Data.saveMessage(message.attributes, {
-            forceSave: !!message.id,
             Message: Whisper.Message,
           });
           message.set({ id });

js/modules/loki_message_api.js

@@ -80,7 +80,6 @@ class LokiMessageAPI {
       isPing = false,
       numConnections = DEFAULT_CONNECTIONS,
       publicEndpoint = null,
-      messageId = null,
     } = options;
     // Data required to identify a message in a conversation
     const messageEventData = {
@@ -106,7 +105,6 @@ class LokiMessageAPI {
               timestamp: messageTimeStamp,
               from: displayName,
               source: this.ourKey,
-              id: messageId,
             },
           },
         ],

js/modules/loki_public_chat_api.js

@@ -161,14 +161,12 @@ class LokiPublicChannelAPI {
         let timestamp = new Date(adnMessage.created_at).getTime();
         let from = adnMessage.user.username;
         let source;
-        let id;
         if (adnMessage.annotations.length) {
           const noteValue = adnMessage.annotations[0].value;
-          ({ from, timestamp, source, id } = noteValue);
+          ({ from, timestamp, source } = noteValue);
         }
 
         const messageData = {
-          id,
           friendRequest: false,
           source,
           sourceDevice: 1,

libtextsecure/outgoing_message.js

@@ -50,12 +50,10 @@ function OutgoingMessage(
     messageType,
     isPing,
     publicEndpoint,
-    messageId,
   } =
     options || {};
   this.numberInfo = numberInfo;
   this.publicEndpoint = publicEndpoint;
-  this.messageId = messageId;
   this.senderCertificate = senderCertificate;
   this.online = online;
   this.messageType = messageType || 'outgoing';
@@ -205,7 +203,6 @@ OutgoingMessage.prototype = {
       };
       if (this.publicEndpoint) {
         options.publicEndpoint = this.publicEndpoint;
-        options.messageId = this.messageId;
       }
       await lokiMessageAPI.sendMessage(pubKey, data, timestamp, ttl, options);
     } catch (e) {