From 0ad9e6cac8fffd70a7aec059772cf85d9ed8dc80 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Jun 2018 14:49:27 -0400 Subject: [PATCH 1/3] Default share app context's default application state to active. --- SignalShareExtension/utils/ShareAppExtensionContext.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index b7baa134d..35dec6ddc 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN _rootViewController = rootViewController; - self.reportedApplicationState = UIApplicationStateInactive; + self.reportedApplicationState = UIApplicationStateActive; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(extensionHostDidBecomeActive:) From bb266d03e4fbf09c793706b192a0ab3d10c817e7 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Jun 2018 15:09:05 -0400 Subject: [PATCH 2/3] Preserve default scroll state until conversation view is presented. --- .../ConversationView/ConversationViewController.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ac1b53cc4..861314ec2 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -4115,7 +4115,9 @@ typedef enum : NSUInteger { self.scrollDownButton.frame = newButtonFrame; // Adjust content offset to prevent the presented keyboard from obscuring content. - if (wasScrolledToBottom) { + if (!self.viewHasEverAppeared) { + [self scrollToDefaultPosition]; + } else if (wasScrolledToBottom) { // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom. [self scrollToBottomAnimated:NO]; } else { From 0eb653897ee5a1d28a7cafaac376e1eb4f0bb30e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 11 Jun 2018 15:18:41 -0400 Subject: [PATCH 3/3] "Bump build to 2.26.0.22." --- 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 4c8b2bef1..6e13d6df6 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.26.0.21 + 2.26.0.22 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 209872110..abfc82901 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.26.0 CFBundleVersion - 2.26.0.21 + 2.26.0.22 ITSAppUsesNonExemptEncryption NSAppTransportSecurity