Changeset f76874a

Timestamp:

Sep 18, 2018 3:39:32 PM (21 months ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

01a05f7

Parents:

7615b92

Message:

Adding XCode workspace & Xcode project, and some files missing from last commit.

Please note that Xcode project embedds the packing script (meaning it runs "ant" - zip files, and moves it to bundle)

Location:

launchers/macosx

Files:

• .vscode/settings.json (added)
• AppDelegate.h (modified) (4 diffs)
• I2PLauncher.xcodeproj/project.pbxproj (added)
• I2PLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata (added)
• I2PLauncher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (added)
• I2PLauncher.xcworkspace/contents.xcworkspacedata (added)
• I2PLauncher.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (added)
• Info.plist (added)
• JavaHelper.h (modified) (7 diffs)
• RouterTask.h (modified) (2 diffs)
• RouterTask.mm (modified) (6 diffs)
• dmgconfig.py (added)
• include/PidWatcher.h (modified) (2 diffs)
• include/optional.h (added)
• include/portcheck.h (modified) (1 diff)
• include/strutil.hpp (modified) (1 diff)
• main.mm (modified) (18 diffs)
• requirements.txt (added)

launchers/macosx/AppDelegate.h

@@ -2 +2 @@
 #define __APPDELEGATE_H__
 
-#include <algorithm>
-#include <string>
-#include <memory>
+
+#include <string.h>
+#include <memory.h>
 
 #include <Cocoa/Cocoa.h>
 
+
 #include "RouterTask.h"
-#include "StatusItemButton.h"
 #include "JavaHelper.h"
-#include "neither/maybe.hpp"
-#include "optional.hpp"
-#include "subprocess.hpp"
-#include <glob.h>
-#include <vector>
 
 
-#define DEF_I2P_VERSION "0.9.35"
+#define DEF_I2P_VERSION "0.9.36"
 #define APPDOMAIN "net.i2p.launcher"
 #define NSAPPDOMAIN @APPDOMAIN
@@ -24 +19 @@
 #define APP_IDSTR @"I2P Launcher"
 
+@class SwiftMainDelegate;
 
-using namespace neither;
+@protocol SwiftMainDelegateProto
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
+@end
+
 
 @class ExtractMetaInfo;
-using maybeAnRouterRunner = std::experimental::optional<I2PRouterTask*>;
+
+
+
+@interface ExtractMetaInfo : NSObject
+@property (copy) NSString* i2pBase;
+@property (copy) NSString* javaBinary;
+@property (copy) NSString* zipFile;
+@property (copy) NSString* jarFile;
+@end
+#ifdef __cplusplus
+#include "JavaHelper.h"
+
+inline void sendUserNotification(NSString* title, NSString* informativeText, NSImage* contentImage = NULL, bool makeSound = false) {
+  NSUserNotification *userNotification = [[[NSUserNotification alloc] init] autorelease];
+  
+  userNotification.title = title;
+  userNotification.informativeText = informativeText;
+  NSBundle *launcherBundle = [NSBundle mainBundle];
+  auto resPath = [launcherBundle resourcePath];
+  auto stdResPath = std::string([resPath UTF8String]);
+  stdResPath += "/AppImage.png";
+  auto nsString = [[NSString alloc] initWithUTF8String:(const char*)stdResPath.c_str()];
+  NSImage *appImage = [[NSImage alloc] initWithContentsOfFile:nsString];
+  userNotification.contentImage = appImage;
+  if (makeSound) userNotification.soundName = NSUserNotificationDefaultSoundName;
+  
+  [[NSUserNotificationCenter defaultUserNotificationCenter] scheduleNotification:userNotification];
+};
+
+using maybeAnRouterRunner = I2PRouterTask*;
 
 std::vector<std::string> buildClassPath(std::string basePath);
@@ -44 +72 @@
 void setGlobalRouterIsRunning(bool running);
 
-@interface ExtractMetaInfo : NSObject
-@property (copy) NSString* i2pBase;
-@property (copy) NSString* javaBinary;
-@property (copy) NSString* zipFile;
-@property (copy) NSString* jarFile;
-@end
+#include "SBridge.h"
 
-@class I2PStatusMenu;
-@interface I2PStatusMenu : NSMenu
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
-@end
+#endif
 
-inline void sendUserNotification(NSString* title, NSString* informativeText, NSImage* contentImage = NULL, bool makeSound = false) {
-  NSUserNotification *userNotification = [[[NSUserNotification alloc] init] autorelease];
-
-  userNotification.title = title;
-  userNotification.informativeText = informativeText;
-  if (contentImage != NULL) userNotification.contentImage = contentImage;
-  if (makeSound) userNotification.soundName = NSUserNotificationDefaultSoundName;
-
-  [[NSUserNotificationCenter defaultUserNotificationCenter] scheduleNotification:userNotification];
-};
-
-inline std::vector<std::string> globVector(const std::string& pattern){
-    glob_t glob_result;
-    glob(pattern.c_str(),GLOB_TILDE,NULL,&glob_result);
-    std::vector<std::string> files;
-    for(unsigned int i=0;i<glob_result.gl_pathc;++i){
-        files.push_back(std::string(glob_result.gl_pathv[i]));
-    }
-    globfree(&glob_result);
-    return files;
-}
-
-inline std::string getDefaultBaseDir()
-{
-  // Figure out base directory
-  const char* pathFromHome = "/Users/%s/Library/I2P";
-  auto username = getenv("USER");
-  char buffer[strlen(pathFromHome)+strlen(username)];
-  sprintf(buffer, pathFromHome, username);
-  std::string i2pBaseDir(buffer);
-  return i2pBaseDir;
-}
-
-@interface MenuBarCtrl : NSObject <StatusItemButtonDelegate, NSMenuDelegate>
-@property BOOL enableLogging;
-@property BOOL enableVerboseLogging;
-@property (strong) I2PStatusMenu *menu;
-@property (strong) StatusItemButton* statusBarButton;
-@property (strong) NSUserDefaults *userPreferences;
-@property (strong, nonatomic) NSImage * image;
-@property (strong, nonatomic) NSStatusItem *statusItem;
-// Event handlers
-- (void) statusItemButtonLeftClick: (StatusItemButton *) button;
-- (void) statusItemButtonRightClick: (StatusItemButton *) button;
-- (void) statusBarImageBtnClicked;
-- (void) btnPressedAction:(id)sender;
-- (void) menuWillOpen:(I2PStatusMenu *)menu;
-
-- (void) openRouterConsoleBtnHandler: (NSMenuItem *) menuItem;
-- (void) startJavaRouterBtnHandler: (NSMenuItem *) menuItem;
-- (void) restartJavaRouterBtnHandler: (NSMenuItem *) menuItem;
-- (void) stopJavaRouterBtnHandler: (NSMenuItem *) menuItem;
-- (void) quitWrapperBtnHandler: (NSMenuItem *) menuItem;
-// Methods
-- (MenuBarCtrl *) init;
-- (void) dealloc;
-- (I2PStatusMenu *) createStatusBarMenu;
-@end
-
-@protocol MenuBarCtrlDelegate
-- (void) menuBarCtrlStatusChanged: (BOOL) active;
-@end
+@class MenuBarCtrl;
 
 @interface AppDelegate : NSObject <NSUserNotificationCenterDelegate, NSApplicationDelegate> {
@@ -123 +82 @@
   //NSImageView *imageCell;
 }
-@property (strong) MenuBarCtrl *menuBarCtrl;
-@property (strong) NSUserDefaults *userPreferences;
 @property BOOL enableLogging;
 @property BOOL enableVerboseLogging;
-@property ExtractMetaInfo *metaInfo;
+@property (assign) NSUserDefaults *userPreferences;
+@property (assign) ExtractMetaInfo *metaInfo;
 @property (copy) NSImage *contentImage NS_AVAILABLE(10_9, NA);
-- (void)extractI2PBaseDir:(void(^)(BOOL success, NSError *error))completion;
-- (void)startupI2PRouter;
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
-- (void)applicationWillTerminate:(NSNotification *)aNotification;
-- (void)setApplicationDefaultPreferences;
-- (void)userChooseJavaHome;
-- (AppDelegate *)initWithArgc:(int)argc argv:(const char **)argv;
-- (NSString *)userSelectJavaHome:(JvmListPtr)rawJvmList;
-- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
+
+- (void) extractI2PBaseDir:(void(^)(BOOL success, NSError *error))completion;
+- (void) awakeFromNib;
+- (void) startupI2PRouter;
+- (void) applicationDidFinishLaunching:(NSNotification *)aNotification;
+- (void) applicationWillTerminate:(NSNotification *)aNotification;
+- (void) setApplicationDefaultPreferences;
+- (void) userChooseJavaHome;
+- (AppDelegate *) initWithArgc:(int)argc argv:(const char **)argv;
+#ifdef __cplusplus
+- (NSString *) userSelectJavaHome:(JvmListPtr)rawJvmList;
+#endif
+- (BOOL) userNotificationCenter:(NSUserNotificationCenter *)center
                                shouldPresentNotification:(NSUserNotification *)notification;
 @end
 
 
+
+
 #endif

launchers/macosx/JavaHelper.h

@@ -1 +1 @@
 #pragma once
 
-#include <functional>
-#include <memory>
-#include <iostream>
-#include <algorithm>
-#include <cstring>
-#include <sstream>
-#include <list>
+#include <memory.h>
+#include <string.h>
 #include <stdlib.h>
 
@@ -18 +13 @@
 #include <CoreFoundation/CFString.h>
 
-#include "optional.hpp"
-#include "strutil.hpp"
-#include "subprocess.hpp"
-#include "neither/maybe.hpp"
 #include "RouterTask.h"
 
-using namespace subprocess;
-using namespace neither;
 
 #define DEF_MIN_JVM_VER "1.7+"
+
+#ifdef __cplusplus
+
+#include "include/strutil.hpp"
+
+#include <functional>
+#include <memory>
+#include <list>
+
 
 class JvmVersion
@@ -54 +52 @@
   }
 };
