From 4d2bbfc54d2a6995570fb3577c85e8911d5b576c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 19 Nov 2018 13:10:59 -0500 Subject: [PATCH 1/3] Fix crash around account attributes update when unregistered. --- SignalServiceKit/src/Account/TSAccountManager.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m index 01b124339..1dd7130e8 100644 --- a/SignalServiceKit/src/Account/TSAccountManager.m +++ b/SignalServiceKit/src/Account/TSAccountManager.m @@ -649,6 +649,10 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa } - (AnyPromise *)updateAccountAttributesIfNecessary { + if (!self.isRegistered) { + return [AnyPromise promiseWithValue:@(1)]; + } + NSDate *_Nullable updateRequestDate = [self.dbConnection objectForKey:TSAccountManager_NeedsAccountAttributesUpdateKey inCollection:TSAccountManager_UserAccountCollection]; From 221d280e41f4e61b564c3f88ede22751b1d2bada Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 19 Nov 2018 13:18:55 -0500 Subject: [PATCH 2/3] "Bump build to 2.31.0.39." --- 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 0d741ac9d..5593fd41a 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 2.31.0.38 + 2.31.0.39 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 32abfbd4a..79859221b 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.31.0 CFBundleVersion - 2.31.0.38 + 2.31.0.39 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From bfbf9d39adbeb9257e1d3eff317aaf521b4cfb82 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 19 Nov 2018 14:43:27 -0500 Subject: [PATCH 3/3] Update Cocoapods. --- Podfile.lock | 2 +- Pods | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 89bf0fe63..69667daec 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -268,7 +268,7 @@ CHECKOUT OPTIONS: :commit: b60dc7d58dfc93ca6eafbb3ea5300c6d67ebc69a :git: https://github.com/signalapp/SignalCoreKit.git SignalMetadataKit: - :commit: a5473c8d33602775e00253afce78eef01a69260e + :commit: b493b7b0db57902dc766a50ca97d2202453ba512 :git: https://github.com/signalapp/SignalMetadataKit SocketRocket: :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69 diff --git a/Pods b/Pods index 766456e36..5fface14b 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 766456e3637a2e07d40c5a0a6bfd68d611ab7bd4 +Subproject commit 5fface14b1bed97e4b7686947f1a24953700ac26