merge 1.1.250

pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme

@@ -4,8 +4,36 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1552DB102577D4F100A92F71"
+               BuildableName = "libpEpEngine_macOS.a"
+               BlueprintName = "pEpEngine_macOS"
+               ReferencedContainer = "container:../pEpEngine/build-mac/pEpEngine.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "150E8FB125755B6900AE2198"
+               BuildableName = "libPEPObjCAdapterTypes_macOS.a"
+               BlueprintName = "PEPObjCAdapterTypes_macOS"
+               ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"

pEpObjCAdapter/PEPObjCAdapter.m

@@ -31,10 +31,7 @@ const PEP_decrypt_flags PEP_decrypt_flag_none = 0x0;
  */
 static NSString * const s_pEpHomeComponent = @"pEp_home";
 
-#if TARGET_OS_IPHONE
-// marked for iOS to think about what we want on macOS
 const char* _Nullable perMachineDirectory = NULL;
-#endif
 
 NSURL *s_homeURL;
 
@@ -138,8 +135,8 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
 #if TARGET_OS_IPHONE
     [self setPerMachineDirectory:[self homeURL]];
 #else
-    NSURL *perMachineDirMac = [[NSURL alloc] initWithString:@"/Library/Application Support/pEp"];
-    [self setPerMachineDirectory:perMachineDirMac];
+    NSURL *macPerMachineDir = [[NSURL alloc] initWithString:[@"/Library/Application Support/pEp" stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet]];
+    [self setPerMachineDirectory:macPerMachineDir];
 #endif
 }
 
@@ -147,7 +144,7 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
  Looks up the shared directory for pEp apps under iOS and makes sure it exists.
 
  @return A URL pointing a pEp directory in the app container.
-*/
+ */
 #ifdef IS_IOS_BUILD
 + (NSURL *)createApplicationDirectoryiOS
 {
@@ -208,12 +205,10 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
  */
 + (void)setPerMachineDirectory:(NSURL *)perMachineDir
 {
-#if TARGET_OS_IPHONE
     if (perMachineDirectory) {
         free((void *) perMachineDirectory); //BUFF: DIRK??
     }
     perMachineDirectory = strdup([perMachineDir path].UTF8String);
-#endif
 }
 
 + (void)copyAssetsIntoDocumentsDirectory:(NSBundle *)srcBundle
@@ -245,7 +240,6 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
 }
 
 + (void)setupTrustWordsDB:(NSBundle *)rootBundle {
-// iOS to force us to think about macOS
 #if TARGET_OS_IPHONE
     [PEPObjCAdapter copyAssetsIntoDocumentsDirectory:rootBundle
                                             fileName:@"system.db"];