+
 
 typedef std::shared_ptr<JvmVersion> JvmVersionPtr;
@@ -114 +113 @@
 }
 
+
+
 static void processJvmPlistEntries (const void* item, void* context) {
   CFDictionaryRef dict = CFDictionaryCreateCopy(kCFAllocatorDefault, (CFDictionaryRef)item);
@@ -154 +155 @@
   CFDataRef javaHomes = CFDataCreate(NULL, (const UInt8 *)javaHomeRes.buf.data(), strlen(javaHomeRes.buf.data()));
 
-  //CFErrorRef err;
+  CFErrorRef err;
   CFPropertyListRef propertyList = CFPropertyListCreateWithData(kCFAllocatorDefault, javaHomes, kCFPropertyListImmutable, NULL, NULL);
-  /*if (err)
+  if (err)
   {
     NSError *error = (__bridge NSError *)err;
     NSLog(@"Failed to read property list: %@", error);
     [NSApp presentError: error];
-    return nullptr;
-  }*/
+    return;
+  }
 
 
@@ -171 +172 @@
   // Count number of entries in the property array list.
   // This is used to set max CRange for CFArrayApplyFunction.
+
   auto jCount = CFArrayGetCount((CFArrayRef)propertyList);
 
@@ -176 +178 @@
   //CFShow(propertyList);
 }
