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

fix closed group default disappearing messages settings

This commit is contained in:
Ryan Zhao 2023-09-21 13:59:42 +10:00
parent 66e37cef07
commit 77ceac54e0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
View File

@ -97,7 +97,7 @@ public extension DisappearingMessagesConfiguration {
return DisappearingMessagesConfiguration(
threadId: threadId,
isEnabled: false,
durationSeconds: DefaultDuration.unknown.seconds,
durationSeconds: 0,
type: .unknown,
lastChangeTimestampMs: 0
)

3
SessionMessagingKit/Messages/Message.swift
View File

@ -64,7 +64,8 @@ public class Message: Codable {
return
}
proto.setExpirationTimer(UInt32(disappearingMessagesConfiguration.durationSeconds))
let expireTimer: UInt32 = disappearingMessagesConfiguration.isEnabled ? UInt32(disappearingMessagesConfiguration.durationSeconds) : 0
proto.setExpirationTimer(expireTimer)
proto.setLastDisappearingMessageChangeTimestamp(UInt64(disappearingMessagesConfiguration.lastChangeTimestampMs ?? 0))
if disappearingMessagesConfiguration.isEnabled, let type = disappearingMessagesConfiguration.type {

8
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
View File

@ -190,10 +190,10 @@ extension MessageReceiver {
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id))
.with(
isEnabled: (expirationTimer > 0),
durationSeconds: TimeInterval(expirationTimer > 0 ?
expirationTimer :
(24 * 60 * 60)
)
durationSeconds: (expirationTimer > 0) ?
TimeInterval(expirationTimer) :
DisappearingMessagesConfiguration.DefaultDuration.disappearAfterSend.seconds,
type: .disappearAfterSend
)
.saved(db)