Filtering out hidden chatrooms.

Adamant-im · Jun 28, 2018 · d0b66dd · d0b66dd
1 parent 011737a
commit d0b66dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Adamant/Services/DataProviders/AdamantChatsProvider.swift b/Adamant/Services/DataProviders/AdamantChatsProvider.swift
@@ -553,7 +553,9 @@ extension AdamantChatsProvider {
 		let request: NSFetchRequest<Chatroom> = NSFetchRequest(entityName: Chatroom.entityName)
 		request.sortDescriptors = [NSSortDescriptor(key: "updatedAt", ascending: false),
 								   NSSortDescriptor(key: "title", ascending: true)]
-		request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [NSPredicate(format: "partner!=nil"), NSPredicate(format: "isHidden = false")])
+		request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [
+			NSPredicate(format: "partner!=nil"),
+			NSPredicate(format: "isHidden = false")])
 		let controller = NSFetchedResultsController(fetchRequest: request, managedObjectContext: stack.container.viewContext, sectionNameKeyPath: nil, cacheName: nil)
 
 		return controller
@@ -575,7 +577,10 @@ extension AdamantChatsProvider {
 
 	func getUnreadMessagesController() -> NSFetchedResultsController<ChatTransaction> {
 		let request = NSFetchRequest<ChatTransaction>(entityName: "ChatTransaction")
-		request.predicate = NSPredicate(format: "isUnread == true")
+		request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [
+			NSPredicate(format: "isUnread == true"),
+			NSPredicate(format: "chatroom.isHidden == false")])
+
 		request.sortDescriptors = [NSSortDescriptor.init(key: "date", ascending: false),
 								   NSSortDescriptor(key: "transactionId", ascending: false)]
 

diff --git a/Adamant/Stories/Chats/ChatListViewController.swift b/Adamant/Stories/Chats/ChatListViewController.swift
@@ -417,7 +417,7 @@ extension ChatListViewController {
 	private func showNotification(for transaction: ChatTransaction) {
 		// MARK: 1. Show notification only for incomming transactions
 		guard !transaction.silentNotification, !transaction.isOutgoing,
-			let chatroom = transaction.chatroom, chatroom != presentedChatroom(),
+			let chatroom = transaction.chatroom, chatroom != presentedChatroom(), !chatroom.isHidden,
 			let partner = chatroom.partner else {
 			return
 		}