Clean up chat folder records.

app/src/androidTest/java/org/thoughtcrime/securesms/database/ChatFolderTablesTest.kt

@@ -73,7 +73,6 @@ class ChatFolderTablesTest {
       showUnread = true,
       showMutedChats = true,
       showGroupChats = true,
-      isMuted = true,
       folderType = ChatFolderRecord.FolderType.GROUP
     )
 
@@ -96,7 +95,6 @@ class ChatFolderTablesTest {
     val updatedFolder = folder.copy(
       name = "updatedFolder2",
       position = 1,
-      isMuted = true,
       includedChats = listOf(aliceThread, charlieThread),
       excludedChats = listOf(bobThread)
     )

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFolder.kt

@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.components.settings.app.chats.folders
+
+import org.thoughtcrime.securesms.recipients.Recipient
+
+/**
+ * Information needed when creating/updating a chat folder. Used in [ChatFoldersSettingsState]
+ */
+data class ChatFolder(
+  val folderRecord: ChatFolderRecord = ChatFolderRecord(),
+  val includedRecipients: Set<Recipient> = emptySet(),
+  val excludedRecipients: Set<Recipient> = emptySet()
+)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFolderRecord.kt

@@ -1,9 +1,7 @@
 package org.thoughtcrime.securesms.components.settings.app.chats.folders
 
 import android.os.Parcelable
-import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
  * Represents an entry in the [org.thoughtcrime.securesms.database.ChatFolderTables].
@@ -15,17 +13,11 @@ data class ChatFolderRecord(
   val position: Int = -1,
   val includedChats: List<Long> = emptyList(),
   val excludedChats: List<Long> = emptyList(),
-  @IgnoredOnParcel
-  val includedRecipients: Set<Recipient> = emptySet(),
-  @IgnoredOnParcel
-  val excludedRecipients: Set<Recipient> = emptySet(),
   val showUnread: Boolean = false,
   val showMutedChats: Boolean = true,
   val showIndividualChats: Boolean = false,
   val showGroupChats: Boolean = false,
-  val isMuted: Boolean = false,
+  val folderType: FolderType = FolderType.CUSTOM
-  val folderType: FolderType = FolderType.CUSTOM,
-  val unreadCount: Int = 0
 ) : Parcelable {
   enum class FolderType(val value: Int) {
     /** Folder containing all chats */

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersFragment.kt

@@ -404,7 +404,6 @@ private fun ChatFolderPreview() {
       showIndividualChats = true,
       showGroupChats = true,
       showMutedChats = true,
-      isMuted = false,
       folderType = ChatFolderRecord.FolderType.CUSTOM
     ),
     ChatFolderRecord(
@@ -415,7 +414,6 @@ private fun ChatFolderPreview() {
       showIndividualChats = true,
       showGroupChats = false,
       showMutedChats = false,
-      isMuted = false,
       folderType = ChatFolderRecord.FolderType.CUSTOM
     )
   )

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersRepository.kt

@@ -1,19 +1,24 @@
 package org.thoughtcrime.securesms.components.settings.app.chats.folders
 
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
  * Repository for chat folders that handles creation, deletion, listing, etc.,
  */
 object ChatFoldersRepository {
 
-  fun getCurrentFolders(includeUnreadAndMutedCounts: Boolean = false): List<ChatFolderRecord> {
+  fun getCurrentFolders(): List<ChatFolderRecord> {
-    return SignalDatabase.chatFolders.getChatFolders(includeUnreadAndMutedCounts)
+    return SignalDatabase.chatFolders.getChatFolders()
   }
 
-  fun createFolder(folder: ChatFolderRecord) {
+  fun getUnreadCountAndMutedStatusForFolders(folders: List<ChatFolderRecord>): HashMap<Long, Pair<Int, Boolean>> {
-    val includedChats = folder.includedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
+    return SignalDatabase.chatFolders.getUnreadCountAndMutedStatusForFolders(folders)
-    val excludedChats = folder.excludedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
+  }
+
+  fun createFolder(folder: ChatFolderRecord, includedRecipients: Set<Recipient>, excludedRecipients: Set<Recipient>) {
+    val includedChats = includedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
+    val excludedChats = excludedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
     val updatedFolder = folder.copy(
       includedChats = includedChats,
       excludedChats = excludedChats
@@ -22,9 +27,9 @@ object ChatFoldersRepository {
     SignalDatabase.chatFolders.createFolder(updatedFolder)
   }
 
-  fun updateFolder(folder: ChatFolderRecord) {
+  fun updateFolder(folder: ChatFolderRecord, includedRecipients: Set<Recipient>, excludedRecipients: Set<Recipient>) {
-    val includedChats = folder.includedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
+    val includedChats = includedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
-    val excludedChats = folder.excludedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
+    val excludedChats = excludedRecipients.map { recipient -> SignalDatabase.threads.getOrCreateThreadIdFor(recipient) }
     val updatedFolder = folder.copy(
       includedChats = includedChats,
       excludedChats = excludedChats

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersSettingsState.kt

@@ -9,8 +9,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 data class ChatFoldersSettingsState(
   val folders: List<ChatFolderRecord> = emptyList(),
   val suggestedFolders: List<ChatFolderRecord> = emptyList(),
-  val originalFolder: ChatFolderRecord = ChatFolderRecord(),
+  val originalFolder: ChatFolder = ChatFolder(),
-  val currentFolder: ChatFolderRecord = ChatFolderRecord(),
+  val currentFolder: ChatFolder = ChatFolder(),
   val showDeleteDialog: Boolean = false,
   val showConfirmationDialog: Boolean = false,
   val pendingIncludedRecipients: Set<RecipientId> = emptySet(),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/ChatFoldersViewModel.kt

@@ -24,15 +24,15 @@ class ChatFoldersViewModel : ViewModel() {
 
   fun loadCurrentFolders(context: Context) {
     viewModelScope.launch(Dispatchers.IO) {
-      val folders = ChatFoldersRepository.getCurrentFolders(includeUnreadAndMutedCounts = false)
+      val folders = ChatFoldersRepository.getCurrentFolders()
       val suggestedFolders = getSuggestedFolders(context, folders)
 
       internalState.update {
         it.copy(
           folders = folders,
           suggestedFolders = suggestedFolders,
-          currentFolder = ChatFolderRecord(),
+          currentFolder = ChatFolder(),
-          originalFolder = ChatFolderRecord()
+          originalFolder = ChatFolder()
         )
       }
     }
@@ -100,7 +100,8 @@ class ChatFoldersViewModel : ViewModel() {
         SignalDatabase.threads.getRecipientForThreadId(threadId)
       }
 
-      val updatedFolder = folder.copy(
+      val updatedFolder = ChatFolder(
+        folderRecord = folder,
         includedRecipients = includedRecipients.toSet(),
         excludedRecipients = excludedRecipients.toSet()
       )
@@ -112,32 +113,32 @@ class ChatFoldersViewModel : ViewModel() {
   }
 
   fun updateName(name: String) {
-    val updatedFolder = internalState.value.currentFolder.copy(
+    val updatedFolder = internalState.value.currentFolder.folderRecord.copy(
       name = name.substring(0, minOf(name.length, 32))
     )
 
     internalState.update {
-      it.copy(currentFolder = updatedFolder)
+      it.copy(currentFolder = it.currentFolder.copy(folderRecord = updatedFolder))
     }
   }
 
   fun toggleShowUnread(showUnread: Boolean) {
-    val updatedFolder = internalState.value.currentFolder.copy(
+    val updatedFolder = internalState.value.currentFolder.folderRecord.copy(
       showUnread = showUnread
     )
 
     internalState.update {
-      it.copy(currentFolder = updatedFolder)
+      it.copy(currentFolder = it.currentFolder.copy(folderRecord = updatedFolder))
     }
   }
 
   fun toggleShowMutedChats(showMuted: Boolean) {
-    val updatedFolder = internalState.value.currentFolder.copy(
+    val updatedFolder = internalState.value.currentFolder.folderRecord.copy(
       showMutedChats = showMuted
     )
 
     internalState.update {
-      it.copy(currentFolder = updatedFolder)
+      it.copy(currentFolder = it.currentFolder.copy(folderRecord = updatedFolder))
     }
   }
 
@@ -149,7 +150,7 @@ class ChatFoldersViewModel : ViewModel() {
 
   fun deleteFolder(context: Context) {
     viewModelScope.launch(Dispatchers.IO) {
-      ChatFoldersRepository.deleteFolder(internalState.value.originalFolder)
+      ChatFoldersRepository.deleteFolder(internalState.value.originalFolder.folderRecord)
 
       loadCurrentFolders(context)
       internalState.update {
@@ -166,8 +167,8 @@ class ChatFoldersViewModel : ViewModel() {
 
   fun createFolder(context: Context, folder: ChatFolderRecord? = null) {
     viewModelScope.launch(Dispatchers.IO) {
-      val currentFolder = folder ?: internalState.value.currentFolder
+      val currentFolder = if (folder != null) ChatFolder(folder) else internalState.value.currentFolder
-      ChatFoldersRepository.createFolder(currentFolder)
+      ChatFoldersRepository.createFolder(currentFolder.folderRecord, currentFolder.includedRecipients, currentFolder.excludedRecipients)
       loadCurrentFolders(context)
 
       internalState.update {
@@ -192,7 +193,8 @@ class ChatFoldersViewModel : ViewModel() {
 
   fun updateFolder(context: Context) {
     viewModelScope.launch(Dispatchers.IO) {
-      ChatFoldersRepository.updateFolder(internalState.value.currentFolder)
+      val currentFolder = internalState.value.currentFolder
+      ChatFoldersRepository.updateFolder(currentFolder.folderRecord, currentFolder.includedRecipients, currentFolder.excludedRecipients)
       loadCurrentFolders(context)
 
       internalState.update {
@@ -208,10 +210,10 @@ class ChatFoldersViewModel : ViewModel() {
       val excludedChats = currentFolder.excludedRecipients.map { recipient -> recipient.id }.toMutableSet()
 
       val chatTypes: MutableSet<ChatType> = mutableSetOf()
-      if (currentFolder.showIndividualChats) {
+      if (currentFolder.folderRecord.showIndividualChats) {
         chatTypes.add(ChatType.INDIVIDUAL)
       }
-      if (currentFolder.showGroupChats) {
+      if (currentFolder.folderRecord.showGroupChats) {
         chatTypes.add(ChatType.GROUPS)
       }
 
@@ -309,11 +311,13 @@ class ChatFoldersViewModel : ViewModel() {
       internalState.update {
         it.copy(
           currentFolder = updatedFolder.copy(
-            includedRecipients = includedRecipients,
+            folderRecord = updatedFolder.folderRecord.copy(
-            excludedRecipients = excludedRecipients,
               showIndividualChats = showIndividualChats,
               showGroupChats = showGroupChats
             ),
+            includedRecipients = includedRecipients,
+            excludedRecipients = excludedRecipients
+          ),
           pendingIncludedRecipients = emptySet(),
           pendingExcludedRecipients = emptySet()
         )
@@ -331,8 +335,8 @@ class ChatFoldersViewModel : ViewModel() {
     val currentFolder = state.value.currentFolder
     val originalFolder = state.value.originalFolder
 
-    return if (currentFolder.id == -1L) {
+    return if (currentFolder.folderRecord.id == -1L) {
-      currentFolder.includedRecipients.isNotEmpty() || currentFolder.showIndividualChats || currentFolder.showGroupChats
+      currentFolder.includedRecipients.isNotEmpty() || currentFolder.folderRecord.showIndividualChats || currentFolder.folderRecord.showGroupChats
     } else {
       originalFolder != currentFolder ||
         originalFolder.includedRecipients != currentFolder.includedRecipients ||
@@ -350,6 +354,6 @@ class ChatFoldersViewModel : ViewModel() {
   }
 
   fun hasEmptyName(): Boolean {
-    return state.value.currentFolder.name.isEmpty()
+    return state.value.currentFolder.folderRecord.name.isEmpty()
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/folders/CreateFoldersFragment.kt

@@ -94,7 +94,7 @@ class CreateFoldersFragment : ComposeFragment() {
     val state by viewModel.state.collectAsStateWithLifecycle()
     val navController: NavController by remember { mutableStateOf(findNavController()) }
     val focusRequester = remember { FocusRequester() }
-    val isNewFolder = state.originalFolder.id == -1L
+    val isNewFolder = state.originalFolder.folderRecord.id == -1L
 
     LaunchedEffect(Unit) {
       if (state.originalFolder == state.currentFolder) {
@@ -221,7 +221,7 @@ fun CreateFolderScreen(
     LazyColumn {
       item {
         TextField(
-          value = state.currentFolder.name,
+          value = state.currentFolder.folderRecord.name,
           label = { Text(text = stringResource(id = R.string.CreateFoldersFragment__folder_name)) },
           onValueChange = onNameChange,
           keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.Sentences),
@@ -245,7 +245,7 @@ fun CreateFolderScreen(
           onClick = onAddChat
         )
 
-        if (state.currentFolder.showIndividualChats) {
+        if (state.currentFolder.folderRecord.showIndividualChats) {
           FolderRow(
             icon = R.drawable.symbol_person_light_24,
             title = stringResource(R.string.ChatFoldersFragment__one_on_one_chats),
@@ -253,7 +253,7 @@ fun CreateFolderScreen(
           )
         }
 
-        if (state.currentFolder.showGroupChats) {
+        if (state.currentFolder.folderRecord.showGroupChats) {
           FolderRow(
             icon = R.drawable.symbol_group_light_20,
             title = stringResource(R.string.ChatFoldersFragment__groups),
@@ -366,12 +366,12 @@ fun CreateFolderScreen(
 
     Buttons.MediumTonal(
       colors = ButtonDefaults.filledTonalButtonColors(
-        contentColor = if (state.currentFolder.name.isEmpty()) {
+        contentColor = if (state.currentFolder.folderRecord.name.isEmpty()) {
           MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
         } else {
           MaterialTheme.colorScheme.onSurface
         },
-        containerColor = if (state.currentFolder.name.isEmpty()) {
+        containerColor = if (state.currentFolder.folderRecord.name.isEmpty()) {
           MaterialTheme.colorScheme.surfaceVariant
         } else {
           MaterialTheme.colorScheme.primaryContainer
@@ -380,7 +380,7 @@ fun CreateFolderScreen(
       ),
       enabled = hasChanges,
       onClick = {
-        if (state.currentFolder.name.isEmpty()) {
+        if (state.currentFolder.folderRecord.name.isEmpty()) {
           onShowToast()
         } else {
           onCreateConfirmed()
@@ -419,7 +419,7 @@ private fun ShowUnreadSection(state: ChatFoldersSettingsState, onToggleShowUnrea
       )
     }
     Switch(
-      checked = state.currentFolder.showUnread,
+      checked = state.currentFolder.folderRecord.showUnread,
       onCheckedChange = onToggleShowUnread
     )
   }
@@ -440,7 +440,7 @@ private fun ShowMutedSection(state: ChatFoldersSettingsState, onToggleShowMuted:
       )
     }
     Switch(
-      checked = state.currentFolder.showMutedChats,
+      checked = state.currentFolder.folderRecord.showMutedChats,
       onCheckedChange = onToggleShowMuted
     )
   }
@@ -449,7 +449,7 @@ private fun ShowMutedSection(state: ChatFoldersSettingsState, onToggleShowMuted:
 @SignalPreview
 @Composable
 private fun CreateFolderPreview() {
-  val previewFolder = ChatFolderRecord(id = 1, name = "WIP")
+  val previewFolder = ChatFolder(ChatFolderRecord(id = 1, name = "WIP"))
 
   Previews.Preview {
     CreateFolderScreen(
@@ -463,7 +463,7 @@ private fun CreateFolderPreview() {
 @SignalPreview
 @Composable
 private fun EditFolderPreview() {
-  val previewFolder = ChatFolderRecord(id = 1, name = "Work")
+  val previewFolder = ChatFolder(ChatFolderRecord(id = 1, name = "Work"))
 
   Previews.Preview {
     CreateFolderScreen(

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderAdapter.kt

@@ -32,8 +32,8 @@ class ChatFolderAdapter(val callbacks: Callbacks) : MappingAdapter() {
 
       val folder = model.chatFolder
       name.text = getName(itemView.context, folder)
-      unreadCount.visible = folder.unreadCount > 0
+      unreadCount.visible = model.unreadCount > 0
-      unreadCount.text = if (folder.unreadCount > 99) itemView.context.getString(R.string.ChatFolderAdapter__99p) else folder.unreadCount.toString()
+      unreadCount.text = if (model.unreadCount > 99) itemView.context.getString(R.string.ChatFolderAdapter__99p) else model.unreadCount.toString()
       itemView.setOnClickListener {
         callbacks.onChatFolderClicked(model.chatFolder)
       }
@@ -42,8 +42,8 @@ class ChatFolderAdapter(val callbacks: Callbacks) : MappingAdapter() {
           context = itemView.context,
           anchorView = view,
           folderType = model.chatFolder.folderType,
-          unreadCount = folder.unreadCount,
+          unreadCount = model.unreadCount,
-          isMuted = folder.isMuted,
+          isMuted = model.isMuted,
           onEdit = { callbacks.onEdit(model.chatFolder) },
           onMuteAll = { callbacks.onMuteAll(model.chatFolder) },
           onUnmuteAll = { callbacks.onUnmuteAll(model.chatFolder) },

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ChatFolderMappingModel.kt

@@ -3,8 +3,13 @@ package org.thoughtcrime.securesms.conversationlist
 import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFolderRecord
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
 
+/**
+ * Mapping model of folders used in [ChatFolderAdapter]
+ */
 data class ChatFolderMappingModel(
   val chatFolder: ChatFolderRecord,
+  val unreadCount: Int,
+  val isMuted: Boolean,
   val isSelected: Boolean
 ) : MappingModel<ChatFolderMappingModel> {
   override fun areItemsTheSame(newItem: ChatFolderMappingModel): Boolean {
@@ -12,6 +17,9 @@ data class ChatFolderMappingModel(
   }
 
   override fun areContentsTheSame(newItem: ChatFolderMappingModel): Boolean {
-    return chatFolder == newItem.chatFolder && isSelected == newItem.isSelected
+    return chatFolder == newItem.chatFolder &&
+      unreadCount == newItem.unreadCount &&
+      isMuted == newItem.isMuted &&
+      isSelected == newItem.isSelected
   }
 }

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt

@@ -218,7 +218,8 @@ class ConversationListViewModel(
 
   private fun loadCurrentFolders() {
     viewModelScope.launch(Dispatchers.IO) {
-      val folders = ChatFoldersRepository.getCurrentFolders(includeUnreadAndMutedCounts = true)
+      val folders = ChatFoldersRepository.getCurrentFolders()
+      val unreadCountAndMutedStatus = ChatFoldersRepository.getUnreadCountAndMutedStatusForFolders(folders)
 
       val selectedFolderId = if (currentFolder.id == -1L) {
         folders.firstOrNull()?.id
@@ -226,7 +227,12 @@ class ConversationListViewModel(
         currentFolder.id
       }
       val chatFolders = folders.map { folder ->
-        ChatFolderMappingModel(folder, selectedFolderId == folder.id)
+        ChatFolderMappingModel(
+          chatFolder = folder,
+          unreadCount = unreadCountAndMutedStatus[folder.id]?.first ?: 0,
+          isMuted = unreadCountAndMutedStatus[folder.id]?.second ?: false,
+          isSelected = selectedFolderId == folder.id
+        )
       }
 
       store.update {

app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt

@@ -140,7 +140,6 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
           showMutedChats = cursor.requireBoolean(ChatFolderTable.SHOW_MUTED),
           showIndividualChats = cursor.requireBoolean(ChatFolderTable.SHOW_INDIVIDUAL),
           showGroupChats = cursor.requireBoolean(ChatFolderTable.SHOW_GROUPS),
-          isMuted = cursor.requireBoolean(ChatFolderTable.IS_MUTED),
           folderType = ChatFolderRecord.FolderType.deserialize(cursor.requireInt(ChatFolderTable.FOLDER_TYPE)),
           includedChats = includedChats[id] ?: emptyList(),
           excludedChats = excludedChats[id] ?: emptyList()
@@ -153,7 +152,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
   /**
    * Maps the chat folder ids to its corresponding chat folder
    */
-  fun getChatFolders(includeUnreadAndMutedCount: Boolean = false): List<ChatFolderRecord> {
+  fun getChatFolders(): List<ChatFolderRecord> {
     val includedChats: Map<Long, List<Long>> = getIncludedChats()
     val excludedChats: Map<Long, List<Long>> = getExcludedChats()
 
@@ -172,23 +171,26 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
           showMutedChats = cursor.requireBoolean(ChatFolderTable.SHOW_MUTED),
           showIndividualChats = cursor.requireBoolean(ChatFolderTable.SHOW_INDIVIDUAL),
           showGroupChats = cursor.requireBoolean(ChatFolderTable.SHOW_GROUPS),
-          isMuted = cursor.requireBoolean(ChatFolderTable.IS_MUTED),
           folderType = ChatFolderRecord.FolderType.deserialize(cursor.requireInt(ChatFolderTable.FOLDER_TYPE)),
           includedChats = includedChats[id] ?: emptyList(),
           excludedChats = excludedChats[id] ?: emptyList()
         )
       }
 
-    if (includeUnreadAndMutedCount) {
+    return folders
-      return folders.map { folder ->
-        folder.copy(
-          unreadCount = SignalDatabase.threads.getUnreadCountByChatFolder(folder),
-          isMuted = !SignalDatabase.threads.hasUnmutedChatsInFolder(folder)
-        )
-      }
   }
 
-    return folders
+  /**
+   * Given a list of folders, maps a folder id to the folder's unread count and whether all the chats in the folder are muted
+   */
+  fun getUnreadCountAndMutedStatusForFolders(folders: List<ChatFolderRecord>): HashMap<Long, Pair<Int, Boolean>> {
+    val map: HashMap<Long, Pair<Int, Boolean>> = hashMapOf()
+    folders.map { folder ->
+      val unreadCount = SignalDatabase.threads.getUnreadCountByChatFolder(folder)
+      val isMuted = !SignalDatabase.threads.hasUnmutedChatsInFolder(folder)
+      map[folder.id] = Pair(unreadCount, isMuted)
+    }
+    return map
   }
 
   /**
@@ -263,7 +265,6 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
             ChatFolderTable.SHOW_MUTED to chatFolder.showMutedChats,
             ChatFolderTable.SHOW_INDIVIDUAL to chatFolder.showIndividualChats,
             ChatFolderTable.SHOW_GROUPS to chatFolder.showGroupChats,
-            ChatFolderTable.IS_MUTED to chatFolder.isMuted,
             ChatFolderTable.POSITION to position
           )
         )
@@ -304,8 +305,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
           ChatFolderTable.SHOW_UNREAD to chatFolder.showUnread,
           ChatFolderTable.SHOW_MUTED to chatFolder.showMutedChats,
           ChatFolderTable.SHOW_INDIVIDUAL to chatFolder.showIndividualChats,
-          ChatFolderTable.SHOW_GROUPS to chatFolder.showGroupChats,
+          ChatFolderTable.SHOW_GROUPS to chatFolder.showGroupChats
-          ChatFolderTable.IS_MUTED to chatFolder.isMuted
         )
         .where("${ChatFolderTable.ID} = ?", chatFolder.id)
         .run(SQLiteDatabase.CONFLICT_IGNORE)

app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.kt

@@ -291,15 +291,11 @@ class UnarchivedConversationListDataSourceTest {
       position = -1,
       includedChats = emptyList(),
       excludedChats = emptyList(),
-      includedRecipients = emptySet(),
-      excludedRecipients = emptySet(),
       showUnread = false,
       showMutedChats = false,
       showIndividualChats = false,
       showGroupChats = false,
-      isMuted = false,
+      folderType = ChatFolderRecord.FolderType.ALL
-      folderType = ChatFolderRecord.FolderType.ALL,
-      unreadCount = 0
     )
   }
 }