+
+#endif

launchers/macosx/RouterTask.h

@@ -2 +2 @@
 
 #include <dispatch/dispatch.h>
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
+#include <memory.h>
+#include <string.h>
 
 #include <Cocoa/Cocoa.h>
 #import <AppKit/AppKit.h>
 
-#include "optional.hpp"
-#include "subprocess.hpp"
+#ifdef __cplusplus
+#include "include/subprocess.hpp"
+
+using namespace subprocess;
+class JavaRunner;
+
+typedef std::function<void(void)> fp_t;
+typedef std::function<void(JavaRunner *ptr)> fp_proc_t;
+
+
+
+/**
+ *
+ * class JavaRunner
+ *
+ **/
+class JavaRunner
+{
+public:
+  // copy fn
+  JavaRunner(std::string& javaBin, std::string& arguments, std::string& i2pBaseDir, const fp_proc_t& executingFn, const fp_t& cb);
+  ~JavaRunner() = default;
+  
+  static const std::vector<NSString*> defaultStartupFlags;
+  static const std::vector<std::string> defaultFlagsForExtractorJob;
+  
+  void requestRouterShutdown();
+  
+  std::future<int> execute();
+  std::shared_ptr<subprocess::Popen> javaProcess;
+  std::string javaBinaryPath;
+  std::string javaRouterArgs;
+  std::string execLine;
+  std::string _i2pBaseDir;
+private:
+  const fp_proc_t& executingFn;
+  const fp_t& exitCallbackFn;
+};
+
+#endif
 
 
@@ -42 +78 @@
 
 
-using namespace subprocess;
-
-class JavaRunner;
-
-typedef std::function<void(void)> fp_t;
-typedef std::function<void(JavaRunner *ptr)> fp_proc_t;
 
 
 
-/**
- *
- * class JavaRunner
- *
- **/
-class JavaRunner
-{
-public:
-  // copy fn
-  JavaRunner(std::string& javaBin, std::string& arguments, std::string& i2pBaseDir, const fp_proc_t& executingFn, const fp_t& cb);
-  ~JavaRunner() = default;
-
-  static const std::vector<NSString*> defaultStartupFlags;
-  static const std::vector<std::string> defaultFlagsForExtractorJob;
-
-  void requestRouterShutdown();
-
-  std::experimental::optional<std::future<int> > execute();
-  std::shared_ptr<Popen> javaProcess;
-  std::string javaBinaryPath;
-  std::string javaRouterArgs;
-  std::string execLine;
-  std::string _i2pBaseDir;
-private:
-  const fp_proc_t& executingFn;
-  const fp_t& exitCallbackFn;
-};
-
-

launchers/macosx/RouterTask.mm

@@ -5 +5 @@
 #include <stdlib.h>
 
-#include "optional.hpp"
-#include "subprocess.hpp"
-#include "PidWatcher.h"
+#ifdef __cplusplus
+#include "include/subprocess.hpp"
+#import "I2PLauncher-Swift.h"
+#include "AppDelegate.h"
+#endif
+#include "include/PidWatcher.h"
 
 #import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
 
 @implementation RTaskOptions
