keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove previous logic for expiring control messages indicating disappearing messages turned off

Browse Source
pull/731/head
Ryan ZHAO 1 year ago
parent 362dcd3528
commit 4ec1d730cd
46 changed files with 91 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -909,7 +909,7 @@ extension ConversationVC:
) : ) :
"FOLLOW_SETTING_EXPLAINATION_TURNING_OFF".localized() "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( let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info( info: ConfirmationModal.Info(
title: "FOLLOW_SETTING_TITLE".localized(), title: "FOLLOW_SETTING_TITLE".localized(),

13
Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
Unescape Escape View File

@ -474,19 +474,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
dependencies.storage.writeAsync(using: dependencies) { [threadId, threadVariant, dependencies] db in dependencies.storage.writeAsync(using: dependencies) { [threadId, threadVariant, dependencies] db in
_ = try updatedConfig.saved(db) _ = try updatedConfig.saved(db)
let currentOffsetTimestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs()
var expiresInSeconds: TimeInterval? = 0
var expiresStartedAtMs: Double? = nil
if Features.useNewDisappearingMessagesConfig { if Features.useNewDisappearingMessagesConfig {
_ = try Interaction _ = try Interaction
.filter(Interaction.Columns.threadId == threadId) .filter(Interaction.Columns.threadId == threadId)
.filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate) .filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
.deleteAll(db) .deleteAll(db)
expiresInSeconds = (updatedConfig.isEnabled ? nil : self.config.durationSeconds)
expiresStartedAtMs = (!updatedConfig.isEnabled && self.config.type == .disappearAfterSend ? Double(currentOffsetTimestampMs) : nil)
} }
let interaction: Interaction = try Interaction( let interaction: Interaction = try Interaction(
@ -494,9 +487,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
authorId: getUserHexEncodedPublicKey(db, using: dependencies), authorId: getUserHexEncodedPublicKey(db, using: dependencies),
variant: .infoDisappearingMessagesUpdate, variant: .infoDisappearingMessagesUpdate,
body: updatedConfig.messageInfoString(with: nil, isPreviousOff: !self.config.isEnabled), body: updatedConfig.messageInfoString(with: nil, isPreviousOff: !self.config.isEnabled),
timestampMs: currentOffsetTimestampMs, timestampMs: SnodeAPI.currentOffsetTimestampMs()
expiresInSeconds: expiresInSeconds,
expiresStartedAtMs: expiresStartedAtMs
) )
.inserted(db) .inserted(db)

2
Session/Meta/Translations/ar.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/be.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/bg.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/bn.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/cs.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/da.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/el.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/eo.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/es-ES.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/fil.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/hu.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/id.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ko.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ku.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/lt.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/lv.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ne-NP.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/no.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/pt-BR.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/pt-PT.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ro.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/si-LK.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/sl.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/sv-SE.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/tr.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/uk.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/vi.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/zh-CN.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

2
Session/Meta/Translations/zh-TW.lproj/Localizable.strings
Unescape Escape View File

@ -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_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."; "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE" = "You turned off disappearing messages. Messages you send will no longer disappear.";
"CONFIRM_BUTTON_TITLE" = "Confirm";

7
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
Unescape Escape View File

@ -238,11 +238,8 @@ extension MessageReceiver {
isPreviousOff: !localConfig.isEnabled isPreviousOff: !localConfig.isEnabled
), ),
timestampMs: Int64(timestampMs), timestampMs: Int64(timestampMs),
expiresInSeconds: (remoteConfig.isEnabled ? remoteConfig.durationSeconds : localConfig.durationSeconds), expiresInSeconds: remoteConfig.durationSeconds,
expiresStartedAtMs: (!remoteConfig.isEnabled && localConfig.type == .disappearAfterSend ? expiresStartedAtMs: (remoteConfig.type == .disappearAfterSend ? Double(timestampMs) : nil)
Double(timestampMs) :
nil
)
).inserted(db) ).inserted(db)
} }

Write Preview
Loading…
Cancel
Save