From 8706d8f5994f3361e9776f74105a93673b5810af Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 30 Nov 2017 12:50:48 -0500 Subject: [PATCH 1/2] Update share extension capabilities. --- Signal.xcodeproj/project.pbxproj | 19 +++++++++++++++++++ SignalShareExtension/Info.plist | 2 +- .../SignalShareExtension.entitlements | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 SignalShareExtension/SignalShareExtension.entitlements diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 653cdb347..6c4ee67d9 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -509,6 +509,7 @@ 3497DBEE1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DomainFrontingCountryViewController.m; sourceTree = ""; }; 34B0796B1FCF46B000E248C2 /* MainAppContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainAppContext.m; sourceTree = ""; }; 34B0796C1FCF46B000E248C2 /* MainAppContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainAppContext.h; sourceTree = ""; }; + 34B0796E1FD07B1E00E248C2 /* SignalShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SignalShareExtension.entitlements; sourceTree = ""; }; 34B3F8341E8DF1700035BE1A /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = ""; }; 34B3F8351E8DF1700035BE1A /* AboutTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutTableViewController.m; sourceTree = ""; }; 34B3F8361E8DF1700035BE1A /* AdvancedSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedSettingsTableViewController.h; sourceTree = ""; }; @@ -1328,6 +1329,7 @@ 453518691FC635DD00210559 /* SignalShareExtension */ = { isa = PBXGroup; children = ( + 34B0796E1FD07B1E00E248C2 /* SignalShareExtension.entitlements */, 4535186A1FC635DD00210559 /* ShareViewController.swift */, 4535186C1FC635DD00210559 /* MainInterface.storyboard */, 4535186F1FC635DD00210559 /* Info.plist */, @@ -2045,6 +2047,20 @@ CreatedOnToolsVersion = 9.2; DevelopmentTeam = U68MSDN6DR; ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.ApplicationGroups.iOS = { + enabled = 1; + }; + com.apple.DataProtection = { + enabled = 1; + }; + com.apple.Keychain = { + enabled = 1; + }; + com.apple.iCloud = { + enabled = 0; + }; + }; }; 453518911FC63DBF00210559 = { CreatedOnToolsVersion = 9.2; @@ -3106,6 +3122,7 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_ENTITLEMENTS = SignalShareExtension/SignalShareExtension.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; @@ -3161,6 +3178,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = SignalShareExtension/SignalShareExtension.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; @@ -3222,6 +3240,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = SignalShareExtension/SignalShareExtension.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 3aed352b2..ebc3990a1 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - SignalShareExtension + Signal CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/SignalShareExtension/SignalShareExtension.entitlements b/SignalShareExtension/SignalShareExtension.entitlements new file mode 100644 index 000000000..0183dc1dc --- /dev/null +++ b/SignalShareExtension/SignalShareExtension.entitlements @@ -0,0 +1,16 @@ + + + + + com.apple.developer.default-data-protection + NSFileProtectionComplete + com.apple.security.application-groups + + group.org.whispersystems.signal.group + + keychain-access-groups + + $(AppIdentifierPrefix)org.whispersystems.signal + + + From f896bf99d57ffb5258ad26ff0cb03b6f0562af33 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 30 Nov 2017 12:56:43 -0500 Subject: [PATCH 2/2] Update share extension capabilities. --- Signal.xcodeproj/project.pbxproj | 12 ++++++------ Signal/Signal-Info.plist | 8 ++++---- SignalShareExtension/Info.plist | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 6c4ee67d9..bdda051ed 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -3138,13 +3138,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.SignalShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.shareextension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -3199,13 +3199,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.SignalShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.shareextension; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; VALIDATE_PRODUCT = YES; }; name = Test; @@ -3261,13 +3261,13 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.SignalShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.signal.shareextension; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; VALIDATE_PRODUCT = YES; }; name = "App Store Release"; diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 7a6be1dc8..409567c78 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.19.1 + 2.20.0 CFBundleSignature ???? CFBundleURLTypes @@ -55,7 +55,7 @@ CFBundleVersion - 2.19.1.0 + 2.20.0.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL @@ -101,10 +101,10 @@ Signal uses your contacts to find users you know. We do not store your contacts on the server. NSMicrophoneUsageDescription Signal needs access to your microphone to make and receive phone calls and record voice messages. - NSPhotoLibraryUsageDescription - Signal will let you choose which photos from your library to send. NSPhotoLibraryAddUsageDescription Signal will save photos to your library. + NSPhotoLibraryUsageDescription + Signal will let you choose which photos from your library to send. UIAppFonts dripicons-v2.ttf diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index ebc3990a1..04addb985 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0 + 2.20.0 CFBundleVersion - 1 + 2.20.0.0 NSExtension NSExtensionAttributes