WIP: fix outdated client banner

pull/731/head
Ryan ZHAO 7 months ago
parent e8ec91ba8b
commit c561a05273

@ -870,7 +870,16 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
} }
} }
addOrRemoveOutdatedClientBanner(outdatedMemberId: updatedThreadData.outdatedMemberId) if
initialLoad ||
viewModel.threadData.outdatedMemberId != updatedThreadData.outdatedMemberId ||
viewModel.threadData.disappearingMessagesConfiguration != updatedThreadData.disappearingMessagesConfiguration
{
addOrRemoveOutdatedClientBanner(
outdatedMemberId: updatedThreadData.outdatedMemberId,
disappearingMessagesConfiguration: updatedThreadData.disappearingMessagesConfiguration
)
}
if initialLoad || viewModel.threadData.threadIsBlocked != updatedThreadData.threadIsBlocked { if initialLoad || viewModel.threadData.threadIsBlocked != updatedThreadData.threadIsBlocked {
addOrRemoveBlockedBanner(threadIsBlocked: (updatedThreadData.threadIsBlocked == true)) addOrRemoveBlockedBanner(threadIsBlocked: (updatedThreadData.threadIsBlocked == true))
@ -1497,11 +1506,15 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers
// MARK: - General // MARK: - General
func addOrRemoveOutdatedClientBanner(outdatedMemberId: String?) { func addOrRemoveOutdatedClientBanner(
outdatedMemberId: String?,
disappearingMessagesConfiguration: DisappearingMessagesConfiguration?
) {
let currentDisappearingMessagesConfiguration: DisappearingMessagesConfiguration? = disappearingMessagesConfiguration ?? self.viewModel.threadData.disappearingMessagesConfiguration
// Do not show the banner until the new disappearing messages is enabled // Do not show the banner until the new disappearing messages is enabled
guard guard
Features.useNewDisappearingMessagesConfig && Features.useNewDisappearingMessagesConfig &&
self.viewModel.threadData.disappearingMessagesConfiguration?.isEnabled == true currentDisappearingMessagesConfiguration?.isEnabled == true
else { else {
self.outdatedClientBanner.isHidden = true self.outdatedClientBanner.isHidden = true
self.emptyStateLabelTopConstraint?.constant = Values.largeSpacing self.emptyStateLabelTopConstraint?.constant = Values.largeSpacing

@ -485,7 +485,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
_ = try updatedConfig.saved(db) _ = try updatedConfig.saved(db)
let currentOffsetTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs() let currentOffsetTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
var expiresInSeconds: TimeInterval? = nil var expiresInSeconds: TimeInterval? = 0
var expiresStartedAtMs: Double? = nil var expiresStartedAtMs: Double? = nil
if Features.useNewDisappearingMessagesConfig { if Features.useNewDisappearingMessagesConfig {

Loading…
Cancel
Save