@@ -25 +29 @@
 - (instancetype) initWithOptions : (RTaskOptions*) options
 {
-    self.userRequestedRestart = NO;
-    self.isRouterRunning = NO;
-    self.input = [NSFileHandle fileHandleWithStandardInput];
-    self.routerTask = [NSTask new];
-    self.processPipe = [NSPipe new];
-    [self.routerTask setLaunchPath:options.binPath];
-    [self.routerTask setArguments:options.arguments];
-    NSDictionary *envDict = @{
-        @"I2PBASE": options.i2pBaseDir
-    };
-    [self.routerTask setEnvironment: envDict];
-    [self.routerTask setStandardOutput:self.processPipe];
+  self.userRequestedRestart = NO;
+  self.isRouterRunning = NO;
+  self.input = [NSFileHandle fileHandleWithStandardInput];
+  self.routerTask = [NSTask new];
+  self.processPipe = [NSPipe new];
+  [self.routerTask setLaunchPath:options.binPath];
+  [self.routerTask setArguments:options.arguments];
+  NSDictionary *envDict = @{
+    @"I2PBASE": options.i2pBaseDir
+  };
+  [self.routerTask setEnvironment: envDict];
+  NSLog(@"Using environment variables: %@", envDict);
+  [self.routerTask setStandardOutput:self.processPipe];
         [self.routerTask setStandardError:self.processPipe];
 
@@ -48 +53 @@
 
     [self.routerTask setTerminationHandler:^(NSTask* task) {
-        NSLog(@"termHandler triggered!");
-        NSBundle *launcherBundle = [NSBundle mainBundle];
-        auto iconImage = [launcherBundle pathForResource:@"ItoopieTransparent" ofType:@"png"];
-        sendUserNotification(APP_IDSTR, @"I2P Router has stopped", [NSImage imageNamed:iconImage]);
-        // Cleanup
-        self.isRouterRunning = NO;
+      NSLog(@"termHandler triggered!");
+      auto swiftRouterStatus = [[RouterProcessStatus alloc] init];
+      [swiftRouterStatus setRouterStatus: true];
+      NSBundle *launcherBundle = [NSBundle mainBundle];
+      auto iconImage = [launcherBundle pathForResource:@"AppIcon" ofType:@"png"];
+      sendUserNotification(APP_IDSTR, @"I2P Router has stopped");
+      // Cleanup
+      self.isRouterRunning = NO;
     }];
 /*
@@ -106 +113 @@
 @end
 
+#ifdef __cplusplus
 
-
-
-using namespace subprocess;
 
 const std::vector<NSString*> JavaRunner::defaultStartupFlags {
@@ -145 +150 @@
 }
 
-std::experimental::optional<std::future<int> > JavaRunner::execute()
+std::future<int> JavaRunner::execute()
 {
   try {
@@ -161 +166 @@
   } catch (std::exception* ex) {
     printf("ERROR: %s\n", ex->what());
-    return std::experimental::nullopt;
+    return std::async(std::launch::async, []{ return 1; });
   }
 }
+
+#endif

launchers/macosx/include/PidWatcher.h

@@ -5 +5 @@
 #include <sys/event.h>
 
-#include "neither/either.hpp"
-#include "AppDelegate.h"
 
 using callbackType = void (CFFileDescriptorRef, CFOptionFlags, void *);
@@ -17 +15 @@
     // take action on death of process here
     NSLog(@"process with pid '%u' died\n", (unsigned int)kev.ident);
-    sendUserNotification(APP_IDSTR, @"The I2P router has stopped.");
+    //sendUserNotification(APP_IDSTR, @"The I2P router has stopped.");
     CFFileDescriptorInvalidate(fdref);
     CFRelease(fdref); // the CFFileDescriptorRef is no longer of any use in this example

launchers/macosx/include/portcheck.h

@@ -10 +10 @@
 typedef struct sockaddr *sad; /* A necesary dummy typedef */
 
-
-int port_check(int portNum=7657)
+int port_check(int portNum)
 {
-int sock; /* Socket that will be bind */
-struct sockaddr_in sin; /* Address Structure */
-
-/* Create the socket */
-/* PF_INET is the option for make a TCP socket.
-        You can try "man socket" for more info */
-sock = socket( PF_INET, SOCK_STREAM, 0 );
-
-/* The socket creation failed */
-if ( 0 > sock ) {
-  perror( "socket" );
-  return ( -1 );
+  int sock; /* Socket that will be bind */
+  struct sockaddr_in sin; /* Address Structure */
+  
+  /* Create the socket */
+  /* PF_INET is the option for make a TCP socket.
+   You can try "man socket" for more info */
+  sock = socket( PF_INET, SOCK_STREAM, 0 );
+  
+  /* The socket creation failed */
+  if ( 0 > sock ) {
+    perror( "socket" );
+    return ( -1 );
+  }
+  
+  /* Address */
+  sin.sin_family = AF_INET;
+  sin.sin_port = htons( portNum ); /* htons() convert the number
+                                    to big endian */
+  sin.sin_addr.s_addr = INADDR_ANY;
+  
+  /* We bind the socket to the port PORT to check if
+   the port is in use */
+  if ( 0 > bind( sock, (sad)&sin, sizeof( sin ) ) ) {
+    /* Bind failed, now we can check if the address is
+     in use */
+    
+    if ( EADDRINUSE == errno ) {
+      /* We put the code necesary to manage this case */
+      printf( "The TCP port %d is in use.\n", portNum );
+    }
+    
+    else
+    /* If the error were other than EADDRINUSE, we print it */
+      perror( "bind" );
+    
+    return 1;
+  }
+  
+  /* If we arrive to this point, the port weren't in use and
+   we have it attached to our program. We can close
+   the socket or use it */
+  close( sock ); /* Close the socket */
+  
+  return 0;
 }
 
-/* Address */
-sin.sin_family = AF_INET;
-sin.sin_port = htons( portNum ); /* htons() convert the number
-                                                      to big endian */
-sin.sin_addr.s_addr = INADDR_ANY;
 
-/* We bind the socket to the port PORT to check if
-          the port is in use */
-if ( 0 > bind( sock, (sad)&sin, sizeof( sin ) ) ) {
-  /* Bind failed, now we can check if the address is
-                in use */
-
-  if ( EADDRINUSE == errno ) {
-  /* We put the code necesary to manage this case */
-  printf( "The TCP port %d is in use.\n", portNum );
-  }
-
-  else
-  /* If the error were other than EADDRINUSE, we print it */
-  perror( "bind" );
-
-  return 1;
-}
-
-/* If we arrive to this point, the port weren't in use and
-          we have it attached to our program. We can close
-          the socket or use it */
-close( sock ); /* Close the socket */
-
-return 0;
-}

launchers/macosx/include/strutil.hpp

@@ -9 +9 @@
 #include <cctype>
 #include <locale>
-#include "optional.hpp"
+#include "optional.h"
 
 #include <CoreFoundation/CoreFoundation.h>

launchers/macosx/main.mm

@@ -12 +12 @@
 #import <Foundation/Foundation.h>
 
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFStream.h>
@@ -25 +26 @@
 #import <AppKit/NSApplication.h>
 
+#import "I2PLauncher-Swift.h"
+
 #include "AppDelegate.h"
-#include "StatusItemButton.h"
 #include "RouterTask.h"
 #include "JavaHelper.h"
-#include "fn.h"
-#include "optional.hpp"
-#include "portcheck.h"
+#include "include/fn.h"
+#include "include/portcheck.h"
 
 #define debug(format, ...) CFShow([NSString stringWithFormat:format, ## __VA_ARGS__]);
-
-JvmListSharedPtr gRawJvmList = nullptr;
-
-
-@interface MenuBarCtrl () <StatusItemButtonDelegate, NSMenuDelegate>
-@end
 
 @interface AppDelegate () <NSUserNotificationCenterDelegate, NSApplicationDelegate>
 @end
 
-std::vector<std::string> buildClassPath(std::string basePath)
-{
-    return globVector(basePath+std::string("/lib/*.jar"));
-}
-
+#ifdef __cplusplus
+#import "SBridge.h"
+JvmListSharedPtr gRawJvmList = nullptr;
+#endif
+
+
+@interface AppDelegate () <NSUserNotificationCenterDelegate, NSApplicationDelegate>
+@end
+
+#ifdef __cplusplus
 maybeAnRouterRunner getGlobalRouterObject()
 {
     std::lock_guard<std::mutex> lock(globalRouterStatusMutex);
-    return globalRouterStatus;
+    return globalRouterStatus; // Remember this might be nullptr now.
 }
 
@@ -58 +58 @@
 {
     std::lock_guard<std::mutex> lock(globalRouterStatusMutex);
-    globalRouterStatus.emplace(newRouter);
+    globalRouterStatus = newRouter;
 }
 
@@ -78 +78 @@
 }
 
