From 2fdb62764d3667c2eac0075e2520f962d1c7e6fa Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 26 Jun 2018 17:35:21 -0600 Subject: [PATCH 1/3] avoid occasional "call failure" after local hangup. // FREEBIE --- Signal/src/call/CallService.swift | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index f4bff4cc3..481a2db15 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -1696,6 +1696,15 @@ private class SignalCallData: NSObject { return } + guard !call.isTerminated else { + // There's a brief window between when the callViewController is removed + // and when this timer is terminated. + // + // We don't want to fail a call that's already terminated. + Logger.debug("\(logTag) in \(#function) ignoring screen protection check for already terminated call.") + return + } + if !OWSWindowManager.shared().hasCall() { OWSProdError(OWSAnalyticsEvents.callServiceCallViewCouldNotPresent(), file: #file, function: #function, line: #line) owsFail("\(self.logTag) in \(#function) Call terminated due to missing call view.") From 57e3d0d5f9c528e14f14e34ab77399504827e6d0 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Jun 2018 19:17:25 -0600 Subject: [PATCH 2/3] Revert "Revert "Disable contact sharing."" This reverts commit 91af7d3855451d8de3a57666fc278a136b0f40df. --- SignalServiceKit/src/Messages/Interactions/OWSContact.m | 2 +- SignalShareExtension/Info.plist | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContact.m b/SignalServiceKit/src/Messages/Interactions/OWSContact.m index a05c514b8..9041dcea2 100644 --- a/SignalServiceKit/src/Messages/Interactions/OWSContact.m +++ b/SignalServiceKit/src/Messages/Interactions/OWSContact.m @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN // NOTE: When changing the value of this feature flag, you also need // to update the filtering in the SAE's info.plist. -BOOL kIsSendingContactSharesEnabled = YES; +BOOL kIsSendingContactSharesEnabled = NO; NSString *NSStringForContactPhoneType(OWSContactPhoneType value) { diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index af327b467..c519a6721 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -60,8 +60,11 @@ SUBQUERY ( $extensionItem.attachments, $attachment, + ( ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data" || ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" + ) + AND NOT (ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.vcard") ).@count >= 1 ).@count == 1 From c9181185099b6b640e3cafabe6592e425434cf76 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 28 Jun 2018 19:18:14 -0600 Subject: [PATCH 3/3] "Bump build to 2.27.0.7." --- 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 a23081491..623b378a5 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.27.0.6 + 2.27.0.7 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index c519a6721..2df5fa92c 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.27.0 CFBundleVersion - 2.27.0.6 + 2.27.0.7 ITSAppUsesNonExemptEncryption NSAppTransportSecurity