mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Merge tag '2.20.2.2'
This commit is contained in:
commit
d0bcd8d6c7
2 changed files with 10 additions and 0 deletions
|
@ -61,6 +61,11 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
||||||
[contactBuilder setExpireTimer:disappearingMessagesConfiguration.durationSeconds];
|
[contactBuilder setExpireTimer:disappearingMessagesConfiguration.durationSeconds];
|
||||||
|
} else {
|
||||||
|
// Rather than *not* set the field, we expicitly set it to 0 so desktop
|
||||||
|
// can easily distinguish between a modern client declaring "off" vs a
|
||||||
|
// legacy client "not specifying".
|
||||||
|
[contactBuilder setExpireTimer:0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,11 @@ NS_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
||||||
[groupBuilder setExpireTimer:disappearingMessagesConfiguration.durationSeconds];
|
[groupBuilder setExpireTimer:disappearingMessagesConfiguration.durationSeconds];
|
||||||
|
} else {
|
||||||
|
// Rather than *not* set the field, we expicitly set it to 0 so desktop
|
||||||
|
// can easily distinguish between a modern client declaring "off" vs a
|
||||||
|
// legacy client "not specifying".
|
||||||
|
[groupBuilder setExpireTimer:0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue