From b48452a7470be0d0996b3d3f1fe50fc0d9371ca0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Feb 2018 16:25:37 -0500 Subject: [PATCH 1/3] Fix group-sync disabling disappearing timer Must add properties *before* build // FREEBIE --- SignalServiceKit/src/Devices/OWSGroupsOutputStream.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m index ac9750049..0960bb163 100644 --- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m @@ -35,11 +35,6 @@ NS_ASSUME_NONNULL_BEGIN [groupBuilder setAvatarBuilder:avatarBuilder]; } - NSData *groupData = [[groupBuilder build] data]; - uint32_t groupDataLength = (uint32_t)groupData.length; - [self.delegateStream writeRawVarint32:groupDataLength]; - [self.delegateStream writeRawData:groupData]; - TSGroupThread *_Nullable groupThread = [TSGroupThread threadWithGroupId:group.groupId transaction:transaction]; if (groupThread) { OWSDisappearingMessagesConfiguration *_Nullable disappearingMessagesConfiguration = @@ -50,6 +45,12 @@ NS_ASSUME_NONNULL_BEGIN } } + NSData *groupData = [[groupBuilder build] data]; + uint32_t groupDataLength = (uint32_t)groupData.length; + + [self.delegateStream writeRawVarint32:groupDataLength]; + [self.delegateStream writeRawData:groupData]; + if (avatarPng) { [self.delegateStream writeRawData:avatarPng]; } From be68e0537b054582c6d1f126b41cf0bee1c3bfb2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Feb 2018 16:40:44 -0500 Subject: [PATCH 2/3] bump version // FREEBIE --- Signal/Signal-Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index de379f271..3032bbb8f 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.20.1 + 2.20.2 CFBundleSignature ???? CFBundleURLTypes @@ -38,7 +38,7 @@ CFBundleVersion - 2.20.1.1 + 2.20.2.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 8d452f603..eb32ab834 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.20.1 + 2.20.2 CFBundleVersion - 2.20.1.1 + 2.20.2.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From e392febb666688c82a7e358a0940b0775c3c7eef Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 28 Feb 2018 17:04:29 -0500 Subject: [PATCH 3/3] "Bump build to 2.20.2.1." --- 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 3032bbb8f..4e9559c84 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.20.2.0 + 2.20.2.1 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index eb32ab834..7b324d1f4 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.20.2 CFBundleVersion - 2.20.2.0 + 2.20.2.1 ITSAppUsesNonExemptEncryption NSAppTransportSecurity