From 7df69f84da6f256242f432abc6abfcb7df98f84f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 31 Jan 2019 16:04:23 -0500 Subject: [PATCH 1/6] "Bump build to 2.35.0.8." --- 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 70131187e..c98587023 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.35.0.7 + 2.35.0.8 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 947b2a045..0a98663b7 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.35.0 CFBundleVersion - 2.35.0.7 + 2.35.0.8 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 2d55ff096e89bbab8911a9859aab01efab656843 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Feb 2019 10:44:56 -0500 Subject: [PATCH 2/6] Require app to launch in portrait orientation. --- Signal/Signal-Info.plist | 2 -- 1 file changed, 2 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index c98587023..4253ebb6e 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -148,8 +148,6 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance From 4a56c1c0502afe3220d142b494629b25e6d83845 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Feb 2019 11:24:10 -0500 Subject: [PATCH 3/6] "Bump build to 2.35.0.9." --- 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 4253ebb6e..f1e4db9f4 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.35.0.8 + 2.35.0.9 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 0a98663b7..28f0bc26a 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.35.0 CFBundleVersion - 2.35.0.8 + 2.35.0.9 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From 5f59623254844d7c01277164965628077e6a532d Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 1 Feb 2019 09:34:45 -0700 Subject: [PATCH 4/6] fix CDS for iOS9 --- SignalServiceKit/src/Contacts/ContactDiscoveryService.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m index a14920e26..2153936bd 100644 --- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m +++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "ContactDiscoveryService.h" @@ -390,7 +390,7 @@ NSErrorDomain const ContactDiscoveryServiceErrorDomain = @"SignalServiceKit.Cont } NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response; NSArray *cookies = - [NSHTTPCookie cookiesWithResponseHeaderFields:httpResponse.allHeaderFields forURL:[NSURL new]]; + [NSHTTPCookie cookiesWithResponseHeaderFields:httpResponse.allHeaderFields forURL:httpResponse.URL]; if (cookies.count < 1) { OWSFailDebug(@"couldn't parse cookie."); return nil; From dd506430d9801122aae8540036b80c8fc8fdc75f Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Feb 2019 17:00:37 -0500 Subject: [PATCH 5/6] Fix the input toolbar border. --- .../ConversationInputToolbar.m | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index cf8a30e3f..974b97746 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -196,8 +196,6 @@ const CGFloat kMaxTextViewHeight = 98; const CGFloat vStackRounding = 18.f; UIView *vStackWrapper = [UIView containerView]; vStackWrapper.layer.cornerRadius = vStackRounding; - vStackWrapper.layer.borderColor = Theme.secondaryColor.CGColor; - vStackWrapper.layer.borderWidth = CGHairlineWidth(); vStackWrapper.clipsToBounds = YES; [vStackWrapper addSubview:vStack]; [vStack ows_autoPinToSuperviewEdges]; @@ -231,6 +229,23 @@ const CGFloat kMaxTextViewHeight = 98; self.hStack.preservesSuperviewLayoutMargins = NO; self.preservesSuperviewLayoutMargins = NO; + // Border + // + // The border must reside _outside_ of vStackWrapper so + // that it doesn't run afoul of its clipping, so we can't + // use addBorderViewWithColor. + UIView *borderView = [UIView new]; + borderView.userInteractionEnabled = NO; + borderView.backgroundColor = UIColor.clearColor; + borderView.opaque = NO; + borderView.layer.borderColor = Theme.secondaryColor.CGColor; + borderView.layer.borderWidth = CGHairlineWidth(); + borderView.layer.cornerRadius = vStackRounding; + [self addSubview:borderView]; + [borderView autoPinToEdgesOfView:vStackWrapper]; + [borderView setCompressionResistanceLow]; + [borderView setContentHuggingLow]; + [self ensureShouldShowVoiceMemoButtonAnimated:NO doLayout:NO]; } From feebd551eeb28948f158eeb6ac241e078833df4c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 1 Feb 2019 17:18:09 -0500 Subject: [PATCH 6/6] "Bump build to 2.35.0.10." --- 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 f1e4db9f4..5188c6eac 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -47,7 +47,7 @@ CFBundleVersion - 2.35.0.9 + 2.35.0.10 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 28f0bc26a..0602a4b3f 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.35.0 CFBundleVersion - 2.35.0.9 + 2.35.0.10 ITSAppUsesNonExemptEncryption NSAppTransportSecurity