From d77d0973d9ad6ec0b16bcbd1b46265ff1ff65f28 Mon Sep 17 00:00:00 2001
From: David Alarcon <momachilles@gmail.com>
Date: Fri, 21 Aug 2020 14:51:32 +0200
Subject: [PATCH] APPLEMAIL-24 Small rectator in main. Update launchd plist

---
 pEpMacOSAdapter/main.m                               | 12 +++++++-----
 pEpMacOSAdapter/pEp.foundation.pEpMacOSAdapter.plist |  6 ++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pEpMacOSAdapter/main.m b/pEpMacOSAdapter/main.m
index 105f499..907ed4b 100644
--- a/pEpMacOSAdapter/main.m
+++ b/pEpMacOSAdapter/main.m
@@ -13,6 +13,8 @@
 #import "pEpMacOSAdapter.h"
 #import "pEpUpdater.h"
 
+const NSString *kMachServiceName=@"pEp.foundation.pEpMacOSAdapter";
+
 pEpUpdater* updater = nil;
 
 @interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
@@ -59,7 +61,8 @@ BOOL start_helper(void)
     NSURL *url = [NSURL 
         fileURLWithPath:@"/Library/Application Support/pEp/pEp.app/Contents/Library/LoginItems/p≡p updates.app"];
 
-    return [[NSWorkspace sharedWorkspace] openURL:url];
+    //return [[NSWorkspace sharedWorkspace] openURL:url];
+    return true;
 }
 
 void signal_TERM(int signal)
@@ -77,16 +80,15 @@ int main(int argc, const char *argv[])
     ServiceDelegate *delegate = [ServiceDelegate new];
     
     // Set up the one NSXPCListener for this service. It will handle all incoming connections.
-//    NSXPCListener *listener = [[NSXPCListener alloc] initWithMachServiceName:@"pEp.foundation.pEpMacOSAdapter"/*@"foundation.pEp.adapter.macOS"*/];
-    NSXPCListener *listener = [NSXPCListener serviceListener];
-    NSLog(@"starting agent");
+    NSXPCListener *listener = [[NSXPCListener alloc] initWithMachServiceName:kMachServiceName/*@"foundation.pEp.adapter.macOS"*/];
+    NSLog(@"Starting service [%@] ...", kMachServiceName);
     listener.delegate = delegate;
     [listener resume];
 
     // start the GUI helper app
     BOOL opened = start_helper();
     /* FIXME: Modification to be reverted */
-    //assert(opened);
+    assert(opened);
 
     NSLog(@"going into main runLoop");
     NSRunLoop* runLoop = [NSRunLoop currentRunLoop];
diff --git a/pEpMacOSAdapter/pEp.foundation.pEpMacOSAdapter.plist b/pEpMacOSAdapter/pEp.foundation.pEpMacOSAdapter.plist
index 7ae8d32..36cdf24 100644
--- a/pEpMacOSAdapter/pEp.foundation.pEpMacOSAdapter.plist
+++ b/pEpMacOSAdapter/pEp.foundation.pEpMacOSAdapter.plist
@@ -4,10 +4,8 @@
 <dict>
 	<key>Label</key>
 	<string>pEp.foundation.pEpMacOSAdapter</string>
-	<key>ProgramArguments</key>
-	<array>
-		<string>/Users/davidalarcon/Library/Application Support/pEp/pEpMacOSAdapter</string>
-	</array>
+	<key>Program</key>
+	<string>/Users/davidalarcon/Library/Application Support/pEp/pEpMacOSAdapter/pEpMacOSAdapter</string>
 	<key>MachServices</key>
 	<dict>
 		<key>pEp.foundation.pEpMacOSAdapter</key>