diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 0802db694..2f8b96c7b 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -909,7 +909,7 @@ extension ConversationVC: ) : "FOLLOW_SETTING_EXPLAINATION_TURNING_OFF".localized() ) - let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "DISAPPERING_MESSAGES_SAVE_TITLE".localized() : "" + let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "DISAPPERING_MESSAGES_SAVE_TITLE".localized() : "CONFIRM_BUTTON_TITLE".localized() let confirmationModal: ConfirmationModal = ConfirmationModal( info: ConfirmationModal.Info( title: "FOLLOW_SETTING_TITLE".localized(), diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift index 46fcd6247..00342aaf3 100644 --- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift @@ -474,19 +474,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga dependencies.storage.writeAsync(using: dependencies) { [threadId, threadVariant, dependencies] db in _ = try updatedConfig.saved(db) - - let currentOffsetTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs() - var expiresInSeconds: TimeInterval? = 0 - var expiresStartedAtMs: Double? = nil - + if Features.useNewDisappearingMessagesConfig { _ = try Interaction .filter(Interaction.Columns.threadId == threadId) .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate) .deleteAll(db) - - expiresInSeconds = (updatedConfig.isEnabled ? nil : self.config.durationSeconds) - expiresStartedAtMs = (!updatedConfig.isEnabled && self.config.type == .disappearAfterSend ? Double(currentOffsetTimestampMs) : nil) } let interaction: Interaction = try Interaction( @@ -494,9 +487,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga authorId: getUserHexEncodedPublicKey(db, using: dependencies), variant: .infoDisappearingMessagesUpdate, body: updatedConfig.messageInfoString(with: nil, isPreviousOff: !self.config.isEnabled), - timestampMs: currentOffsetTimestampMs, - expiresInSeconds: expiresInSeconds, - expiresStartedAtMs: expiresStartedAtMs + timestampMs: SnodeAPI.currentOffsetTimestampMs() ) .inserted(db) diff --git a/Session/Meta/Translations/ar.lproj/Localizable.strings b/Session/Meta/Translations/ar.lproj/Localizable.strings index ca67f5274..3ec2e0331 100644 --- a/Session/Meta/Translations/ar.lproj/Localizable.strings +++ b/Session/Meta/Translations/ar.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/be.lproj/Localizable.strings b/Session/Meta/Translations/be.lproj/Localizable.strings index f8e65abc4..5faf600ed 100644 --- a/Session/Meta/Translations/be.lproj/Localizable.strings +++ b/Session/Meta/Translations/be.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/bg.lproj/Localizable.strings b/Session/Meta/Translations/bg.lproj/Localizable.strings index ef7849dc5..2028d4847 100644 --- a/Session/Meta/Translations/bg.lproj/Localizable.strings +++ b/Session/Meta/Translations/bg.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/bn.lproj/Localizable.strings b/Session/Meta/Translations/bn.lproj/Localizable.strings index d78de00ff..77b3d2208 100644 --- a/Session/Meta/Translations/bn.lproj/Localizable.strings +++ b/Session/Meta/Translations/bn.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/cs.lproj/Localizable.strings b/Session/Meta/Translations/cs.lproj/Localizable.strings index dfe16b142..a835d2f78 100644 --- a/Session/Meta/Translations/cs.lproj/Localizable.strings +++ b/Session/Meta/Translations/cs.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/da.lproj/Localizable.strings b/Session/Meta/Translations/da.lproj/Localizable.strings index bdcd6c59c..694993687 100644 --- a/Session/Meta/Translations/da.lproj/Localizable.strings +++ b/Session/Meta/Translations/da.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 87340047e..f331d420c 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/el.lproj/Localizable.strings b/Session/Meta/Translations/el.lproj/Localizable.strings index 9e392dc9f..199932beb 100644 --- a/Session/Meta/Translations/el.lproj/Localizable.strings +++ b/Session/Meta/Translations/el.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index b8ac7c0c0..959fc5f7b 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/eo.lproj/Localizable.strings b/Session/Meta/Translations/eo.lproj/Localizable.strings index 5b49d3ab3..62aaa1417 100644 --- a/Session/Meta/Translations/eo.lproj/Localizable.strings +++ b/Session/Meta/Translations/eo.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/es-ES.lproj/Localizable.strings b/Session/Meta/Translations/es-ES.lproj/Localizable.strings index 7b765d744..799aa2be4 100644 --- a/Session/Meta/Translations/es-ES.lproj/Localizable.strings +++ b/Session/Meta/Translations/es-ES.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 47f5cc39f..fa95f0109 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index eb0a008c6..e54ce4779 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/fil.lproj/Localizable.strings b/Session/Meta/Translations/fil.lproj/Localizable.strings index 5c370bf05..5385f6ef5 100644 --- a/Session/Meta/Translations/fil.lproj/Localizable.strings +++ b/Session/Meta/Translations/fil.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 5765cdeb6..5750503ee 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 13cd7e730..2269eeb3d 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index ea051253b..76e509c56 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/hu.lproj/Localizable.strings b/Session/Meta/Translations/hu.lproj/Localizable.strings index 15ee204ca..09f685a09 100644 --- a/Session/Meta/Translations/hu.lproj/Localizable.strings +++ b/Session/Meta/Translations/hu.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/id.lproj/Localizable.strings b/Session/Meta/Translations/id.lproj/Localizable.strings index 2f3f8a922..f451dd49b 100644 --- a/Session/Meta/Translations/id.lproj/Localizable.strings +++ b/Session/Meta/Translations/id.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index e8c4efdc2..77143e91d 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index a08673652..379d468d0 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ko.lproj/Localizable.strings b/Session/Meta/Translations/ko.lproj/Localizable.strings index 5bb478c9d..b95c77a5c 100644 --- a/Session/Meta/Translations/ko.lproj/Localizable.strings +++ b/Session/Meta/Translations/ko.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ku.lproj/Localizable.strings b/Session/Meta/Translations/ku.lproj/Localizable.strings index 5d5381e10..33c9be7a5 100644 --- a/Session/Meta/Translations/ku.lproj/Localizable.strings +++ b/Session/Meta/Translations/ku.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/lt.lproj/Localizable.strings b/Session/Meta/Translations/lt.lproj/Localizable.strings index 9acf76de9..9c6a308cf 100644 --- a/Session/Meta/Translations/lt.lproj/Localizable.strings +++ b/Session/Meta/Translations/lt.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/lv.lproj/Localizable.strings b/Session/Meta/Translations/lv.lproj/Localizable.strings index 088a165cb..84aba6eb3 100644 --- a/Session/Meta/Translations/lv.lproj/Localizable.strings +++ b/Session/Meta/Translations/lv.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings index 489444fc3..259a02bd5 100644 --- a/Session/Meta/Translations/ne-NP.lproj/Localizable.strings +++ b/Session/Meta/Translations/ne-NP.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index 9370cdb96..68171e399 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/no.lproj/Localizable.strings b/Session/Meta/Translations/no.lproj/Localizable.strings index 1aa7257fd..ed74d0fc3 100644 --- a/Session/Meta/Translations/no.lproj/Localizable.strings +++ b/Session/Meta/Translations/no.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 8728e82c8..dbfa8c03d 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings index 8fab6c6c3..dc6dbe1b7 100644 --- a/Session/Meta/Translations/pt-BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-BR.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings index c1576c035..5f61395c2 100644 --- a/Session/Meta/Translations/pt-PT.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt-PT.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ro.lproj/Localizable.strings b/Session/Meta/Translations/ro.lproj/Localizable.strings index c9ed36e1c..0788467f6 100644 --- a/Session/Meta/Translations/ro.lproj/Localizable.strings +++ b/Session/Meta/Translations/ro.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 583eb95a2..6daec3468 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/si-LK.lproj/Localizable.strings b/Session/Meta/Translations/si-LK.lproj/Localizable.strings index c539461bc..5f114399f 100644 --- a/Session/Meta/Translations/si-LK.lproj/Localizable.strings +++ b/Session/Meta/Translations/si-LK.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 3fc088662..4bc3536c1 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/sl.lproj/Localizable.strings b/Session/Meta/Translations/sl.lproj/Localizable.strings index 0c27a9b29..d847f0677 100644 --- a/Session/Meta/Translations/sl.lproj/Localizable.strings +++ b/Session/Meta/Translations/sl.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings index 053bf7a45..d8f883d21 100644 --- a/Session/Meta/Translations/sv-SE.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv-SE.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index edc8ac564..d63f222ab 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/tr.lproj/Localizable.strings b/Session/Meta/Translations/tr.lproj/Localizable.strings index 281f4f242..0cf186381 100644 --- a/Session/Meta/Translations/tr.lproj/Localizable.strings +++ b/Session/Meta/Translations/tr.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/uk.lproj/Localizable.strings b/Session/Meta/Translations/uk.lproj/Localizable.strings index ef961257f..483537fac 100644 --- a/Session/Meta/Translations/uk.lproj/Localizable.strings +++ b/Session/Meta/Translations/uk.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/vi.lproj/Localizable.strings b/Session/Meta/Translations/vi.lproj/Localizable.strings index 84f4d8db0..7eea745dc 100644 --- a/Session/Meta/Translations/vi.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings index f72e5fe3e..7859b706b 100644 --- a/Session/Meta/Translations/zh-CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-CN.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings index da7921c8e..71f279f0b 100644 --- a/Session/Meta/Translations/zh-TW.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-TW.lproj/Localizable.strings @@ -843,3 +843,5 @@ The point that a message will disappear in a disappearing message update message "YOU_DISAPPEARING_MESSAGES_INFO_ENABLE" = "You set your messages to disappear %@ after they have been %@."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear."; + +"CONFIRM_BUTTON_TITLE" = "Confirm"; diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift index 21f85ed18..23c2d0def 100644 --- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift +++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift @@ -238,11 +238,8 @@ extension MessageReceiver { isPreviousOff: !localConfig.isEnabled ), timestampMs: Int64(timestampMs), - expiresInSeconds: (remoteConfig.isEnabled ? remoteConfig.durationSeconds : localConfig.durationSeconds), - expiresStartedAtMs: (!remoteConfig.isEnabled && localConfig.type == .disappearAfterSend ? - Double(timestampMs) : - nil - ) + expiresInSeconds: remoteConfig.durationSeconds, + expiresStartedAtMs: (remoteConfig.type == .disappearAfterSend ? Double(timestampMs) : nil) ).inserted(db) }