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

Merge pull request #970 from RyanRory/disappearing-messages-v2-post-enabling

Browse Source 
Cleaning up legacy disappearing messages
pull/1006/head
Morgan Pretty 8 months ago committed by GitHub
parent 634e564902 450613de17
commit 432238debe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 109 additions and 581 deletions
Show Stats Download Patch File Download Diff File

7
Scripts/LintLocalizableStrings.swift
Unescape Escape View File

@ -82,7 +82,8 @@ extension ProjectState {
.contains("SQL(", caseSensitive: false),
.regex(".*static var databaseTableName: String"),
.regex("case .* = "),
.regex("Error.*\\(")
.regex("Error.*\\("),
.belowLineContaining("PreviewProvider")
]
}
@ -550,6 +551,7 @@ indirect enum MatchType: Hashable {
case containsAnd(String, caseSensitive: Bool, MatchType)
case regex(String)
case previousLine(numEarlier: Int, MatchType)
case belowLineContaining(String)
func matches(_ value: String, _ index: Int, _ lines: [String]) -> Bool {
switch self {
@ -583,6 +585,9 @@ indirect enum MatchType: Hashable {
let targetIndex: Int = (index - numEarlier)
return type.matches(lines[targetIndex], targetIndex, lines)
case .belowLineContaining(let other):
return lines[0..<index].contains(where: { $0.lowercased().contains(other.lowercased()) })
}
}
}

5
Session/Conversations/ConversationVC.swift
Unescape Escape View File

@ -1451,10 +1451,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
) {
let currentDisappearingMessagesConfiguration: DisappearingMessagesConfiguration? = disappearingMessagesConfiguration ?? self.viewModel.threadData.disappearingMessagesConfiguration
// Do not show the banner until the new disappearing messages is enabled
guard
Features.useNewDisappearingMessagesConfig &&
currentDisappearingMessagesConfiguration?.isEnabled == true
else {
guard currentDisappearingMessagesConfiguration?.isEnabled == true else {
self.outdatedClientBanner.isHidden = true
self.emptyStateLabelTopConstraint?.constant = Values.largeSpacing
return

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

@ -87,15 +87,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
let title: String = "DISAPPEARING_MESSAGES".localized()
lazy var subtitle: String? = {
guard Features.useNewDisappearingMessagesConfig else {
return (isNoteToSelf ? nil : "DISAPPERING_MESSAGES_SUBTITLE_LEGACY".localized())
switch (threadVariant, isNoteToSelf) {
case (.contact, false): return "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized()
case (.group, _): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
case (.community, _): return nil
case (.legacyGroup, _), (_, true): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
}
if threadVariant == .contact && !isNoteToSelf {
return "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized()
}
return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
}()
lazy var footerButtonInfo: AnyPublisher<SessionButton.Info?, Never> = shouldShowConfirmButton
@ -149,34 +146,6 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
self?.currentSelection.send(updatedConfig)
}
),
(Features.useNewDisappearingMessagesConfig ? nil :
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized(),
title: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized(),
subtitle: "DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
!Features.useNewDisappearingMessagesConfig
}
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = {
if (config.isEnabled == true && config.type == .disappearAfterRead) {
return config
}
return currentSelection
.with(
isEnabled: true,
durationSeconds: DisappearingMessagesConfiguration.DefaultDuration.legacy.seconds,
type: .disappearAfterRead // Default for 1-1
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
)
),
SessionCell.Info(
id: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
@ -184,17 +153,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.type == .disappearAfterRead) &&
Features.useNewDisappearingMessagesConfig
(self?.currentSelection.value.type == .disappearAfterRead)
}
),
styling: SessionCell.StyleInfo(
tintColor: (Features.useNewDisappearingMessagesConfig ?
.textPrimary :
.disabled
)
),
isEnabled: Features.useNewDisappearingMessagesConfig,
accessibility: Accessibility(
identifier: "Disappear after read option",
label: "Disappear after read option"
@ -222,17 +183,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.type == .disappearAfterSend) &&
Features.useNewDisappearingMessagesConfig
(self?.currentSelection.value.type == .disappearAfterSend)
}
),
styling: SessionCell.StyleInfo(
tintColor: (Features.useNewDisappearingMessagesConfig ?
.textPrimary :
.disabled
)
),
isEnabled: Features.useNewDisappearingMessagesConfig,
accessibility: Accessibility(
identifier: "Disappear after send option",
label: "Disappear after send option"
@ -257,17 +210,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
),
(currentSelection.isEnabled == false ? nil :
SectionModel(
model: {
guard Features.useNewDisappearingMessagesConfig else { return .timerLegacy }
return currentSelection.type == .disappearAfterSend ?
.timerDisappearAfterSend :
.timerDisappearAfterRead
}(),
model: (currentSelection.type == .disappearAfterSend ?
.timerDisappearAfterSend :
.timerDisappearAfterRead
),
elements: DisappearingMessagesConfiguration
.validDurationsSeconds({
guard Features.useNewDisappearingMessagesConfig else { return .disappearAfterSend }
return currentSelection.type ?? .disappearAfterSend
}())
.validDurationsSeconds(currentSelection.type ?? .disappearAfterSend)
.map { duration in
let title: String = duration.formatted(format: .long)
@ -285,10 +233,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
label: "Time option"
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
durationSeconds: duration
)
let updatedConfig: DisappearingMessagesConfiguration = currentSelection.with(durationSeconds: duration)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
@ -300,163 +245,71 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
case (.legacyGroup, _), (.group, _), (_, true):
return [
(Features.useNewDisappearingMessagesConfig ? nil :
SectionModel(
model: .type,
elements: [
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_OFF".localized(),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) }
),
isEnabled: (
isNoteToSelf ||
currentUserIsClosedGroupMember == true
),
accessibility: Accessibility(
identifier: "Disable disappearing messages (Off option)",
label: "Disable disappearing messages (Off option)"
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: false,
durationSeconds: DisappearingMessagesConfiguration.DefaultDuration.off.seconds
)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
SectionModel(
model: (isNoteToSelf ? .noteToSelf : .group),
elements: [
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_OFF".localized(),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) }
),
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized(),
title: "DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE".localized(),
subtitle: "DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION".localized(),
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
!Features.useNewDisappearingMessagesConfig
}
),
isEnabled: (
isNoteToSelf ||
currentUserIsClosedGroupMember == true
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = {
if (config.isEnabled == true && config.type == .disappearAfterSend) {
return config
}
return currentSelection
.with(
isEnabled: true,
durationSeconds: DisappearingMessagesConfiguration.DefaultDuration.legacy.seconds,
type: .disappearAfterSend // Default for closed group & note to self
)
}()
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
isEnabled: (
isNoteToSelf ||
currentUserIsClosedGroupAdmin == true
),
SessionCell.Info(
id: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
rightAccessory: .radio(isSelected: { false }),
styling: SessionCell.StyleInfo(tintColor: .disabled),
isEnabled: false
)
]
)
),
(!Features.useNewDisappearingMessagesConfig && currentSelection.isEnabled == false ? nil :
SectionModel(
model: {
guard Features.useNewDisappearingMessagesConfig else {
return (currentSelection.type == .disappearAfterSend ?
.timerDisappearAfterSend :
.timerDisappearAfterRead
)
accessibility: Accessibility(
identifier: "Disable disappearing messages (Off option)",
label: "Disable disappearing messages (Off option)"
),
onTap: {
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: false,
durationSeconds: DisappearingMessagesConfiguration.DefaultDuration.off.seconds
)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
)
]
.compactMap { $0 }
.appending(
contentsOf: DisappearingMessagesConfiguration
.validDurationsSeconds(.disappearAfterSend)
.map { duration in
let title: String = duration.formatted(format: .long)
return (isNoteToSelf ? .noteToSelf : .group)
}(),
elements: [
(!Features.useNewDisappearingMessagesConfig ? nil :
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_OFF".localized(),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
return SessionCell.Info(
id: title,
title: title,
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) }
),
isEnabled: (
isNoteToSelf ||
currentUserIsClosedGroupAdmin == true
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.durationSeconds == duration)
}
),
isEnabled: (isNoteToSelf || currentUserIsClosedGroupAdmin == true),
accessibility: Accessibility(
identifier: "Disable disappearing messages (Off option)",
label: "Disable disappearing messages (Off option)"
identifier: "Time option",
label: "Time option"
),
onTap: {
// If the new disappearing messages config feature flag isn't
// enabled then the 'isEnabled' and 'type' values are set via
// the first section so pass `nil` values to keep the existing
// setting
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: false,
durationSeconds: DisappearingMessagesConfiguration.DefaultDuration.off.seconds
isEnabled: true,
durationSeconds: duration,
type: .disappearAfterSend
)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
)
)
]
.compactMap { $0 }
.appending(
contentsOf: DisappearingMessagesConfiguration
.validDurationsSeconds(.disappearAfterSend)
.map { duration in
let title: String = duration.formatted(format: .long)
return SessionCell.Info(
id: title,
title: title,
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
(self?.currentSelection.value.durationSeconds == duration)
}
),
isEnabled: (
isNoteToSelf ||
(currentUserIsClosedGroupMember == true && !Features.useNewDisappearingMessagesConfig) ||
currentUserIsClosedGroupAdmin == true
),
accessibility: Accessibility(
identifier: "Time option",
label: "Time option"
),
onTap: {
// If the new disappearing messages config feature flag isn't
// enabled then the 'isEnabled' and 'type' values are set via
// the first section so pass `nil` values to keep the existing
// setting
let updatedConfig: DisappearingMessagesConfiguration = currentSelection
.with(
isEnabled: (Features.useNewDisappearingMessagesConfig ?
true :
nil
),
durationSeconds: duration,
type: (Features.useNewDisappearingMessagesConfig ?
.disappearAfterSend :
nil
)
)
self?.shouldShowConfirmButton.send(updatedConfig != config)
self?.currentSelection.send(updatedConfig)
}
)
}
)
}
)
)
].compactMap { $0 }
@ -487,18 +340,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
serverHash: nil,
serverExpirationTimestamp: nil
)
let duration: UInt32? = {
guard !Features.useNewDisappearingMessagesConfig else { return nil }
return UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
}()
let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate(
syncTarget: nil,
duration: duration
)
.with(sentTimestamp: UInt64(currentTimestampMs))
.with(updatedConfig)
let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate()
.with(sentTimestamp: UInt64(currentTimestampMs))
.with(updatedConfig)
try MessageSender.send(
db,

6
Session/Conversations/Settings/ThreadSettingsViewModel.swift
Unescape Escape View File

@ -452,12 +452,6 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
guard current.disappearingMessagesConfig.isEnabled else {
return "DISAPPEARING_MESSAGES_SUBTITLE_OFF".localized()
}
guard Features.useNewDisappearingMessagesConfig else {
return String(
format: "DISAPPEARING_MESSAGES_SUBTITLE_DISAPPEAR_AFTER_LEGACY".localized(),
current.disappearingMessagesConfig.durationString
)
}
return String(
format: (current.disappearingMessagesConfig.type == .disappearAfterRead ?

29
Session/Conversations/Views & Modals/ConversationTitleView.swift
Unescape Escape View File

@ -228,30 +228,17 @@ final class ConversationTitleView: UIView {
height: Values.miniFontSize
)
let disappearingMessageSettingLabelString: NSAttributedString = {
guard Features.useNewDisappearingMessagesConfig else {
return NSAttributedString(attachment: imageAttachment)
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
attributedText: NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: String(
format: "DISAPPERING_MESSAGES_SUMMARY_LEGACY".localized(),
format: (config.type == .disappearAfterRead ?
"DISAPPERING_MESSAGES_SUMMARY_READ".localized() :
"DISAPPERING_MESSAGES_SUMMARY_SEND".localized()
),
floor(config.durationSeconds).formatted(format: .short)
))
}
return NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: String(
format: (config.type == .disappearAfterRead ?
"DISAPPERING_MESSAGES_SUMMARY_READ".localized() :
"DISAPPERING_MESSAGES_SUMMARY_SEND".localized()
),
floor(config.durationSeconds).formatted(format: .short)
))
}()
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
attributedText: disappearingMessageSettingLabelString,
)),
accessibility: Accessibility(
identifier: "Disappearing messages type and time",
label: "Disappearing messages type and time"

76
SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
Unescape Escape View File

@ -133,8 +133,6 @@ public extension DisappearingMessagesConfiguration {
public let type: DisappearingMessageType?
var previewText: String {
guard Features.useNewDisappearingMessagesConfig && self.threadVariant != nil else { return legacyPreviewText }
guard let senderName: String = senderName else {
guard isEnabled, durationSeconds > 0 else {
return "YOU_DISAPPEARING_MESSAGES_INFO_DISABLE".localized()
@ -158,28 +156,6 @@ public extension DisappearingMessagesConfiguration {
(type == .disappearAfterRead ? "DISAPPEARING_MESSAGE_STATE_READ".localized() : "DISAPPEARING_MESSAGE_STATE_SENT".localized())
)
}
private var legacyPreviewText: String {
guard let senderName: String = senderName else {
// Changed by this device or via synced transcript
guard isEnabled, durationSeconds > 0 else { return "YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION".localized() }
return String(
format: "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION".localized(),
floor(durationSeconds).formatted(format: .long)
)
}
guard isEnabled, durationSeconds > 0 else {
return String(format: "OTHER_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION".localized(), senderName)
}
return String(
format: "OTHER_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION".localized(),
senderName,
floor(durationSeconds).formatted(format: .long)
)
}
}
var durationString: String {
@ -267,22 +243,20 @@ public extension DisappearingMessagesConfiguration {
serverExpirationTimestamp: TimeInterval?,
using dependencies: Dependencies = Dependencies()
) throws -> Int64? {
if Features.useNewDisappearingMessagesConfig {
switch threadVariant {
case .contact:
_ = try Interaction
.filter(Interaction.Columns.threadId == threadId)
.filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
.filter(Interaction.Columns.authorId == authorId)
.deleteAll(db)
case .legacyGroup:
_ = try Interaction
.filter(Interaction.Columns.threadId == threadId)
.filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
.deleteAll(db)
default:
break
}
switch threadVariant {
case .contact:
_ = try Interaction
.filter(Interaction.Columns.threadId == threadId)
.filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
.filter(Interaction.Columns.authorId == authorId)
.deleteAll(db)
case .legacyGroup:
_ = try Interaction
.filter(Interaction.Columns.threadId == threadId)
.filter(Interaction.Columns.variant == Interaction.Variant.infoDisappearingMessagesUpdate)
.deleteAll(db)
default:
break
}
let currentUserPublicKey: String = getUserHexEncodedPublicKey(db, using: dependencies)
@ -337,29 +311,7 @@ public extension DisappearingMessagesConfiguration {
// MARK: - UI Constraints
extension DisappearingMessagesConfiguration {
// TODO: Remove this when disappearing messages V2 is up and running
public static var validDurationsSeconds: [TimeInterval] {
return [
5,
10,
30,
(1 * 60),
(5 * 60),
(30 * 60),
(1 * 60 * 60),
(6 * 60 * 60),
(12 * 60 * 60),
(24 * 60 * 60),
(7 * 24 * 60 * 60)
]
}
public static var maxDurationSeconds: TimeInterval = {
return (validDurationsSeconds.max() ?? 0)
}()
public static func validDurationsSeconds(_ type: DisappearingMessageType) -> [TimeInterval] {
switch type {
case .disappearAfterRead:
var result = [

4
SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift
Unescape Escape View File

@ -179,9 +179,7 @@ internal extension LibSession {
.fetchOne(db, id: sessionId)
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(sessionId))
let isValid: Bool = Features.useNewDisappearingMessagesConfig ? data.config.isValidV2Config() : true
if isValid && data.config != localConfig {
if data.config.isValidV2Config() && data.config != localConfig {
try data.config
.saved(db)
.clearUnrelatedControlMessages(

61
SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift
Unescape Escape View File

@ -4,58 +4,9 @@ import Foundation
import GRDB
import SessionUtilitiesKit
// TODO: Refactor this when disappearing messages V2 is up and running
public final class ExpirationTimerUpdate: ControlMessage {
private enum CodingKeys: String, CodingKey {
case syncTarget
case duration
}
/// In the case of a sync message, the public key of the person the message was targeted at.
///
/// - Note: `nil` if this isn't a sync message.
public var syncTarget: String?
public var duration: UInt32?
public override var isSelfSendValid: Bool { true }
// MARK: - Initialization
public init(syncTarget: String?, duration: UInt32?) {
super.init()
self.syncTarget = syncTarget
self.duration = duration
}
// MARK: - Validation
public override var isValid: Bool {
guard super.isValid else { return false }
return (duration != nil || Features.useNewDisappearingMessagesConfig)
}
// MARK: - Codable
required init(from decoder: Decoder) throws {
try super.init(from: decoder)
let container: KeyedDecodingContainer<CodingKeys> = try decoder.container(keyedBy: CodingKeys.self)
syncTarget = try? container.decode(String.self, forKey: .syncTarget)
duration = try? container.decode(UInt32.self, forKey: .duration)
}
public override func encode(to encoder: Encoder) throws {
try super.encode(to: encoder)
var container: KeyedEncodingContainer<CodingKeys> = encoder.container(keyedBy: CodingKeys.self)
try container.encodeIfPresent(syncTarget, forKey: .syncTarget)
try container.encodeIfPresent(duration, forKey: .duration)
}
// MARK: - Proto Conversion
public override class func fromProto(_ proto: SNProtoContent, sender: String) -> ExpirationTimerUpdate? {
@ -64,17 +15,12 @@ public final class ExpirationTimerUpdate: ControlMessage {
let isExpirationTimerUpdate = (dataMessageProto.flags & UInt32(SNProtoDataMessage.SNProtoDataMessageFlags.expirationTimerUpdate.rawValue)) != 0
guard isExpirationTimerUpdate else { return nil }
return ExpirationTimerUpdate(
syncTarget: dataMessageProto.syncTarget,
duration: proto.hasExpirationTimer ? proto.expirationTimer : dataMessageProto.expireTimer
)
return ExpirationTimerUpdate()
}
public override func toProto(_ db: Database, threadId: String) -> SNProtoContent? {
let dataMessageProto = SNProtoDataMessage.builder()
dataMessageProto.setFlags(UInt32(SNProtoDataMessage.SNProtoDataMessageFlags.expirationTimerUpdate.rawValue))
if let duration = duration { dataMessageProto.setExpireTimer(duration) }
if let syncTarget = syncTarget { dataMessageProto.setSyncTarget(syncTarget) }
let contentProto = SNProtoContent.builder()
// DisappearingMessagesConfiguration
@ -93,10 +39,7 @@ public final class ExpirationTimerUpdate: ControlMessage {
public var description: String {
"""
ExpirationTimerUpdate(
syncTarget: \(syncTarget ?? "null"),
duration: \(duration?.description ?? "null")
)
ExpirationTimerUpdate()
"""
}
}

5
SessionMessagingKit/Messages/Message.swift
Unescape Escape View File

@ -262,7 +262,6 @@ public extension Message {
static func shouldSync(message: Message) -> Bool {
switch message {
case is VisibleMessage: return true
case is ExpirationTimerUpdate: return true
case is UnsendRequest: return true
case let controlMessage as ClosedGroupControlMessage:
@ -289,7 +288,6 @@ public extension Message {
switch message {
case let message as VisibleMessage: maybeSyncTarget = message.syncTarget
case let message as ExpirationTimerUpdate: maybeSyncTarget = message.syncTarget
default: maybeSyncTarget = nil
}
@ -630,7 +628,8 @@ public extension Message {
message: Message,
destination: Message.Destination
) -> UInt64 {
guard Features.useNewDisappearingMessagesConfig else { return message.ttl }
// Not disappearing messages
guard let expiresInSeconds = message.expiresInSeconds else { return message.ttl }
switch (destination, message) {
// Disappear after sent messages with exceptions

7
SessionMessagingKit/Open Groups/OpenGroupManager.swift
Unescape Escape View File

@ -781,12 +781,7 @@ public final class OpenGroupManager {
let syncTarget: String = (lookup.sessionId ?? message.recipient)
switch messageInfo.variant {
case .visibleMessage:
(messageInfo.message as? VisibleMessage)?.syncTarget = syncTarget
case .expirationTimerUpdate:
(messageInfo.message as? ExpirationTimerUpdate)?.syncTarget = syncTarget
case .visibleMessage: (messageInfo.message as? VisibleMessage)?.syncTarget = syncTarget
default: break
}
}

14
SessionMessagingKit/Protos/Generated/SNProto.swift
Unescape Escape View File

@ -2487,9 +2487,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
if hasFlags {
builder.setFlags(flags)
}
if hasExpireTimer {
builder.setExpireTimer(expireTimer)
}
if let _value = profileKey {
builder.setProfileKey(_value)
}
@ -2545,10 +2542,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
proto.flags = valueParam
}
@objc public func setExpireTimer(_ valueParam: UInt32) {
proto.expireTimer = valueParam
}
@objc public func setProfileKey(_ valueParam: Data) {
proto.profileKey = valueParam
}
@ -2637,13 +2630,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
return proto.hasFlags
}
@objc public var expireTimer: UInt32 {
return proto.expireTimer
}
@objc public var hasExpireTimer: Bool {
return proto.hasExpireTimer
}
@objc public var profileKey: Data? {
guard proto.hasProfileKey else {
return nil

18
SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift
Unescape Escape View File

@ -647,15 +647,7 @@ struct SessionProtos_DataMessage {
/// Clears the value of `flags`. Subsequent reads from it will return its default value.
mutating func clearFlags() {_uniqueStorage()._flags = nil}
var expireTimer: UInt32 {
get {return _storage._expireTimer ?? 0}
set {_uniqueStorage()._expireTimer = newValue}
}
/// Returns true if `expireTimer` has been explicitly set.
var hasExpireTimer: Bool {return _storage._expireTimer != nil}
/// Clears the value of `expireTimer`. Subsequent reads from it will return its default value.
mutating func clearExpireTimer() {_uniqueStorage()._expireTimer = nil}
/// optional uint32 expireTimer = 5; // No longer used
var profileKey: Data {
get {return _storage._profileKey ?? Data()}
set {_uniqueStorage()._profileKey = newValue}
@ -2091,7 +2083,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
1: .same(proto: "body"),
2: .same(proto: "attachments"),
4: .same(proto: "flags"),
5: .same(proto: "expireTimer"),
6: .same(proto: "profileKey"),
7: .same(proto: "timestamp"),
8: .same(proto: "quote"),
@ -2108,7 +2099,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
var _body: String? = nil
var _attachments: [SessionProtos_AttachmentPointer] = []
var _flags: UInt32? = nil
var _expireTimer: UInt32? = nil
var _profileKey: Data? = nil
var _timestamp: UInt64? = nil
var _quote: SessionProtos_DataMessage.Quote? = nil
@ -2128,7 +2118,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
_body = source._body
_attachments = source._attachments
_flags = source._flags
_expireTimer = source._expireTimer
_profileKey = source._profileKey
_timestamp = source._timestamp
_quote = source._quote
@ -2172,7 +2161,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
case 1: try { try decoder.decodeSingularStringField(value: &_storage._body) }()
case 2: try { try decoder.decodeRepeatedMessageField(value: &_storage._attachments) }()
case 4: try { try decoder.decodeSingularUInt32Field(value: &_storage._flags) }()
case 5: try { try decoder.decodeSingularUInt32Field(value: &_storage._expireTimer) }()
case 6: try { try decoder.decodeSingularBytesField(value: &_storage._profileKey) }()
case 7: try { try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) }()
case 8: try { try decoder.decodeSingularMessageField(value: &_storage._quote) }()
@ -2204,9 +2192,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
try { if let v = _storage._flags {
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4)
} }()
try { if let v = _storage._expireTimer {
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 5)
} }()
try { if let v = _storage._profileKey {
try visitor.visitSingularBytesField(value: v, fieldNumber: 6)
} }()
@ -2249,7 +2234,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
if _storage._body != rhs_storage._body {return false}
if _storage._attachments != rhs_storage._attachments {return false}
if _storage._flags != rhs_storage._flags {return false}
if _storage._expireTimer != rhs_storage._expireTimer {return false}
if _storage._profileKey != rhs_storage._profileKey {return false}
if _storage._timestamp != rhs_storage._timestamp {return false}
if _storage._quote != rhs_storage._quote {return false}

2
SessionMessagingKit/Protos/SessionProtos.proto
Unescape Escape View File

@ -206,7 +206,7 @@ message DataMessage {
repeated AttachmentPointer attachments = 2;
// optional GroupContext group = 3; // No longer used
optional uint32 flags = 4;
optional uint32 expireTimer = 5;
// optional uint32 expireTimer = 5; // No longer used
optional bytes profileKey = 6;
optional uint64 timestamp = 7;
optional Quote quote = 8;

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

@ -6,132 +6,6 @@ import SessionUIKit
import SessionUtilitiesKit
extension MessageReceiver {
// TODO: Remove this when disappearing messages V2 is up and running
internal static func handleExpirationTimerUpdate(
_ db: Database,
threadId: String,
threadVariant: SessionThread.Variant,
message: ExpirationTimerUpdate
) throws {
guard !Features.useNewDisappearingMessagesConfig else { return }
guard
// Only process these for contact and legacy groups (new groups handle it separately)
(threadVariant == .contact || threadVariant == .legacyGroup),
let sender: String = message.sender
else { throw MessageReceiverError.invalidMessage }
// Generate an updated configuration
//
// Note: Messages which had been sent during the previous configuration will still
// use it's settings (so if you enable, send a message and then disable disappearing
// message then the message you had sent will still disappear)
let maybeDefaultType: DisappearingMessagesConfiguration.DisappearingMessageType? = {
switch (threadVariant, threadId == getUserHexEncodedPublicKey(db)) {
case (.contact, false): return .disappearAfterRead
case (.legacyGroup, _), (.group, _), (_, true): return .disappearAfterSend
case (.community, _): return nil // Shouldn't happen
}
}()
guard let defaultType: DisappearingMessagesConfiguration.DisappearingMessageType = maybeDefaultType else { return }
let defaultDuration: DisappearingMessagesConfiguration.DefaultDuration = {
switch defaultType {
case .unknown: return .unknown
case .disappearAfterRead: return .disappearAfterRead
case .disappearAfterSend: return .disappearAfterSend
}
}()
let localConfig: DisappearingMessagesConfiguration = try DisappearingMessagesConfiguration
.filter(id: threadId)
.fetchOne(db)
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(threadId))
let updatedConfig: DisappearingMessagesConfiguration = localConfig.with(
// If there is no duration then we should disable the expiration timer
isEnabled: ((message.duration ?? 0) > 0),
durationSeconds: (
message.duration.map { TimeInterval($0) } ??
defaultDuration.seconds
),
type: defaultType
)
let timestampMs: Int64 = Int64(message.sentTimestamp ?? 0) // Default to `0` if not set
// Only actually make the change if LibSession says we can (we always want to insert the info
// message though)
let canPerformChange: Bool = LibSession.canPerformChange(
db,
threadId: threadId,
targetConfig: {
switch threadVariant {
case .contact:
let currentUserPublicKey: String = getUserHexEncodedPublicKey(db)
return (threadId == currentUserPublicKey ? .userProfile : .contacts)
default: return .userGroups
}
}(),
changeTimestampMs: timestampMs
)
// Only update libSession if we can perform the change
if canPerformChange {
// Contacts & legacy closed groups need to update the LibSession
switch threadVariant {
case .contact:
try LibSession
.update(
db,
sessionId: threadId,
disappearingMessagesConfig: updatedConfig
)
case .legacyGroup:
try LibSession
.update(
db,
groupPublicKey: threadId,
disappearingConfig: updatedConfig
)
default: break
}
}
// Only save the updated config if we can perform the change
if canPerformChange {
// Finally save the changes to the DisappearingMessagesConfiguration (If it's a duplicate
// then the interaction unique constraint will prevent the code from getting here)
try updatedConfig.save(db)
}
// Add an info message for the user
let currentUserPublicKey: String = getUserHexEncodedPublicKey(db)
_ = try Interaction(
serverHash: nil, // Intentionally null so sync messages are seen as duplicates
threadId: threadId,
threadVariant: threadVariant,
authorId: sender,
variant: .infoDisappearingMessagesUpdate,
body: updatedConfig.messageInfoString(
threadVariant: threadVariant,
senderName: (sender != currentUserPublicKey ? Profile.displayName(db, id: sender) : nil)
),
timestampMs: timestampMs,
wasRead: LibSession.timestampAlreadyRead(
threadId: threadId,
threadVariant: threadVariant,
timestampMs: (timestampMs * 1000),
userPublicKey: currentUserPublicKey,
openGroup: nil
)
).inserted(db)
}
internal static func handleExpirationTimerUpdate(
_ db: Database,
threadId: String,
@ -144,8 +18,7 @@ extension MessageReceiver {
guard
threadVariant != .community,
let sender: String = message.sender,
let timestampMs: UInt64 = message.sentTimestamp,
Features.useNewDisappearingMessagesConfig
let timestampMs: UInt64 = message.sentTimestamp
else { return }
let localConfig: DisappearingMessagesConfiguration = try DisappearingMessagesConfiguration
@ -226,16 +99,5 @@ extension MessageReceiver {
db,
Contact.Columns.lastKnownClientVersion.set(to: version)
)
guard Features.useNewDisappearingMessagesConfig else { return }
if contactId == getUserHexEncodedPublicKey(db) {
switch version {
case .legacyDisappearingMessages:
TopBannerController.show(warning: .outdatedUserConfig)
case .newDisappearingMessages:
TopBannerController.hide()
}
}
}
}

8
SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
Unescape Escape View File

@ -95,7 +95,6 @@ public enum MessageReceiver {
threadIdGenerator = { message in
switch message {
case let message as VisibleMessage: return (message.syncTarget ?? sender)
case let message as ExpirationTimerUpdate: return (message.syncTarget ?? sender)
default: return sender
}
}
@ -283,13 +282,6 @@ public enum MessageReceiver {
)
case let message as ExpirationTimerUpdate:
try MessageReceiver.handleExpirationTimerUpdate(
db,
threadId: threadId,
threadVariant: threadVariant,
message: message
)
try MessageReceiver.handleExpirationTimerUpdate(
db,
threadId: threadId,

1
SessionMessagingKit/Sending & Receiving/MessageSender.swift
Unescape Escape View File

@ -1144,7 +1144,6 @@ public final class MessageSender {
Message.shouldSync(message: message)
{
if let message = message as? VisibleMessage { message.syncTarget = publicKey }
if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey }
dependencies.jobRunner.add(
db,

17
SessionTests/Conversations/Settings/ThreadDisappearingMessagesViewModelSpec.swift
Unescape Escape View File

@ -71,18 +71,10 @@ class ThreadDisappearingMessagesSettingsViewModelSpec: QuickSpec {
// Should only show one section of Disappearing Messages Type
expect(viewModel.tableData.count).to(equal(1))
if Features.useNewDisappearingMessagesConfig {
// Off
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(3))
} else {
// Off
// Legacy
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(4))
}
// Off
// Disappear After Read
// Disappear After Send
expect(viewModel.tableData.first?.elements.count).to(equal(3))
}
// MARK: -- has the correct default state
@ -117,7 +109,6 @@ class ThreadDisappearingMessagesSettingsViewModelSpec: QuickSpec {
rightAccessory: .radio(
isSelected: { false }
),
isEnabled: Features.useNewDisappearingMessagesConfig,
accessibility: Accessibility(
identifier: "Disappear after send option",
label: "Disappear after send option"

4
SessionUIKit/Components/TopBannerController.swift
Unescape Escape View File

@ -5,11 +5,11 @@ import SessionUtilitiesKit
public class TopBannerController: UIViewController {
public enum Warning: String, Codable {
case outdatedUserConfig
case invalid
var text: String {
switch self {
case .outdatedUserConfig: return "USER_CONFIG_OUTDATED_WARNING".localized()
case .invalid: return ""
}
}
}

1
SessionUtilitiesKit/General/Features.swift
Unescape Escape View File

@ -4,5 +4,4 @@ import Foundation
public final class Features {
public static let useTestnet: Bool = false
public static let useNewDisappearingMessagesConfig: Bool = Date().timeIntervalSince1970 > 1710284400
}

Write Preview
Loading…
Cancel
Save