Browse Source
APPLEMAIL-33 Refactor PEPUpdatesXPCService. Add PEPNotificationXPCService. Delete unused code in pEpMacOSAdapter.
APPLEMAIL-33
David Alarcon
2 years ago
24 changed files with 312 additions and 568 deletions
Split View
Diff Options
-
+92 -6Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService.xcodeproj/project.pbxproj
-
+25 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCApiClient/Interface/PEPNotificationApiClientService.h
-
+77 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCApiClient/XPCService/PEPNotificationApiClientService.m
-
+5 -1Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/Interface/PEPNotificationXPCService.h
-
+21 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/Interface/PEPNotificationXPCServiceDelegate.h
-
+21 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCApi.h
-
+44 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCApi.m
-
+15 -23Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
-
+7 -1Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/Shared/PEPNotificationXPCApiProtocol.h
-
+0 -13Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
-
+1 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdateDownloadXPCService/PEPUpdateDownloadXPCService/Interface/PEPUpdateDownloadXPCService.h
-
+3 -32Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdateDownloadXPCService/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.m
-
+0 -0Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/Shared/PEPUpdateDownloader.h
-
+0 -78pEpMacOSAdapter.xcodeproj/project.pbxproj
-
+0 -30pEpMacOSAdapter/PEPNotificationXPCService/Interface/PEPNotificationXPCApiProtocol.h
-
+0 -20pEpMacOSAdapter/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.h
-
+0 -13pEpMacOSAdapter/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
-
+0 -35pEpMacOSAdapter/PEPUpdateDownloadXPCService/Interface/PEPUpdateDownloadXPCApiProtocol.h
-
+0 -43pEpMacOSAdapter/PEPUpdateDownloadXPCService/PEPUpdateDownloader.h
-
+0 -147pEpMacOSAdapter/PEPUpdateDownloadXPCService/PEPUpdateDownloader.mm
-
+0 -19pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.h
-
+0 -67pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.m
-
+0 -20pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCService.h
-
+1 -20pEpMacOSAdapter/main.m
+ 92
- 6
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService.xcodeproj/project.pbxproj
View File
+ 25
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCApiClient/Interface/PEPNotificationApiClientService.h
View File
| @ -0,0 +1,25 @@ | |||
| // | |||
| // PEPNotificationApiClientService.h | |||
| // PEPUpdatesXPCService | |||
| // | |||
| // Created by David Alarcon on 11/2/21. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| #import "PEPNotificationXPCApiProtocol.h" | |||
| @class PEPUpdateDownloader; | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface PEPNotificationApiClientService : NSObject <PEPNotificationXPCApiProtocol> | |||
| - (instancetype)initWithListenerEndpoint:(NSXPCListenerEndpoint *)endpoint | |||
| updateDownloader:(PEPUpdateDownloader *)updateDownloader; | |||
| - (void)start ; | |||
| - (void)stop; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 77
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCApiClient/XPCService/PEPNotificationApiClientService.m
View File
| @ -0,0 +1,77 @@ | |||
| // | |||
| // PEPNotificationApiClientService.m | |||
| // PEPUpdatesXPCService | |||
| // | |||
| // Created by David Alarcon on 11/2/21. | |||
| // | |||
| #import "PEPNotificationApiClientService.h" | |||
| #import "PEPUpdateDownloader.h" | |||
| @interface PEPNotificationApiClientService () | |||
| @property (nonatomic) NSXPCConnection *connection; | |||
| @property (nonatomic) id<PEPNotificationXPCApiProtocol> pEpDownloadNotification; | |||
| @property (nonatomic) NSXPCListenerEndpoint *endpoint; | |||
| @property (nonatomic) PEPUpdateDownloader *updateDownloader; | |||
| @end | |||
| @implementation PEPNotificationApiClientService | |||
| - (instancetype)initWithListenerEndpoint:(NSXPCListenerEndpoint *)endpoint | |||
| updateDownloader:(PEPUpdateDownloader *)updateDownloader { | |||
| if (self = [self init]) { | |||
| _endpoint = endpoint; | |||
| _updateDownloader = updateDownloader; | |||
| } | |||
| return self; | |||
| } | |||
| - (void)start { | |||
| [self connectToXPCService]; | |||
| } | |||
| - (void)stop { | |||
| self.connection = nil; | |||
| } | |||
| // MARK: - Private | |||
| - (void)connectToXPCService { | |||
| self.connection = [[NSXPCConnection alloc] initWithListenerEndpoint:self.endpoint]; | |||
| NSXPCInterface *remoteObjectInterface = [NSXPCInterface interfaceWithProtocol:@protocol(PEPNotificationXPCApiProtocol)]; | |||
| self.connection.remoteObjectInterface = remoteObjectInterface; | |||
| __weak typeof(self) weakSelf = self; | |||
| self.connection.invalidationHandler = ^{ | |||
| __strong typeof(weakSelf) strongSelf = weakSelf; | |||
| strongSelf.connection = nil; | |||
| NSLog(@"Connection has been invalidated.\n"); | |||
| }; | |||
| self.connection.interruptionHandler = ^{ | |||
| __strong typeof(self) strongSelf = weakSelf; | |||
| strongSelf.connection.interruptionHandler = nil; | |||
| NSLog(@"Connection has been interrupted.\n"); | |||
| }; | |||
| // New connections always start in a suspended state | |||
| [self.connection resume]; | |||
| // The remote object | |||
| self.pEpDownloadNotification = [self.connection remoteObjectProxyWithErrorHandler:^(NSError * _Nonnull error) { | |||
| }]; | |||
| self.updateDownloader.subscriber = self.pEpDownloadNotification; | |||
| if (self.pEpDownloadNotification) { | |||
| [self.pEpDownloadNotification notifyDownload:ready withName:@"" withFilename:@""]; | |||
| } | |||
| } | |||
| // MARK: - PEPNotificationXPCApiProtocol | |||
| - (void)notifyDownload:(int)type withName:(NSString *)name withFilename:(NSString *)filename { | |||
| [self.pEpDownloadNotification notifyDownload:type withName:name withFilename:filename]; | |||
| } | |||
| @end | |||
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.h → Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/Interface/PEPNotificationXPCService.h
View File
+ 21
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/Interface/PEPNotificationXPCServiceDelegate.h
View File
| @ -0,0 +1,21 @@ | |||
| // | |||
| // PEPNotificationXPCServiceDelegate.h | |||
| // PEPUpdatesXPCService | |||
| // | |||
| // Created by David Alarcon on 11/2/21. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @protocol PEPNotificationXPCServiceDelegate <NSObject> | |||
| - (void)pEpNotificationIsDownloadingWithName:(NSString *)name; | |||
| - (void)pEpNotificationDownloadDidArriveWithName:(NSString *)name filename:(NSString *)filename; | |||
| - (void)pEpNotificationNoDownloadAvailable; | |||
| - (void)pEpNotificationReady; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 21
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCApi.h
View File
| @ -0,0 +1,21 @@ | |||
| // | |||
| // PEPNotificationXPCApi.h | |||
| // PEPUpdatesXPCService | |||
| // | |||
| // Created by David Alarcon on 12/2/21. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| #import "PEPNotificationXPCApiProtocol.h" | |||
| #import "PEPNotificationXPCServiceDelegate.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface PEPNotificationXPCApi : NSObject <PEPNotificationXPCApiProtocol> | |||
| - (instancetype)initWithDelegate:(id<PEPNotificationXPCServiceDelegate>)delegate; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 44
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCApi.m
View File
| @ -0,0 +1,44 @@ | |||
| // | |||
| // PEPNotificationXPCApi.m | |||
| // PEPUpdatesXPCService | |||
| // | |||
| // Created by David Alarcon on 12/2/21. | |||
| // | |||
| #import "PEPNotificationXPCApi.h" | |||
| @interface PEPNotificationXPCApi () | |||
| @property (nonatomic, weak) id<PEPNotificationXPCServiceDelegate> delegate; | |||
| @end | |||
| @implementation PEPNotificationXPCApi | |||
| - (instancetype)initWithDelegate:(id<PEPNotificationXPCServiceDelegate>)delegate { | |||
| if (self = [self init]) { | |||
| _delegate = delegate; | |||
| } | |||
| return self; | |||
| } | |||
| // MARK: - PEPNotificationXPCApiProtocol | |||
| - (void)notifyDownload:(int)type | |||
| withName:(nonnull NSString *)name | |||
| withFilename:(nonnull NSString *)filename { | |||
| switch (type) { | |||
| case downloading: | |||
| [self.delegate pEpNotificationIsDownloadingWithName:name]; | |||
| break; | |||
| case downloadArrived: | |||
| [self.delegate pEpNotificationDownloadDidArriveWithName:name filename:filename]; | |||
| break; | |||
| case noDownloadAvailable: | |||
| [self.delegate pEpNotificationNoDownloadAvailable]; | |||
| break; | |||
| case ready: | |||
| [self.delegate pEpNotificationReady]; | |||
| } | |||
| } | |||
| @end | |||
pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCService.m → Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
View File
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/Interface/PEPNotificationXPCApiProtocol.h → Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/Shared/PEPNotificationXPCApiProtocol.h
View File
+ 0
- 13
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
View File
| @ -1,13 +0,0 @@ | |||
| // | |||
| // PEPNotificationXPCService.m | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import "PEPNotificationXPCService.h" | |||
| @implementation PEPNotificationXPCService | |||
| @end | |||
+ 1
- 0
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdateDownloadXPCService/PEPUpdateDownloadXPCService/Interface/PEPUpdateDownloadXPCService.h
View File
+ 3
- 32
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdateDownloadXPCService/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.m
View File
Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/PEPUpdateDownloadXPCService/PEPUpdateDownloadXPCService/UpdateDownloader/PEPUpdateDownloader.h → Submodules/PEPUpdatesXPCService/PEPUpdatesXPCService/Shared/PEPUpdateDownloader.h
View File
+ 0
- 78
pEpMacOSAdapter.xcodeproj/project.pbxproj
View File
+ 0
- 30
pEpMacOSAdapter/PEPNotificationXPCService/Interface/PEPNotificationXPCApiProtocol.h
View File
| @ -1,30 +0,0 @@ | |||
| // | |||
| // PEPNotificationXPCApiProtocol.h | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| /// Notification types | |||
| // TODO: Maybe does not belong to this protocol | |||
| typedef enum { ready = 0, downloading, downloadArrived, noDownloadAvailable } DNType; | |||
| /// Callback protocol to notify about download events | |||
| @protocol PEPNotificationXPCApiProtocol <NSObject> | |||
| /// notification about download events | |||
| - (void)notifyDownload:(int)type withName:(NSString*)name withFilename:(NSString*)filename; | |||
| @end | |||
| /// This is the object from the client where we deliver notifications to | |||
| @interface PEPNotification : NSObject <PEPNotificationXPCApiProtocol> | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 0
- 20
pEpMacOSAdapter/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.h
View File
| @ -1,20 +0,0 @@ | |||
| // | |||
| // PEPNotificationXPCService.h | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface PEPNotificationXPCService : NSObject | |||
| /// Begin listening for incoming XPC connections | |||
| - (void)start; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 0
- 13
pEpMacOSAdapter/PEPNotificationXPCService/XPCService/PEPNotificationXPCService.m
View File
| @ -1,13 +0,0 @@ | |||
| // | |||
| // PEPNotificationXPCService.m | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import "PEPNotificationXPCService.h" | |||
| @implementation PEPNotificationXPCService | |||
| @end | |||
+ 0
- 35
pEpMacOSAdapter/PEPUpdateDownloadXPCService/Interface/PEPUpdateDownloadXPCApiProtocol.h
View File
| @ -1,35 +0,0 @@ | |||
| // | |||
| // PEPMacOSAdapterProtocol.h | |||
| // pEpMacOSAdapter | |||
| // | |||
| // Created by Volker Birk on 20.04.20. | |||
| // Copyleft © 2020 p≡p foundation. | |||
| // This file is under GNU General Public License 3.0 | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| /// This protocol is providing the XPC interface to the User Interface program pEpNotifications | |||
| @protocol PEPUpdateDownloadXPCApiProtocol | |||
| /** | |||
| subscribe to the published notifications about downloads arriving | |||
| - Parameter downloading: block to call back when a download is going to happen | |||
| - Parameter downloadArrived: block to call back when a download arrived | |||
| */ | |||
| - (void)subscribeForUpdate:(NSXPCListenerEndpoint*)endpoint; | |||
| /// unsubscribe from receiving notifications about downloads arriving | |||
| - (void)unsubscribeForUpdate; | |||
| /// search for immediate updates | |||
| - (void)updateNow; | |||
| /// schedules updates each 2 hours | |||
| - (void)scheduleUpdates; | |||
| /// stop auto updates | |||
| - (void)stopUpdates; | |||
| @end | |||
+ 0
- 43
pEpMacOSAdapter/PEPUpdateDownloadXPCService/PEPUpdateDownloader.h
View File
| @ -1,43 +0,0 @@ | |||
| // | |||
| // PEPUpdateDownloader.h | |||
| // pEpMacOSAdapter | |||
| // | |||
| // Created by Volker Birk on 26.05.20. | |||
| // Copyright © 2020 p≡p foundation. All rights reserved. | |||
| // This file is under GNU General Public License 3.0 | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| #import "PEPNotificationXPCApiProtocol.h" | |||
| /// object encapsulating the update client functionality of downloadclient | |||
| @interface PEPUpdateDownloader : NSObject | |||
| /// default 2 hours = 7200 seconds | |||
| @property (retain) NSTimer* timer; | |||
| /// path with config files | |||
| @property (retain) NSString* configPath; | |||
| /// subscriber for notifications | |||
| @property (retain) PEPNotification* subscriber; | |||
| /// initializes the PEPUpdateDownloader | |||
| - (id)init; | |||
| /// schedules updates each 2 hours | |||
| - (void)scheduleUpdates; | |||
| /// stop auto updates | |||
| - (void)stopUpdates; | |||
| /// update all configured software | |||
| - (void)updateAll; | |||
| /// update software described by config file | |||
| - (void)updateWithFile:(NSString*)configFile error:(NSError **)err; | |||
| /// update a product from URL of update server | |||
| - (void)update:(NSString*)name usingUrl:(NSString*)url; | |||
| @end | |||
+ 0
- 147
pEpMacOSAdapter/PEPUpdateDownloadXPCService/PEPUpdateDownloader.mm
View File
| @ -1,147 +0,0 @@ | |||
| // | |||
| // PEPUpdateDownloader.mm | |||
| // pEpMacOSAdapter | |||
| // | |||
| // Created by Volker Birk on 26.05.20. | |||
| // Copyright © 2020 p≡p foundation. All rights reserved. | |||
| // This file is under GNU General Public License 3.0 | |||
| // | |||
| #import "PEPUpdateDownloader.h" | |||
| #include "../../downloadclient/downloadclient.hh" | |||
| const double CYCLE = 7200.0; // 7200 seconds = 2 hours | |||
| NSString* CONFIG_PATH = @"/Library/Application Support/pEp/Updater"; | |||
| @implementation PEPUpdateDownloader | |||
| - (id)init | |||
| { | |||
| self = [super init]; | |||
| if (self) { | |||
| self.configPath = CONFIG_PATH; | |||
| } | |||
| return self; | |||
| } | |||
| - (void)scheduleUpdates | |||
| { | |||
| if (!self.timer) { | |||
| NSLog(@"schedule updates"); | |||
| dispatch_async(dispatch_get_main_queue(), ^{ | |||
| self.timer = [NSTimer scheduledTimerWithTimeInterval:CYCLE | |||
| target:self | |||
| selector:@selector(updateAll) | |||
| userInfo:nil | |||
| repeats:YES]; | |||
| }); | |||
| } | |||
| else { | |||
| NSLog(@"timer already there"); | |||
| } | |||
| } | |||
| - (void)stopUpdates | |||
| { | |||
| if (self.timer) { | |||
| NSLog(@"stop auto updates"); | |||
| [self.timer invalidate]; | |||
| self.timer = nil; | |||
| } | |||
| } | |||
| - (void)updateAll | |||
| { | |||
| NSLog(@"update all registered products"); | |||
| NSFileManager *localFileManager=[NSFileManager new]; | |||
| NSDirectoryEnumerator *dirEnum = [localFileManager enumeratorAtPath:_configPath]; | |||
| NSString *configFile; | |||
| while (dirEnum && (configFile = [dirEnum nextObject])) { | |||
| if ([[configFile pathExtension] isEqualToString: @"plist"]) { | |||
| NSError *err = nil; | |||
| [self updateWithFile:[NSString stringWithFormat:@"%@/%@", _configPath, configFile] error:&err]; | |||
| } | |||
| } | |||
| } | |||
| - (void)updateWithFile:(NSString*)configFile error:(NSError **)err | |||
| { | |||
| NSLog(@"update product with config file %@", configFile); | |||
| NSInputStream *is = [NSInputStream inputStreamWithFileAtPath:configFile]; | |||
| [is open]; | |||
| NSDictionary* plist = [NSPropertyListSerialization | |||
| propertyListWithStream:is options:NSPropertyListMutableContainers | |||
| format:nil error:err]; | |||
| [is close]; | |||
| if (plist) { | |||
| NSString* name = [plist objectForKey:@"name"]; | |||
| NSString* url = [plist objectForKey:@"url"]; | |||
| if (name && url) { | |||
| [self update:name usingUrl:url]; | |||
| } | |||
| } | |||
| else if (err) { | |||
| NSLog(@"%@ %@ %@ %@", (*err).localizedDescription, | |||
| (*err).localizedFailureReason, (*err).localizedRecoveryOptions, | |||
| (*err).localizedRecoverySuggestion); | |||
| } | |||
| } | |||
| - (void)update:(NSString*)name usingUrl:(NSString*)url | |||
| { | |||
| NSLog(@"update %@ using %@", name, url); | |||
| pEp::UpdateClient::product p = { name.UTF8String, url.UTF8String }; | |||
| std::string keyfile = _configPath.UTF8String; | |||
| keyfile += std::string("/"); | |||
| keyfile += p.name; | |||
| keyfile += std::string(".der"); | |||
| NSLog(@"using key from %s", keyfile.c_str()); | |||
| NSString* cwd = [NSFileManager defaultManager].currentDirectoryPath; | |||
| NSString* dir = @"/tmp"; | |||
| [[NSFileManager defaultManager] changeCurrentDirectoryPath:dir]; | |||
| std::string _filename; | |||
| pEp::notifyRead_t notifyRead = [=]()->void{ | |||
| NSLog(@"downloading: %@", name); | |||
| if (_subscriber) { | |||
| [_subscriber notifyDownload:(int)downloading withName:name withFilename:@""]; | |||
| } | |||
| }; | |||
| try { | |||
| _filename = pEp::UpdateClient::update(p, keyfile, notifyRead); | |||
| if (_filename.length()) { | |||
| NSString* filename = [NSString stringWithUTF8String:_filename.c_str()]; | |||
| NSString* download = [NSString stringWithFormat:@"%@/%@", dir, filename]; | |||
| [[NSFileManager defaultManager] changeCurrentDirectoryPath:cwd]; | |||
| NSLog(@"download arrived %@", download); | |||
| if (_subscriber) { | |||
| [_subscriber notifyDownload:(int)downloadArrived withName:name withFilename:download]; | |||
| } | |||
| } | |||
| else { | |||
| NSLog(@"no download available for %@", name); | |||
| if (_subscriber) { | |||
| [_subscriber notifyDownload:(int)noDownloadAvailable withName:name withFilename:@""]; | |||
| } | |||
| } | |||
| } | |||
| catch (std::exception& e) { | |||
| NSLog(@"pEp::UpdateClient::update({\"%s\", \"%s\"}, \"%s\"): %s", | |||
| p.name.c_str(), p.url.c_str(), keyfile.c_str(), e.what()); | |||
| } | |||
| } | |||
| @end | |||
+ 0
- 19
pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.h
View File
| @ -1,19 +0,0 @@ | |||
| // | |||
| // PEPUpdateDownloadXPCApi.h | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| #import "PEPUpdateDownloadXPCApiProtocol.h" | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface PEPUpdateDownloadXPCApi : NSObject <PEPUpdateDownloadXPCApiProtocol> | |||
| @property (retain) NSXPCConnection* clientConnection; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||
+ 0
- 67
pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCApi.m
View File
| @ -1,67 +0,0 @@ | |||
| // | |||
| // PEPUpdateDownloadXPCApi.m | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import "PEPUpdateDownloadXPCApi.h" | |||
| #import "PEPNotificationXPCApiProtocol.h" | |||
| #import "PEPUpdateDownloader.h" | |||
| extern PEPUpdateDownloader* updater; | |||
| @implementation PEPUpdateDownloadXPCApi | |||
| - (void)subscribeForUpdate:(NSXPCListenerEndpoint*)endpoint { | |||
| NSLog(@"subscribeForUpdate called"); | |||
| if (!updater) { | |||
| updater = [PEPUpdateDownloader new]; | |||
| } | |||
| ///NotificationXPCService *service = .... | |||
| ///[service start]; | |||
| if (updater) { | |||
| _clientConnection = [[NSXPCConnection alloc] initWithListenerEndpoint:endpoint]; | |||
| _clientConnection.remoteObjectInterface = [NSXPCInterface | |||
| interfaceWithProtocol:@protocol(PEPNotificationXPCApiProtocol)]; | |||
| _clientConnection.interruptionHandler = ^(){NSLog(@"interruption"); updater.subscriber=nil;}; | |||
| _clientConnection.invalidationHandler = ^(){NSLog(@"invalidation"); updater.subscriber=nil;}; | |||
| [_clientConnection resume]; | |||
| PEPNotification* downloadNotification = [_clientConnection remoteObjectProxyWithErrorHandler:^(NSError*err) { | |||
| NSLog(@"%@", err); | |||
| }]; | |||
| updater.subscriber = downloadNotification; | |||
| if (downloadNotification) { | |||
| [downloadNotification notifyDownload:ready withName:@"" withFilename:@""]; | |||
| } | |||
| } | |||
| } | |||
| - (void)unsubscribeForUpdate { | |||
| NSLog(@"unsubscribeForUpdate called"); | |||
| if (updater) updater.subscriber = nil; | |||
| } | |||
| - (void)updateNow { | |||
| NSLog(@"updateNow called"); | |||
| if (updater) [updater updateAll]; | |||
| } | |||
| - (void)scheduleUpdates { | |||
| NSLog(@"scheduleUpdates called"); | |||
| if (updater) [updater scheduleUpdates]; | |||
| } | |||
| - (void)stopUpdates { | |||
| NSLog(@"stopUpdates called"); | |||
| if (updater) [updater stopUpdates]; | |||
| } | |||
| @end | |||
+ 0
- 20
pEpMacOSAdapter/PEPUpdateDownloadXPCService/XPCService/PEPUpdateDownloadXPCService.h
View File
| @ -1,20 +0,0 @@ | |||
| // | |||
| // PEPUpdateDownloadXPCService.h | |||
| // foundation.pEp.adapter.macOS | |||
| // | |||
| // Created by David Alarcon on 9/2/21. | |||
| // Copyright © 2021 p≡p foundation. All rights reserved. | |||
| // | |||
| #import <Foundation/Foundation.h> | |||
| NS_ASSUME_NONNULL_BEGIN | |||
| @interface PEPUpdateDownloadXPCService : NSObject <NSXPCListenerDelegate> | |||
| /// Begin listening for incoming XPC connections | |||
| - (void)start; | |||
| @end | |||
| NS_ASSUME_NONNULL_END | |||