From 28c30bbe5c3c906cbc22d4a06ff4ff6f31dfc5a5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Feb 2018 20:04:25 -0500 Subject: [PATCH 1/2] Be explicit when disappearing messages are disabled // FREEBIE --- SignalServiceKit/src/Devices/OWSContactsOutputStream.m | 5 +++++ SignalServiceKit/src/Devices/OWSGroupsOutputStream.m | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m index 9b6fb8f6f..e542c602e 100644 --- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m @@ -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]; } } diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m index 0960bb163..8aa15079b 100644 --- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m @@ -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]; } } From 2038aff9c4a4927a9e10ea3dba836c90f9d07481 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Feb 2018 20:18:26 -0500 Subject: [PATCH 2/2] "Bump build to 2.20.2.2." --- Signal/Signal-Info.plist | 2 +- SignalShareExtension/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4e9559c84..a63a003af 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.20.2.1 + 2.20.2.2 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 7b324d1f4..f566c8e23 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.20.2 CFBundleVersion - 2.20.2.1 + 2.20.2.2 ITSAppUsesNonExemptEncryption NSAppTransportSecurity