From 9c4ce3d304621686bef02dcfbd26a6bf487a62bc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 12 Jan 2018 09:58:22 -0500 Subject: [PATCH] Exclude contacts from SAE. --- SignalShareExtension/Info.plist | 1 + SignalShareExtension/ShareViewController.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index f3dbf8b677..d5625ede31 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -64,6 +64,7 @@ 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 diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index f79cc1ba7d..442cde6409 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -79,7 +79,7 @@ public class ShareViewController: UINavigationController, ShareViewDelegate, SAE self.loadViewController = loadViewController // Don't display load screen immediately, in hopes that we can avoid it altogether. - after(seconds: 0.5).then { () -> Void in + after(seconds: 0.25).then { () -> Void in guard self.presentedViewController == nil else { Logger.debug("\(self.logTag) setup completed quickly, no need to present load view controller.") return