-std::future<int> startupRouter(NSString* javaBin, NSArray<NSString*>* arguments, NSString* i2pBaseDir) {
-    @try {
-        RTaskOptions* options = [RTaskOptions alloc];
-        options.binPath = javaBin;
-        options.arguments = arguments;
-        options.i2pBaseDir = i2pBaseDir;
-        auto instance = [[[I2PRouterTask alloc] initWithOptions: options] autorelease];
-        setGlobalRouterObject(instance);
-        //NSThread *thr = [[NSThread alloc] initWithTarget:instance selector:@selector(execute) object:nil];
-        [instance execute];
-        sendUserNotification(APP_IDSTR, @"The I2P router is starting up.");
-        auto pid = [instance getPID];
-        return std::async(std::launch::async, [&pid]{
-          return pid;
-        });
-    }
-    @catch (NSException *e)
-        {
-        auto errStr = [NSString stringWithFormat:@"Expection occurred %@",[e reason]];
-                NSLog(@"%@", errStr);
-        sendUserNotification(APP_IDSTR, errStr);
-        return std::async(std::launch::async, [&]{
-          return 0;
-        });
-        }
-}
-
-void openUrl(NSString* url)
-{
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString: url]];
-}
-
-@implementation I2PStatusMenu
-
-- (BOOL)validateMenuItem:(NSMenuItem *)item
-{
-  NSLog(@"item is: %@",item);
-  return YES;
-}
-
+#endif
+
+
+@implementation ExtractMetaInfo : NSObject
 @end
 
