From 9f992e28597b9948ac0350f9ebdb8ff04a23640b Mon Sep 17 00:00:00 2001 From: JanNiklas Grabowski Date: Fri, 20 Oct 2023 15:23:40 +0200 Subject: [PATCH] MESSENGER-5240 fix crash set personal notes room as favorite --- .../PersonalNotesDefaultService.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bwi/PersonalNotes/PersonalNotesDefaultService.swift b/bwi/PersonalNotes/PersonalNotesDefaultService.swift index 67a222e11..1550f695f 100644 --- a/bwi/PersonalNotes/PersonalNotesDefaultService.swift +++ b/bwi/PersonalNotes/PersonalNotesDefaultService.swift @@ -141,12 +141,14 @@ extension PersonalNotesDefaultService : PersonalNotesService { func setAsFavoriteIfNeeded() { if let room = self.session.room(withRoomId: self.personalNotesRoomId()) { - if room.accountData.tags[kMXRoomTagFavourite] == nil { - let tagOrder = self.session.tagOrderToBe(at: 0, from: UInt(NSNotFound), withTag: kMXRoomTagFavourite) ?? "" - room.replaceTag(kMXRoomTagFavourite, with: kMXRoomTagFavourite, withOrder: tagOrder) { (response) in - // check old settings - let layoutSettings = AllChatsLayoutSettingsManager.shared.allChatLayoutSettings - PersonalNotesSettings().personalNotesVisible = layoutSettings.sections.contains(.bwiPersonalNotes) + if let accountData = room.accountData { + if accountData.tags[kMXRoomTagFavourite] == nil { + let tagOrder = self.session.tagOrderToBe(at: 0, from: UInt(NSNotFound), withTag: kMXRoomTagFavourite) ?? "" + room.replaceTag(kMXRoomTagFavourite, with: kMXRoomTagFavourite, withOrder: tagOrder) { (response) in + // check old settings + let layoutSettings = AllChatsLayoutSettingsManager.shared.allChatLayoutSettings + PersonalNotesSettings().personalNotesVisible = layoutSettings.sections.contains(.bwiPersonalNotes) + } } } }