Merge branch 'mkirk/explicit-timer-stop' into hotfix/2.20.2

6 years ago · 20d759dfeb
parent e392febb66 28c30bbe5c
commit 20d759dfeb
2 changed files with 10 additions and 0 deletions
--- 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];
        }
    }

--- 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];
        }
    }