-@implementation MenuBarCtrl
-
-- (void) statusItemButtonLeftClick: (StatusItemButton *) button
-{
-  CFShow(CFSTR("Left button clicked!"));
-  NSEvent *event = [NSApp currentEvent];
-}
-
-- (void) statusItemButtonRightClick: (StatusItemButton *) button
-{
-  CFShow(CFSTR("Right button clicked!"));
-  NSEvent *event = [NSApp currentEvent];
-  [self.statusItem popUpStatusItemMenu: self.menu];
-}
-
-- (void)statusBarImageBtnClicked
-{
-  [NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(btnPressedAction) userInfo:nil repeats:NO];
-}
-
-- (void)btnPressedAction:(id)sender
-{
-  NSLog(@"Button presseeeeeeed");
-  NSEvent *event = [NSApp currentEvent];
-}
-
-- (void) openRouterConsoleBtnHandler: (NSMenuItem *) menuItem
-{
-  NSLog(@"Clicked openRouterConsoleBtnHandler");
-  openUrl(@"http://127.0.0.1:7657");
-}
-
-- (void) startJavaRouterBtnHandler: (NSMenuItem *) menuItem
-{
-  NSLog(@"Clicked startJavaRouterBtnHandler");
-  AppDelegate *appDelegate = (AppDelegate *)[[NSApplication sharedApplication] delegate];
-  [appDelegate startupI2PRouter];
-}
-
-- (void) restartJavaRouterBtnHandler: (NSMenuItem *) menuItem
-{
-  NSLog(@"Clicked restartJavaRouterBtnHandler");
-  if (getGlobalRouterObject().has_value())
-  {
-      sendUserNotification(APP_IDSTR, @"Requesting the I2P router to restart.");
-      [getGlobalRouterObject().value() requestRestart];
-      NSLog(@"Requested restart");
-  }
-}
-
-- (void) stopJavaRouterBtnHandler: (NSMenuItem *) menuItem
-{
-  NSLog(@"Clicked stopJavaRouterBtnHandler");
-  if (getGlobalRouterObject().has_value())
-  {
-      sendUserNotification(APP_IDSTR, @"Requesting the I2P router to shutdown.");
-      [getGlobalRouterObject().value() requestShutdown];
-      NSLog(@"Requested shutdown");
-  }
-}
-
-- (void) quitWrapperBtnHandler: (NSMenuItem *) menuItem
-{
-  NSLog(@"quitWrapper event handler called!");
-  [[NSApplication sharedApplication] terminate:self];
-}
-
-- (MenuBarCtrl *) init
-{
-  self.menu = [self createStatusBarMenu];
-  self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
-
-  self.image = [NSImage imageNamed:@"ItoopieTransparent.png"];
-  [self.image setTemplate:YES];
-  self.statusItem.image = self.image;
-
-  self.statusItem.highlightMode = NO;
-  self.statusItem.toolTip = @"I2P Router Controller";
-
-  self.statusBarButton = [[StatusItemButton alloc] initWithImage:self.image];
-  self.statusBarButton.menu = self.menu;
-
-  // Selecting action
-  //[self.statusBarButton setAction:@selector(statusBarImageBtnClicked)];
-  //[self.statusBarButton setTarget:self];
-  self.statusBarButton.delegate = self;
-  [self.statusItem popUpStatusItemMenu: self.menu];
-
-  [self.statusItem setView: self.statusBarButton];
-  NSLog(@"Initialized statusbar and such");
-  return self;
-}
-
--(void) dealloc
-{
-  [self.image release];
-  [self.menu release];
-}
-
-- (I2PStatusMenu *)createStatusBarMenu
-{
-  I2PStatusMenu *menu = [[I2PStatusMenu alloc] init];
-  [menu setAutoenablesItems:NO];
-
-  NSMenuItem *openConsoleI2Pbtn =
-    [[NSMenuItem alloc] initWithTitle:@"Open Console"
-                        action:@selector(openRouterConsoleBtnHandler:)
-                        keyEquivalent:@""];
-  [openConsoleI2Pbtn setTarget:self];
-  [openConsoleI2Pbtn setEnabled:YES];
-
-  NSMenuItem *startI2Pbtn =
-    [[NSMenuItem alloc] initWithTitle:@"Start I2P"
-                        action:@selector(startJavaRouterBtnHandler:)
-                        keyEquivalent:@""];
-  [startI2Pbtn setTarget:self];
-  if ([self.userPreferences boolForKey:@"autoStartRouter"])
-  {
-    [startI2Pbtn setEnabled:NO];
-  } else {
-    [startI2Pbtn setEnabled:YES];
-  }
-
-  NSMenuItem *restartI2Pbtn =
-    [[NSMenuItem alloc] initWithTitle:@"Restart I2P"
-                        action:@selector(restartJavaRouterBtnHandler:)
-                        keyEquivalent:@""];
-  [restartI2Pbtn setTarget:self];
-  [restartI2Pbtn setEnabled:YES];
-
-  NSMenuItem *stopI2Pbtn =
-    [[NSMenuItem alloc] initWithTitle:@"Stop I2P"
-                        action:@selector(stopJavaRouterBtnHandler:)
-                        keyEquivalent:@""];
-  [stopI2Pbtn setTarget:self];
-  [stopI2Pbtn setEnabled:YES];
-
-  NSMenuItem *quitWrapperBtn =
-    [[NSMenuItem alloc] initWithTitle:@"Quit I2P Wrapper"
-                        action:@selector(quitWrapperBtnHandler:)
-                        keyEquivalent:@""];
-  [quitWrapperBtn setTarget:self];
-  [quitWrapperBtn setEnabled:YES];
-
-
-  [menu addItem:openConsoleI2Pbtn];
-  [menu addItem:startI2Pbtn];
-  [menu addItem:stopI2Pbtn];
-  [menu addItem:restartI2Pbtn];
-  [menu addItem:quitWrapperBtn];
-  return menu;
-}
-
-@end
-
-@implementation ExtractMetaInfo
-@end
-
 @implementation AppDelegate
+
+- (void) awakeFromNib {
+}
+
+#ifdef __cplusplus
 
 - (void)extractI2PBaseDir:(void(^)(BOOL success, NSError *error))completion
@@ -285 +96 @@
   NSParameterAssert(self.metaInfo.i2pBase);
   NSError *error = NULL;
-  BOOL success;
+  BOOL success = NO;
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
@@ -313 +124 @@
     cli.push_back("net.i2p.launchers.BaseExtractor");
 
-    //auto charCli = map(cli, [](std::string str){ return str.c_str(); });
+    auto charCli = map(cli, [](std::string str){ return str.c_str(); });
     std::string execStr = [self.metaInfo.javaBinary UTF8String];
     for_each(cli, [&execStr](std::string str){ execStr += std::string(" ") + str; });
