oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge tag '2.20.2.2'

Browse source
This commit is contained in:
Michael Kirk 2018-03-01 08:52:12 -05:00
parent 13b5336210 2038aff9c4
commit d0bcd8d6c7
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SignalServiceKit/src/Devices/OWSContactsOutputStream.m
View file

@ -61,6 +61,11 @@ NS_ASSUME_NONNULL_BEGIN
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
[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];
}
}

5
SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
View file

@ -42,6 +42,11 @@ NS_ASSUME_NONNULL_BEGIN
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
[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];
}
}