From 7af8cb27c9239969b337a5dd4b69bd7bc672ab23 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 08:19:22 +0200 Subject: [PATCH 1/6] IOS-2791 Use toolbox for extensions --- .../PantomimeFramework.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj index e8acc68..a9b4d2c 100644 --- a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj +++ b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj @@ -164,7 +164,7 @@ 433710E823F5950F0083BAE9 /* NSStream+Options.m in Sources */ = {isa = PBXBuildFile; fileRef = 433710E623F5950F0083BAE9 /* NSStream+Options.m */; }; 43C5D3E223F5530D006487F6 /* NSStream+TLS.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C5D3E023F5530D006487F6 /* NSStream+TLS.h */; }; 43C5D3E323F5530D006487F6 /* NSStream+TLS.m in Sources */ = {isa = PBXBuildFile; fileRef = 43C5D3E123F5530D006487F6 /* NSStream+TLS.m */; }; - 43F12C6C2527720100B746C7 /* pEpIOSToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */; }; + 43FD718A26411ED900D823B6 /* pEpIOSToolboxForExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -343,6 +343,7 @@ 43C5D3E023F5530D006487F6 /* NSStream+TLS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSStream+TLS.h"; sourceTree = ""; }; 43C5D3E123F5530D006487F6 /* NSStream+TLS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSStream+TLS.m"; sourceTree = ""; }; 43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = pEpIOSToolboxForExtensions.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -350,7 +351,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 43F12C6C2527720100B746C7 /* pEpIOSToolbox.framework in Frameworks */, + 43FD718A26411ED900D823B6 /* pEpIOSToolboxForExtensions.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -620,6 +621,7 @@ 43A3C6D625028F9100CA29BA /* Frameworks */ = { isa = PBXGroup; children = ( + 43FD718926411ED900D823B6 /* pEpIOSToolboxForExtensions.framework */, 43F12C6B2527720100B746C7 /* pEpIOSToolbox.framework */, ); name = Frameworks; From b86e990fde9d95b87116a950815ad661aa8d5b97 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 13:43:02 +0200 Subject: [PATCH 2/6] IOS-2791 Import the tb4ext logger --- pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m index 95ed25b..c5439be 100644 --- a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m +++ b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m @@ -12,7 +12,7 @@ #import #import "CWThreadSafeArray.h" -#import +#import #import "NSData+Extensions.h" @implementation CWSMTP (Protected) From 8cee76f7819b79359ffe625c3cad77cbe5375d38 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 13:45:28 +0200 Subject: [PATCH 3/6] IOS-2791 Revert "Import the tb4ext logger" This reverts commit b86e990fde9d95b87116a950815ad661aa8d5b97. --- pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m index c5439be..95ed25b 100644 --- a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m +++ b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m @@ -12,7 +12,7 @@ #import #import "CWThreadSafeArray.h" -#import +#import #import "NSData+Extensions.h" @implementation CWSMTP (Protected) From b971a7c1c8c1bc11fd8d72191ea2c49cdda27838 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 14:43:40 +0200 Subject: [PATCH 4/6] IOS-2791 Import the tb4ext logger --- pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m index 95ed25b..d9fb8fe 100644 --- a/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m +++ b/pantomime-lib/Framework/Pantomime/CWSMTP+Protected.m @@ -12,7 +12,7 @@ #import #import "CWThreadSafeArray.h" -#import +#import #import "NSData+Extensions.h" @implementation CWSMTP (Protected) From 9f67887b478bc985b19716908f7495c1e1deed6d Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 14:53:01 +0200 Subject: [PATCH 5/6] IOS-2791 Import the tb4ext logger --- pantomime-lib/Framework/Pantomime/CWIMAPFolder.m | 2 +- pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m | 2 +- pantomime-lib/Framework/Pantomime/CWIMAPStore.m | 2 +- pantomime-lib/Framework/Pantomime/CWParser.m | 2 +- pantomime-lib/Framework/Pantomime/CWSMTP.m | 2 +- pantomime-lib/Framework/Pantomime/CWService.m | 2 +- pantomime-lib/Framework/Pantomime/CWTCPConnection.h | 2 +- pantomime-lib/Framework/Pantomime/CWTCPConnection.m | 2 +- pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m b/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m index 2cceb2e..102a5d9 100644 --- a/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m +++ b/pantomime-lib/Framework/Pantomime/CWIMAPFolder.m @@ -27,7 +27,7 @@ #import "CWFlags.h" #import "CWIMAPStore+Protected.h" #import "CWIMAPMessage.h" -#import +#import #import "NSData+Extensions.h" #import "Pantomime/NSString+Extensions.h" diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m b/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m index 48eb11d..8036dca 100644 --- a/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m +++ b/pantomime-lib/Framework/Pantomime/CWIMAPStore+Protected.m @@ -12,7 +12,7 @@ #import "Pantomime/NSString+Extensions.h" #import "CWThreadSafeArray.h" -#import +#import @implementation CWIMAPStore (Protected) diff --git a/pantomime-lib/Framework/Pantomime/CWIMAPStore.m b/pantomime-lib/Framework/Pantomime/CWIMAPStore.m index 5167e33..afe7e9c 100644 --- a/pantomime-lib/Framework/Pantomime/CWIMAPStore.m +++ b/pantomime-lib/Framework/Pantomime/CWIMAPStore.m @@ -22,7 +22,7 @@ #import "CWIMAPStore+Protected.h" -#import +#import #import "CWConstants.h" #import "CWFlags.h" #import "Pantomime/CWFolderInformation.h" diff --git a/pantomime-lib/Framework/Pantomime/CWParser.m b/pantomime-lib/Framework/Pantomime/CWParser.m index e1bbef9..0dacfc9 100644 --- a/pantomime-lib/Framework/Pantomime/CWParser.m +++ b/pantomime-lib/Framework/Pantomime/CWParser.m @@ -24,7 +24,7 @@ #import -#import +#import #import "CWConstants.h" #import "CWFlags.h" diff --git a/pantomime-lib/Framework/Pantomime/CWSMTP.m b/pantomime-lib/Framework/Pantomime/CWSMTP.m index e557dc6..798ae99 100644 --- a/pantomime-lib/Framework/Pantomime/CWSMTP.m +++ b/pantomime-lib/Framework/Pantomime/CWSMTP.m @@ -40,7 +40,7 @@ #import "CWOAuthUtils.h" #import "CWService+Protected.h" -#import +#import // The hostname/domain used to do EHLO/HELO static NSString *pEpEHLOBase = @"pretty.Easy.privacy"; diff --git a/pantomime-lib/Framework/Pantomime/CWService.m b/pantomime-lib/Framework/Pantomime/CWService.m index a02f7bc..bcf172b 100644 --- a/pantomime-lib/Framework/Pantomime/CWService.m +++ b/pantomime-lib/Framework/Pantomime/CWService.m @@ -25,7 +25,7 @@ #import "CWConstants.h" #import "NSData+Extensions.h" -#import +#import #import #import diff --git a/pantomime-lib/Framework/Pantomime/CWTCPConnection.h b/pantomime-lib/Framework/Pantomime/CWTCPConnection.h index 99de593..7679cbd 100644 --- a/pantomime-lib/Framework/Pantomime/CWTCPConnection.h +++ b/pantomime-lib/Framework/Pantomime/CWTCPConnection.h @@ -10,7 +10,7 @@ #import "CWConnection.h" -#import +#import @interface CWTCPConnection : NSObject diff --git a/pantomime-lib/Framework/Pantomime/CWTCPConnection.m b/pantomime-lib/Framework/Pantomime/CWTCPConnection.m index a06aff9..401af28 100644 --- a/pantomime-lib/Framework/Pantomime/CWTCPConnection.m +++ b/pantomime-lib/Framework/Pantomime/CWTCPConnection.m @@ -12,7 +12,7 @@ #import "CWTCPConnection.h" -#import +#import #import "NSStream+TLS.h" diff --git a/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m b/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m index 60ed3b8..152c80a 100644 --- a/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m +++ b/pantomime-lib/Framework/Pantomime/Utils/CWThreadSafeArray.m @@ -6,7 +6,7 @@ // Copyright © 2016 pEp Security S.A. All rights reserved. // -#import +#import #import "CWThreadSafeArray.h" From 0fcbcba1439d2c821489ce7d0362c76d0ef31b8e Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Tue, 4 May 2021 15:15:23 +0200 Subject: [PATCH 6/6] IOS-2791 APPLICATION_EXTENSION_API_ONLY = YES --- PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj index a9b4d2c..b754c4b 100644 --- a/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj +++ b/PantomimeFramework/PantomimeFramework.xcodeproj/project.pbxproj @@ -1058,6 +1058,7 @@ 4329CA612238FCBF007D377E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; @@ -1084,6 +1085,7 @@ 4329CA622238FCBF007D377E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES;