Review changes

app/sql.js

@@ -1137,7 +1137,6 @@ async function saveMessage(data, { forceSave } = {}) {
     // eslint-disable-next-line camelcase
     received_at,
     schemaVersion,
-    // eslint-disable-next-line camelcase
     sent,
     // eslint-disable-next-line camelcase
     sent_at,

js/models/conversations.js

@@ -743,7 +743,7 @@
         const requests = await this.getPendingFriendRequests('incoming');
 
         // Delete the old message if it's pending
-        await Promise.all(requests.map(async request => this._removeMessage(request.id)));
+        await Promise.all(requests.map(request => this._removeMessage(request.id)));
         // Trigger an update if we removed messages
         if (requests.length > 0)
           this.trigger('change');
@@ -1038,7 +1038,7 @@
             // and send the new request if possible
             let friendRequestSent = false;
             const promises = [];
-            outgoingRequests.forEach(async outgoing => {
+            outgoingRequests.forEach(outgoing => {
               if (outgoing.hasErrors()) {
                 promises.push(this._removeMessage(outgoing.id));
               } else {
@@ -2110,9 +2110,10 @@
     // Notification for friend request received
     async notifyFriendRequest(source, type) {
       // Data validation
-      if (!source) return Promise.reject(new Error('Invalid source'));
+      if (!source)
+        throw new Error('Invalid source');
       if (!['accepted', 'requested'].includes(type))
-        return Promise.reject(new Error('Type must be accepted or requested.'));
+        throw new Error('Type must be accepted or requested.');
 
       // Call the notification on the right conversation
       let conversation = this;
@@ -2125,7 +2126,7 @@
           window.log.info(`Notify called on a different conversation.
                            Expected: ${this.id}. Actual: ${conversation.id}`);
         } catch (e) {
-          return Promise.reject(new Error('Failed to fetch conversation'));
+          throw new Error('Failed to fetch conversation.');
         }
       }
 
@@ -2149,7 +2150,6 @@
         messageSentAt: Date.now(),
         title: i18n(title),
       });
-      return Promise.resolve();
     },
   });
 

libtextsecure/message_receiver.js

@@ -254,27 +254,26 @@ MessageReceiver.prototype.extend({
       this.calledClose
     );
     // TODO: handle properly
-    return Promise.resolve();
+    // this.shutdown();
-    this.shutdown();
+
-
+    // if (this.calledClose) {
-    if (this.calledClose) {
+    //   return Promise.resolve();
-      return Promise.resolve();
+    // }
-    }
+    // if (ev.code === 3000) {
-    if (ev.code === 3000) {
+    //   return Promise.resolve();
-      return Promise.resolve();
+    // }
-    }
+    // if (ev.code === 3001) {
-    if (ev.code === 3001) {
+    //   this.onEmpty();
-      this.onEmpty();
+    // }
-    }
+    // // possible 403 or network issue. Make an request to confirm
-    // possible 403 or network issue. Make an request to confirm
+    // return this.server
-    return this.server
+    //   .getDevices(this.number)
-      .getDevices(this.number)
+    //   .then(this.connect.bind(this)) // No HTTP error? Reconnect
-      .then(this.connect.bind(this)) // No HTTP error? Reconnect
+    //   .catch(e => {
-      .catch(e => {
+    //     const event = new Event('error');
-        const event = new Event('error');
+    //     event.error = e;
-        event.error = e;
+    //     return this.dispatchAndWait(event);
-        return this.dispatchAndWait(event);
+    //   });
-      });
   },
   handleRequest(request) {
     this.incoming = this.incoming || [];
@@ -1047,7 +1046,7 @@ MessageReceiver.prototype.extend({
       }
 
       // Exit early since the friend request reply will be a regular empty message
-      return Promise.resolve();
+      return null;
     }
 
     if (content.syncMessage) {