Changeset dfcc616 for launchers


Ignore:
Timestamp:
Dec 8, 2018 9:14:33 AM (16 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
3bad8f3
Parents:
a0d356b
Message:

Mac OS X Launcher: Misc changes in ObjC, forwarding sendUserNotification to Swift.

Location:
launchers/macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/RouterTask.mm

    ra0d356b rdfcc616  
    6464
    6565- (void) requestRestart
    66 {
    67     self.userRequestedRestart = YES;
     66
     67{    self.userRequestedRestart = YES;
    6868    kill([self.routerTask processIdentifier], SIGHUP);
    6969}
     
    8585                NSLog(@"Expection occurred %@", [e reason]);
    8686    self.isRouterRunning = NO;
     87   
    8788    [[[RouterProcessStatus alloc] init] triggerEventWithEn:@"router_exception" details:[e reason]];
     89   
    8890    [[SBridge sharedInstance] setCurrentRouterInstance:nil];
    8991    sendUserNotification(@"An error occured, can't start the I2P Router", [e reason]);
  • launchers/macosx/SBridge.h

    ra0d356b rdfcc616  
    6363- (void) openUrl:(NSString*)url;
    6464+ (void) logProxy:(int)level formattedMsg:(NSString*)formattedMsg;
     65+ (void) sendUserNotification:(NSString*)title formattedMsg:(NSString*)formattedMsg;
    6566+ (instancetype)sharedInstance; // this makes it a singleton
    6667@end
  • launchers/macosx/SBridge.mm

    ra0d356b rdfcc616  
    120120}
    121121
     122+ (void) sendUserNotification:(NSString*)title formattedMsg:(NSString*)formattedMsg
     123{
     124  sendUserNotification(title, formattedMsg);
     125}
     126
    122127- (void) openUrl:(NSString*)url
    123128{
  • launchers/macosx/main.mm

    ra0d356b rdfcc616  
    7474    @"enableLogging": @YES,
    7575    @"enableVerboseLogging": @YES,
    76     @"autoStartRouter": @YES,
    77     @"startRouterAtLogin": @NO,
    78     @"startRouterAtStartup": @NO,
     76    @"autoStartRouterAtBoot": @NO,
     77    @"startLauncherAtLogin": @NO,
     78    @"startRouterAtStartup": @YES,
     79    @"stopRouterAtShutdown": @YES,
    7980    @"letRouterLiveEvenLauncherDied": @NO,
    8081    @"consolePortCheckNum": @7657,
     
    8889  CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
    8990
    90   if (self.enableVerboseLogging) NSLog(@"Default preferences stored!");
     91  NSLog(@"Default preferences stored!");
    9192}
    9293
Note: See TracChangeset for help on using the changeset viewer.