Merge pull request #531 from sachaaaaa/remove_all_private_conv

[multi-device] Remove private convs only

app/sql.js

@@ -116,6 +116,7 @@ module.exports = {
   getAllPrivateConversations,
   getAllGroupsInvolvingId,
   removeAllConversations,
+  removeAllPrivateConversations,
 
   searchConversations,
   searchMessages,
@@ -2665,6 +2666,10 @@ async function removeAllConversations() {
   await removeAllFromTable(CONVERSATIONS_TABLE);
 }
 
+async function removeAllPrivateConversations() {
+  await db.run(`DELETE FROM ${CONVERSATIONS_TABLE} WHERE type = 'private'`);
+}
+
 async function getMessagesNeedingUpgrade(limit, { maxVersion }) {
   const rows = await db.all(
     `SELECT json FROM messages

js/modules/data.js

@@ -189,6 +189,7 @@ module.exports = {
   removeAll,
   removeAllConfiguration,
   removeAllConversations,
+  removeAllPrivateConversations,
 
   removeOtherData,
   cleanupOrphanedAttachments,
@@ -1190,6 +1191,10 @@ async function removeAllConversations() {
   await channels.removeAllConversations();
 }
 
+async function removeAllPrivateConversations() {
+  await channels.removeAllPrivateConversations();
+}
+
 async function cleanupOrphanedAttachments() {
   await callChannel(CLEANUP_ORPHANED_ATTACHMENTS_KEY);
 }

js/views/standalone_registration_view.js

@@ -145,7 +145,7 @@
     },
     async resetRegistration() {
       await window.Signal.Data.removeAllIdentityKeys();
-      await window.Signal.Data.removeAllConversations();
+      await window.Signal.Data.removeAllPrivateConversations();
       Whisper.Registration.remove();
       // Do not remove all items since they are only set
       // at startup.