From 8f39fe697225abe44dd633aee0b4286c8ec2d662 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Thu, 9 Mar 2023 17:51:26 +1100 Subject: [PATCH] Fixed a couple of minor bugs Fixed a bug where the volatile info would remain after removing the conversation Fixed a bug where sending a message wasn't correctly jumping to the bottom of the conversation --- Session/Conversations/ConversationVC.swift | 15 ++++-- Session/Notifications/SyncPushTokensJob.swift | 5 +- .../SessionUtil+Contacts.swift | 2 + .../SessionUtil+ConvoInfoVolatile.swift | 46 +++++++++++++++++++ .../SessionUtil+UserGroups.swift | 16 +++++++ 5 files changed, 75 insertions(+), 9 deletions(-) diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index e6c0c3ee9..a8fce8ea9 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -826,11 +826,16 @@ final class ConversationVC: BaseVC, ConversationSearchControllerDelegate, UITabl self.viewModel.updateInteractionData(updatedData) self.tableView.reloadData() - // Note: The scroll button alpha won't get set correctly in this case so we forcibly set it to - // have an alpha of 0 to stop it appearing buggy - self.scrollToBottom(isAnimated: false) - self.scrollButton.alpha = 0 - self.unreadCountView.alpha = scrollButton.alpha + // We need to dispatch to the next run loop because it seems trying to scroll immediately after + // triggering a 'reloadData' doesn't work + DispatchQueue.main.async { [weak self] in + self?.scrollToBottom(isAnimated: false) + + // Note: The scroll button alpha won't get set correctly in this case so we forcibly set it to + // have an alpha of 0 to stop it appearing buggy + self?.scrollButton.alpha = 0 + self?.unreadCountView.alpha = 0 + } return } diff --git a/Session/Notifications/SyncPushTokensJob.swift b/Session/Notifications/SyncPushTokensJob.swift index b9d3cdf3a..9235690a5 100644 --- a/Session/Notifications/SyncPushTokensJob.swift +++ b/Session/Notifications/SyncPushTokensJob.swift @@ -72,10 +72,7 @@ public enum SyncPushTokensJob: JobExecutor { PushRegistrationManager.shared.requestPushTokens() .subscribe(on: queue) .flatMap { (pushToken: String, voipToken: String) -> AnyPublisher in - let lastPushToken: String? = Storage.shared[.lastRecordedPushToken] - let lastVoipToken: String? = Storage.shared[.lastRecordedVoipToken] - - return Deferred { + Deferred { Future { resolver in SyncPushTokensJob.registerForPushNotifications( pushToken: pushToken, diff --git a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+Contacts.swift b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+Contacts.swift index c4191fd26..3b5812119 100644 --- a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+Contacts.swift +++ b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+Contacts.swift @@ -223,6 +223,8 @@ internal extension SessionUtil { db, Profile.Columns.nickname.set(to: nil) ) + + try SessionUtil.remove(db, volatileContactIds: contactIdsToRemove) } } diff --git a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift index 0ce09f050..45854e1b3 100644 --- a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift +++ b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift @@ -288,6 +288,52 @@ internal extension SessionUtil { ) } } + + static func remove(_ db: Database, volatileContactIds: [String]) throws { + try SessionUtil.performAndPushChange( + db, + for: .convoInfoVolatile, + publicKey: getUserHexEncodedPublicKey(db) + ) { conf in + volatileContactIds.forEach { contactId in + var cSessionId: [CChar] = contactId.cArray + + // Don't care if the data doesn't exist + convo_info_volatile_erase_1to1(conf, &cSessionId) + } + } + } + + static func remove(_ db: Database, volatileLegacyGroupIds: [String]) throws { + try SessionUtil.performAndPushChange( + db, + for: .convoInfoVolatile, + publicKey: getUserHexEncodedPublicKey(db) + ) { conf in + volatileLegacyGroupIds.forEach { legacyGroupId in + var cLegacyGroupId: [CChar] = legacyGroupId.cArray + + // Don't care if the data doesn't exist + convo_info_volatile_erase_legacy_group(conf, &cLegacyGroupId) + } + } + } + + static func remove(_ db: Database, volatileCommunityInfo: [OpenGroupUrlInfo]) throws { + try SessionUtil.performAndPushChange( + db, + for: .convoInfoVolatile, + publicKey: getUserHexEncodedPublicKey(db) + ) { conf in + volatileCommunityInfo.forEach { urlInfo in + var cBaseUrl: [CChar] = urlInfo.server.cArray + var cRoom: [CChar] = urlInfo.roomToken.cArray + + // Don't care if the data doesn't exist + convo_info_volatile_erase_community(conf, &cBaseUrl, &cRoom) + } + } + } } // MARK: - External Outgoing Changes diff --git a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+UserGroups.swift b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+UserGroups.swift index 578902573..19dde7ac6 100644 --- a/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+UserGroups.swift +++ b/SessionMessagingKit/LibSessionUtil/Config Handling/SessionUtil+UserGroups.swift @@ -516,6 +516,19 @@ public extension SessionUtil { // Don't care if the community doesn't exist user_groups_erase_community(conf, &cBaseUrl, &cRoom) } + + // Remove the volatile info as well + try SessionUtil.remove( + db, + volatileCommunityInfo: [ + OpenGroupUrlInfo( + threadId: OpenGroup.idFor(roomToken: roomToken, server: server), + server: server, + roomToken: roomToken, + publicKey: "" + ) + ] + ) } // MARK: -- Legacy Group Changes @@ -634,6 +647,9 @@ public extension SessionUtil { user_groups_erase_legacy_group(conf, &cGroupId) } } + + // Remove the volatile info as well + try SessionUtil.remove(db, volatileLegacyGroupIds: legacyGroupIds) } // MARK: -- Group Changes