@@ -338 +149 @@
     // All done. Assume success and error are already set.
     dispatch_async(dispatch_get_main_queue(), ^{
-      sendUserNotification(APP_IDSTR, @"Extraction complete!", self.contentImage);
+      //sendUserNotification(APP_IDSTR, @"Extraction complete!", self.contentImage);
       if (completion) {
         completion(success, error);
@@ -346 +157 @@
 }
 
-- (void)startupI2PRouter
-{
-  std::string basePath([self.metaInfo.i2pBase UTF8String]);
-
-  // Get paths
-  NSBundle *launcherBundle = [NSBundle mainBundle];
-  auto jarList = buildClassPath(basePath);
-  std::string classpathStrHead = "-classpath";
-  std::string classpathStr = "";
-  classpathStr += [[launcherBundle pathForResource:@"launcher" ofType:@"jar"] UTF8String];
-  std::string prefix(basePath);
-  prefix += "/lib/";
-  for_each(jarList, [&classpathStr](std::string str){ classpathStr += std::string(":") + str; });
-  //if (self.enableVerboseLogging) NSLog(@"Classpath: %@\n",[NSString stringWithUTF8String:classpathStr.c_str()]);
-
-  try {
-    auto argList = JavaRunner::defaultStartupFlags;
-
-    std::string baseDirArg("-Di2p.dir.base=");
-    baseDirArg += basePath;
-    std::string javaLibArg("-Djava.library.path=");
-    javaLibArg += basePath;
-    // TODO: pass this to JVM
-    auto java_opts = getenv("JAVA_OPTS");
-
-    argList.push_back([NSString stringWithUTF8String:baseDirArg.c_str()]);
-    argList.push_back([NSString stringWithUTF8String:javaLibArg.c_str()]);
-    argList.push_back([NSString stringWithUTF8String:classpathStrHead.c_str()]);
-    argList.push_back([NSString stringWithUTF8String:classpathStr.c_str()]);
-    argList.push_back(@"net.i2p.router.Router");
-    auto javaBin = std::string([self.metaInfo.javaBinary UTF8String]);
-
-
-    sendUserNotification(APP_IDSTR, @"I2P Router is starting up!", self.contentImage);
-    auto nsJavaBin = self.metaInfo.javaBinary;
-    auto nsBasePath = self.metaInfo.i2pBase;
-    NSArray* arrArguments = [NSArray arrayWithObjects:&argList[0] count:argList.size()];
-    startupRouter(nsJavaBin, arrArguments, nsBasePath);
-    //if (self.enableVerboseLogging) NSLog(@"Defaults: %@", [pref dictionaryRepresentation]);
-  } catch (std::exception &err) {
-    auto errMsg = [NSString stringWithUTF8String:err.what()];
-    NSLog(@"Exception: %@", errMsg);
-    sendUserNotification(APP_IDSTR, [NSString stringWithFormat:@"Error: %@", errMsg], self.contentImage);
-  }
-}
+#endif
 
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
                                shouldPresentNotification:(NSUserNotification *)notification {
     return YES;
+}
+
+
+#ifdef __cplusplus
+
+inline std::string getDefaultBaseDir()
+{
+  // Figure out base directory
+  const char* pathFromHome = "/Users/%s/Library/I2P";
+  auto username = getenv("USER");
+  char buffer[strlen(pathFromHome)+strlen(username)];
+  sprintf(buffer, pathFromHome, username);
+  std::string i2pBaseDir(buffer);
+  return i2pBaseDir;
 }
 
@@ -429 +210 @@
 }
 
+#endif
+
 - (void)setApplicationDefaultPreferences {
   auto defaultJVMHome = check_output({"/usr/libexec/java_home","-v",DEF_MIN_JVM_VER});
@@ -434 +217 @@
   trim(tmpStdStr);
   auto cfDefaultHome  = CFStringCreateWithCString(NULL, const_cast<const char *>(tmpStdStr.c_str()), kCFStringEncodingUTF8);
-  [self.userPreferences registerDefaults:@{
+  /*[self.userPreferences registerDefaults:@{
     @"javaHome" : (NSString *)cfDefaultHome,
     @"lastI2PVersion" : (NSString *)CFSTR(DEF_I2P_VERSION),
-    @"enableLogging": @true,
-    @"enableVerboseLogging": @true,
-    @"autoStartRouter": @true,
+    @"enableLogging": @YES,
+    @"enableVerboseLogging": @YES,
+    @"autoStartRouter": @YES,
     @"i2pBaseDirectory": (NSString *)CFStringCreateWithCString(NULL, const_cast<const char *>(getDefaultBaseDir().c_str()), kCFStringEncodingUTF8)
-  }];
+  }];*/
   if (self.enableVerboseLogging) NSLog(@"Default JVM home preference set to: %@", (NSString *)cfDefaultHome);
 
@@ -457 +240 @@
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   // Init application here
+  
+  SwiftMainDelegate *swiftRuntime = [[SwiftMainDelegate alloc] init];
+  swiftRuntime.applicationDidFinishLaunching;
+  
   [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
   // Start with user preferences
@@ -465 +252 @@
 
 
-  // Get paths
-  NSBundle *launcherBundle = [NSBundle mainBundle];
-  auto iconImage = [launcherBundle pathForResource:@"ItoopieTransparent" ofType:@"png"];
-  self.contentImage = [NSImage imageNamed:iconImage];
-
+    // Get paths
+    NSBundle *launcherBundle = [NSBundle mainBundle];
+    //auto iconImage = [launcherBundle pathForResource:@"ItoopieTransparent" ofType:@"png"];
+  
+    // This is the only GUI the user experience on a regular basis.
+    //self.menuBarCtrl = [[MenuBarCtrl alloc] init];
+
+#ifdef __cplusplus
   gRawJvmList = std::make_shared<std::list<JvmVersionPtr> >(std::list<JvmVersionPtr>());
+#endif
   // In case we are unbundled, make us a proper UI application
   [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
   [NSApp activateIgnoringOtherApps:YES];
+
+  // TODO: Also check for new installations from time to time.
+  
+#ifdef __cplusplus
   auto javaHomePref = [self.userPreferences stringForKey:@"javaHome"];
-  if (self.enableVerboseLogging) NSLog(@"Java home from preferences: %@", javaHomePref);
-
-  // This is the only GUI the user experience on a regular basis.
-  self.menuBarCtrl = [[MenuBarCtrl alloc] init];
-
-  NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
-  if (self.enableVerboseLogging) NSLog(@"Appdomain is: %@", appDomain);
+  if (self.enableVerboseLogging)
+  {
+    NSLog(@"Java home from preferences: %@", javaHomePref);
+  }
+
+  if (self.enableVerboseLogging)
+  {
+    NSString *appDomain = [[NSBundle mainBundle] bundleIdentifier];
+    NSLog(@"Appdomain is: %@", appDomain);
+  }
 
   NSLog(@"We should have started the statusbar object by now...");
+  RouterProcessStatus* routerStatus = [[RouterProcessStatus alloc] init];
 
   std::string i2pBaseDir(getDefaultBaseDir());
-  //if (self.enableVerboseLogging) printf("Home directory is: %s\n", buffer);
-
-
-  //[statusBarButton setAction:@selector(itemClicked:)];
-  //dispatch_async(dispatch_get_main_queue(), ^{
-  //});
+
   auto pref = self.userPreferences;
-  self.menuBarCtrl.userPreferences = self.userPreferences;
-  self.menuBarCtrl.enableLogging = self.enableLogging;
-  self.menuBarCtrl.enableVerboseLogging = self.enableVerboseLogging;
-
-
-
-  if (port_check() != 0)
+  
+  bool shouldAutoStartRouter = false;
+
+  if (port_check(7657) != 0)
   {
     NSLog(@"Seems i2p is already running - I will not start the router (port 7657 is in use..)");
+    sendUserNotification(@"Found already running router", @"TCP port 7657 seem to be used by another i2p instance.");
+    
+    [routerStatus setRouterStatus: true];
+    [routerStatus setRouterRanByUs: false];
     return;
+  } else {
+    shouldAutoStartRouter = true;
   }
 
@@ -514 +311 @@
     if (self.enableVerboseLogging) NSLog(@"Javahome: %@", val);
     auto javaHome = std::string([val UTF8String]);
-    trim(javaHome); // Trim to remove endline
+    //trim(javaHome); // Trim to remove endline
     auto javaBin = std::string(javaHome);
     javaBin += "/bin/java"; // Append java binary to path.
@@ -521 +318 @@
 
 
+  //NSBundle *launcherBundle = [NSBundle mainBundle];
+    
   self.metaInfo = [[ExtractMetaInfo alloc] init];
-  self.metaInfo.i2pBase = [NSString stringWithUTF8String:i2pBaseDir.c_str()];
+  //self.metaInfo.i2pBase = [NSString stringWithUTF8String:i2pBaseDir.c_str()];
   self.metaInfo.javaBinary = [NSString stringWithUTF8String:getJavaBin().c_str()];
   self.metaInfo.jarFile = [launcherBundle pathForResource:@"launcher" ofType:@"jar"];
@@ -528 +327 @@
 
   std::string basearg("-Di2p.dir.base=");
-  basearg += i2pBaseDir;
+  //basearg += i2pBaseDir;
 
   std::string jarfile("-cp ");
@@ -540 +339 @@
 
     [self extractI2PBaseDir:^(BOOL success, NSError *error) {
-        //__typeof__(self) strongSelf = weakSelf;
-        //if (strongSelf == nil) return;
-        [self startupI2PRouter];
+      sendUserNotification(@"I2P is done extracting", @"I2P is now installed and ready to run!");
+      NSLog(@"Done extracting I2P");
+      if (shouldAutoStartRouter) [self startupI2PRouter];
     }];
 
   } else {
-      if (self.enableVerboseLogging) NSLog(@"I2P directory found!");
-      [self startupI2PRouter];
-  }
-
+    if (self.enableVerboseLogging) NSLog(@"I2P directory found!");
+    if (shouldAutoStartRouter) [self startupI2PRouter];
+  }
+#endif
 }
 
@@ -580 +379 @@
   NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
 
-
-
   app.delegate = [[AppDelegate alloc] initWithArgc:argc argv:argv];
   [NSBundle loadNibNamed:@"I2Launcher" owner:NSApp];
@@ -587 +384 @@
   [NSApp run];
   // Handle any errors
-  //CFRelease(javaHomes);
-  //CFRelease(err);
   [pool drain];
   return 0;