From 626573a8a9466a74336b81b532d98de15cb1a741 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 7 Jun 2018 16:08:05 -0600 Subject: [PATCH] Revert "Revert "Disable contact sharing."" This reverts commit 6e0d92e039ca34c72c9236f52e65f7297a2177dd. --- 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 3e64f3024..abee9a064 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