Clean up old messages, better handle errors from sending

js/background.js

@@ -346,6 +346,49 @@
       });
     }
 
+    Views.Initialization.setMessage(window.i18n('optimizingApplication'));
+
+    window.log.info('Cleanup: starting...');
+    const messagesForCleanup = await window.Signal.Data.getOutgoingWithoutExpiresAt(
+      {
+        MessageCollection: Whisper.MessageCollection,
+      }
+    );
+    window.log.info(
+      `Cleanup: Found ${messagesForCleanup.length} messages for cleanup`
+    );
+    await Promise.all(
+      messagesForCleanup.map(async message => {
+        const delivered = message.get('delivered');
+        const sentAt = message.get('sent_at');
+        const expirationStartTimestamp = message.get(
+          'expirationStartTimestamp'
+        );
+
+        if (message.hasErrors()) {
+          return;
+        }
+
+        if (delivered) {
+          window.log.info(
+            `Cleanup: Starting timer for delivered message ${sentAt}`
+          );
+          message.set(
+            'expirationStartTimestamp',
+            expirationStartTimestamp || sentAt
+          );
+          await message.setToExpire();
+          return;
+        }
+
+        window.log.info(`Cleanup: Deleting unsent message ${sentAt}`);
+        await window.Signal.Data.removeMessage(message.id, {
+          Message: Whisper.Message,
+        });
+      })
+    );
+    window.log.info('Cleanup: complete');
+
     Views.Initialization.setMessage(window.i18n('loading'));
 
     // Note: We are not invoking the second set of IndexedDB migrations because it is

js/delivery_receipts.js

@@ -73,15 +73,25 @@
 
         const deliveries = message.get('delivered') || 0;
         const deliveredTo = message.get('delivered_to') || [];
-
+        const expirationStartTimestamp = message.get(
+          'expirationStartTimestamp'
+        );
         message.set({
           delivered_to: _.union(deliveredTo, [receipt.get('source')]),
           delivered: deliveries + 1,
+          expirationStartTimestamp: expirationStartTimestamp || Date.now(),
+          sent: true,
         });
 
-        await window.Signal.Data.saveMessage(message.attributes, {
-          Message: Whisper.Message,
-        });
+        if (message.isExpiring() && !expirationStartTimestamp) {
+          // This will save the message for us while starting the timer
+          await message.setToExpire();
+        } else {
+          await window.Signal.Data.saveMessage(message.attributes, {
+            Message: Whisper.Message,
+          });
+        }
+
         // notify frontend listeners
         const conversation = ConversationController.get(
           message.get('conversationId')
@@ -91,9 +101,6 @@
         }
 
         this.remove(receipt);
-
-        // TODO: consider keeping a list of numbers we've
-        // successfully delivered to?
       } catch (error) {
         window.log.error(
           'DeliveryReceipts.onReceipt error:',

js/expiring_messages.js

@@ -12,6 +12,7 @@
 
   async function destroyExpiredMessages() {
     try {
+      window.log.info('destroyExpiredMessages: Loading messages...');
       const messages = await window.Signal.Data.getExpiredMessages({
         MessageCollection: Whisper.MessageCollection,
       });
@@ -41,6 +42,7 @@
       );
     }
 
+    window.log.info('destroyExpiredMessages: complete');
     checkExpiringMessages();
   }
 

js/models/conversations.js

@@ -797,6 +797,18 @@
         });
         message.set({ id });
 
+        // We're offline!
+        if (!textsecure.messaging) {
+          const errors = this.contactCollection.map(contact => {
+            const error = new Error('Network is not available');
+            error.name = 'SendMessageNetworkError';
+            error.number = contact.id;
+            return error;
+          });
+          await message.saveErrors(errors);
+          return;
+        }
+
         const conversationType = this.get('type');
         const sendFunction = (() => {
           switch (conversationType) {

js/models/messages.js

@@ -36,15 +36,23 @@
       return window.AccountJobs[number];
     }
 
-    // eslint-disable-next-line more/no-then
-    const job = textsecure.messaging
-      .getProfile(number)
-      .then(() => {
-        window.AccountCache[number] = true;
-      })
-      .catch(() => {
+    let job;
+    if (textsecure.messaging) {
+      // eslint-disable-next-line more/no-then
+      job = textsecure.messaging
+        .getProfile(number)
+        .then(() => {
+          window.AccountCache[number] = true;
+        })
+        .catch(() => {
+          window.AccountCache[number] = false;
+        });
+    } else {
+      // We're offline!
+      job = Promise.resolve().then(() => {
         window.AccountCache[number] = false;
       });
+    }
 
     window.AccountJobs[number] = job;
 
@@ -661,6 +669,11 @@
 
     // One caller today: event handler for the 'Retry Send' entry in triple-dot menu
     async retrySend() {
+      if (!textsecure.messaging) {
+        window.log.error('retrySend: Cannot retry since we are offline!');
+        return null;
+      }
+
       const [retries, errors] = _.partition(
         this.get('errors'),
         this.isReplayableError.bind(this)
@@ -1140,7 +1153,10 @@
               // This is primarily to allow the conversation to mark all older
               // messages as read, as is done when we receive a read sync for
               // a message we already know about.
-              Whisper.ReadSyncs.notifyConversation(message);
+              const c = message.getConversation();
+              if (c) {
+                c.onReadMessage(message);
+              }
             } else {
               conversation.set(
                 'unreadCount',

js/modules/data.js

@@ -49,6 +49,7 @@ module.exports = {
   getAllMessageIds,
   getMessagesBySentAt,
   getExpiredMessages,
+  getOutgoingWithoutExpiresAt,
   getNextExpiringMessage,
   getMessagesByConversation,
 
@@ -319,11 +320,15 @@ async function getMessagesBySentAt(sentAt, { MessageCollection }) {
 }
 
 async function getExpiredMessages({ MessageCollection }) {
-  window.log.info('Load expired messages');
   const messages = await channels.getExpiredMessages();
   return new MessageCollection(messages);
 }
 
+async function getOutgoingWithoutExpiresAt({ MessageCollection }) {
+  const messages = await channels.getOutgoingWithoutExpiresAt();
+  return new MessageCollection(messages);
+}
+
 async function getNextExpiringMessage({ MessageCollection }) {
   const messages = await channels.getNextExpiringMessage();
   return new MessageCollection(messages);

js/read_receipts.js

@@ -74,14 +74,26 @@
         }
 
         const readBy = message.get('read_by') || [];
+        const expirationStartTimestamp = message.get(
+          'expirationStartTimestamp'
+        );
+
         readBy.push(receipt.get('reader'));
-
-        message.set({ read_by: readBy });
-
-        await window.Signal.Data.saveMessage(message.attributes, {
-          Message: Whisper.Message,
+        message.set({
+          read_by: readBy,
+          expirationStartTimestamp: expirationStartTimestamp || Date.now(),
+          sent: true,
         });
 
+        if (message.isExpiring() && !expirationStartTimestamp) {
+          // This will save the message for us while starting the timer
+          await message.setToExpire();
+        } else {
+          await window.Signal.Data.saveMessage(message.attributes, {
+            Message: Whisper.Message,
+          });
+        }
+
         // notify frontend listeners
         const conversation = ConversationController.get(
           message.get('conversationId')