clean all updateConversation calls to convo.commit()

js/models/conversations.js

@@ -641,9 +641,7 @@
         this.set({ verified });
 
         // we don't await here because we don't need to wait for this to finish
-        window.Signal.Data.updateConversation(this.id, this.attributes, {
+        this.commit();
-          Conversation: Whisper.Conversation,
-        });
 
         return;
       }
@@ -706,9 +704,7 @@
       }
 
       this.set({ verified });
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
 
       // Three situations result in a verification notice in the conversation:
       //   1) The message came from an explicit verification in another client (not
@@ -813,16 +809,12 @@
           secondaryStatus: newStatus,
           primaryDevicePubKey,
         });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async updateGroupAdmins(groupAdmins) {
       this.set({ groupAdmins });
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
     },
     isUnverified() {
       if (this.isPrivate()) {
@@ -1307,9 +1299,7 @@
           timestamp: now,
           isArchived: false,
         });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
 
         // We're offline!
         if (!textsecure.messaging) {
@@ -1494,17 +1484,13 @@
       this.set(lastMessageUpdate);
 
       if (this.hasChanged()) {
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
 
     async setArchived(isArchived) {
       this.set({ isArchived });
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
     },
 
     async updateExpirationTimer(
@@ -1541,9 +1527,7 @@
       const timestamp = (receivedAt || Date.now()) - 1;
 
       this.set({ expireTimer });
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
 
       const message = this.messageCollection.add({
         // Even though this isn't reflected to the user, we want to place the last seen
@@ -1636,9 +1620,7 @@
       }
       if (this.get('sessionResetStatus') !== newStatus) {
         this.set({ sessionResetStatus: newStatus });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async onSessionResetInitiated() {
@@ -1917,9 +1899,7 @@
         this.set({ mentionedUs: false });
       }
 
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
 
       // If a message has errors, we don't want to send anything out about it.
       //   read syncs - let's wait for a client that really understands the message
@@ -1978,18 +1958,14 @@
       }
 
       this.set({ nickname: trimmed });
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
 
       await this.updateProfileName();
     },
     async setLokiProfile(newProfile) {
       if (!_.isEqual(this.get('profile'), newProfile)) {
         this.set({ profile: newProfile });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
 
       // if set to null, it will show a placeholder with color and first letter
@@ -2041,9 +2017,7 @@
           channelId: newChannelId,
           active_at: Date.now(),
         });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     getPublicSource() {
@@ -2080,9 +2054,7 @@
       }
       if (this.get('lastPublicMessage') !== newLastMessageId) {
         this.set({ lastPublicMessage: newLastMessageId });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     isModerator(pubKey) {
@@ -2099,9 +2071,7 @@
       // TODO: compare array properly
       if (!_.isEqual(this.get('moderators'), moderators)) {
         this.set({ moderators });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
 
@@ -2136,18 +2106,14 @@
       const profileName = this.get('profileName');
       if (profileName !== name) {
         this.set({ profileName: name });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async setGroupName(name) {
       const profileName = this.get('name');
       if (profileName !== name) {
         this.set({ name });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async setSubscriberCount(count) {
@@ -2166,18 +2132,14 @@
           this.set({ name });
         }
         // save
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async setProfileAvatar(avatar) {
       const profileAvatar = this.get('profileAvatar');
       if (profileAvatar !== avatar) {
         this.set({ profileAvatar: avatar });
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
     async setProfileKey(profileKey) {
@@ -2194,9 +2156,7 @@
 
         await this.deriveAccessKeyIfNeeded();
 
-        await window.Signal.Data.updateConversation(this.id, this.attributes, {
+        await this.commit();
-          Conversation: Whisper.Conversation,
-        });
       }
     },
 
@@ -2426,9 +2386,7 @@
         });
       }
 
-      await window.Signal.Data.updateConversation(this.id, this.attributes, {
+      await this.commit();
-        Conversation: Whisper.Conversation,
-      });
     },
 
     getName() {

js/modules/debug.js

@@ -50,11 +50,7 @@ exports.createConversation = async ({
     unread: numMessages,
   });
   const conversationId = conversation.get('id');
-  await Signal.Data.updateConversation(
+  await conversation.commit();
-    conversationId,
-    conversation.attributes,
-    { Conversation: Whisper.Conversation }
-  );
 
   await Promise.all(
     range(0, numMessages).map(async index => {

js/modules/loki_app_dot_net_api.js

@@ -1619,14 +1619,7 @@ class LokiPublicChannelAPI {
     if (data.counts && Number.isInteger(data.counts.subscribers)) {
       this.conversation.setSubscriberCount(data.counts.subscribers);
     }
-
+    await this.conversation.commit();
-    await window.Signal.Data.updateConversation(
-      this.conversation.id,
-      this.conversation.attributes,
-      {
-        Conversation: Whisper.Conversation,
-      }
-    );
   }
 
   // get moderation actions

ts/components/session/LeftPaneMessageSection.tsx

@@ -161,7 +161,6 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
 
     const length = conversations.length;
     const listKey = 0;
-
     // Note: conversations is not a known prop for List, but it is required to ensure that
     //   it re-renders when our conversation data changes. Otherwise it would just render
     //   on startup and scroll.

ts/receiver/errors.ts

@@ -16,9 +16,7 @@ async function onNoSession(ev: any) {
   if (!convo.get('sessionRestoreSeen')) {
     convo.set({ sessionRestoreSeen: true });
 
-    await window.Signal.Data.updateConversation(convo.id, convo.attributes, {
+    await convo.commit();
-      Conversation: Whisper.Conversation,
-    });
 
     await SessionProtocol.sendSessionRequestIfNeeded(new PubKey(pubkey));
   } else {
@@ -85,10 +83,7 @@ export async function onError(ev: any) {
     if (ev.confirm) {
       ev.confirm();
     }
-
+    await conversation.commit();
-    await window.Signal.Data.updateConversation(id, conversation.attributes, {
-      Conversation: Whisper.Conversation,
-    });
   }
 
   throw error;

ts/receiver/multidevice.ts

@@ -409,10 +409,7 @@ async function onContactReceived(details: any) {
       );
       conversation.set(newAttributes);
     }
-
+    await conversation.commit();
-    await window.Signal.Data.updateConversation(id, conversation.attributes, {
-      Conversation: Whisper.Conversation,
-    });
     const { expireTimer } = details;
     const isValidExpireTimer = typeof expireTimer === 'number';
     if (isValidExpireTimer) {

ts/state/selectors/conversations.ts

@@ -193,7 +193,6 @@ export const _getLeftPaneLists = (
   };
 
   const contacts: Array<ConversationType> = filterToPrimary(allContacts);
-
   return {
     conversations,
     archivedConversations,