C++ bridge

pEpMacOSAdapter.xcodeproj/project.pbxproj

@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		35380AE7247BD13A004A08A6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 35380AE6247BD13A004A08A6 /* README.md */; };
-		35380AEA247C784E004A08A6 /* pEpUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.m */; };
+		35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
 		35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */; };
 		35DC18DA244DA19100FB2002 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D9244DA19100FB2002 /* main.m */; };
 /* End PBXBuildFile section */
@@ -27,7 +27,7 @@
 		35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = downloadclient.xcodeproj; path = ../downloadclient/downloadclient/downloadclient.xcodeproj; sourceTree = "<group>"; };
 		35380AE6247BD13A004A08A6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		35380AE8247C784E004A08A6 /* pEpUpdater.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpUpdater.h; sourceTree = "<group>"; };
-		35380AE9247C784E004A08A6 /* pEpUpdater.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpUpdater.m; sourceTree = "<group>"; };
+		35380AE9247C784E004A08A6 /* pEpUpdater.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = pEpUpdater.mm; sourceTree = "<group>"; };
 		35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = pEpMacOSAdapter.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
 		35DC18D5244DA19100FB2002 /* pEpMacOSAdapterProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapterProtocol.h; sourceTree = "<group>"; };
 		35DC18D6244DA19100FB2002 /* pEpMacOSAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapter.h; sourceTree = "<group>"; };
@@ -82,7 +82,7 @@
 				35DC18D9244DA19100FB2002 /* main.m */,
 				35DC18DB244DA19100FB2002 /* Info.plist */,
 				35380AE8247C784E004A08A6 /* pEpUpdater.h */,
-				35380AE9247C784E004A08A6 /* pEpUpdater.m */,
+				35380AE9247C784E004A08A6 /* pEpUpdater.mm */,
 			);
 			path = pEpMacOSAdapter;
 			sourceTree = "<group>";
@@ -171,7 +171,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				35380AEA247C784E004A08A6 /* pEpUpdater.m in Sources */,
+				35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */,
 				35DC18DA244DA19100FB2002 /* main.m in Sources */,
 				35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */,
 			);

pEpMacOSAdapter/pEpUpdater.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 -(id)init;
 -(void)updateAll:(NSTimer*)timer;
+-(void)update:(NSString*)name usingUrl:(NSString*)url;
 
 @end
 

pEpMacOSAdapter/pEpUpdater.m

@@ -1,31 +0,0 @@
-//
-//  pEpUpdater.m
-//  pEpMacOSAdapter
-//
-//  Created by Volker Birk on 26.05.20.
-//  Copyright © 2020 p≡p foundation. All rights reserved.
-//
-
-#import "pEpUpdater.h"
-
-@implementation pEpUpdater
-
-const double CYCLE = 7200.0;
-
--(id)init
-{
-    self = [super init];
-    
-    if (self) {
-        [NSTimer scheduledTimerWithTimeInterval:CYCLE target:self selector:@selector(updateAll:) userInfo:nil repeats:YES];
-    }
-    
-    return self;
-}
-
--(void)updateAll:(NSTimer*)timer
-{
-    // update all registered products
-}
-
-@end

pEpMacOSAdapter/pEpUpdater.mm

@@ -0,0 +1,54 @@
+//
+//  pEpUpdater.m
+//  pEpMacOSAdapter
+//
+//  Created by Volker Birk on 26.05.20.
+//  Copyright © 2020 p≡p foundation. All rights reserved.
+//
+
+#import "pEpUpdater.h"
+#include "../../downloadclient/downloadclient.hh"
+
+@implementation pEpUpdater
+
+const double CYCLE = 7200.0; // 7200 seconds = 2 hours
+NSString* configPath = @"/Library/Application Support/pEp/Updater";
+
+-(id)init
+{
+    self = [super init];
+    
+    if (self) {
+        [NSTimer scheduledTimerWithTimeInterval:CYCLE target:self selector:@selector(updateAll:) userInfo:nil repeats:YES];
+    }
+    
+    return self;
+}
+
+-(void)updateAll:(NSTimer*)timer
+{
+    // update all registered products
+    
+    NSFileManager *localFileManager=[[NSFileManager alloc] init];
+    NSDirectoryEnumerator *dirEnum = [localFileManager enumeratorAtPath:configPath];
+     
+    NSString *configFile;
+    while (dirEnum && (configFile = [dirEnum nextObject])) {
+        if ([[configFile pathExtension] isEqualToString: @"plist"]) {
+            
+        }
+    }
+}
+
+-(void)update:(NSString*)name usingUrl:(NSString*)url
+{
+    pEp::UpdateClient::product p = { name.UTF8String, url.UTF8String };
+    std::string keyfile = name.UTF8String;
+    keyfile += ".der";
+    try {
+        pEp::UpdateClient::update(p, keyfile);
+    }
+    catch (std::exception&) { }
+}
+
+@end