Changeset e8decff5 for launchers/macosx/main.mm

Timestamp:

Sep 20, 2018 3:20:39 AM (20 months ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

85ebb2f

Parents:

3c0a8cf

Message:

Mac OS X Launcher: more cleanup and some bugfixes.

File:

• launchers/macosx/main.mm (modified) (13 diffs)

launchers/macosx/main.mm

@@ -12 +12 @@
 #import <Foundation/Foundation.h>
 #import <Foundation/NSFileManager.h>
-
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFStream.h>
-#include <CoreFoundation/CFPropertyList.h>
-#include <CoreFoundation/CFDictionary.h>
-#include <CoreFoundation/CFArray.h>
-#include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFPreferences.h>
 
@@ -31 +23 @@
 #include "AppDelegate.h"
 #include "RouterTask.h"
-#include "JavaHelper.h"
 #include "include/fn.h"
 #include "include/portcheck.h"
@@ -112 +103 @@
       cli.push_back("net.i2p.launchers.BaseExtractor");
       auto rs = [[RouterProcessStatus alloc] init];
-      NSString* jh = [rs getJavaHome];
-      if (jh != nil) {
-        NSLog(@"jh er %@", jh);
-      }
-      
-      NSString* newString = [NSString stringWithFormat:@"file://%@", rs.getJavaHome];
-      NSURL *baseURL = [NSURL fileURLWithPath:newString];
       
       std::string execStr = std::string([rs.getJavaHome UTF8String]);
@@ -133 +117 @@
         if (extractStatus == 0)
         {
-          //success = YES;
-          NSLog(@"Time to detect I2P version in install directory");
-          [self.swiftRuntime findInstalledI2PVersion];
+          NSLog(@"Extraction complete!");
         }
       
@@ -147 +129 @@
       // All done. Assume success and error are already set.
       dispatch_async(dispatch_get_main_queue(), ^{
-        //sendUserNotification(APP_IDSTR, @"Extraction complete!", self.contentImage);
         if (completion) {
           completion(success, error);
@@ -159 +140 @@
     }
   });
-    
-  
-}
-
-
-- (NSString *)userSelectJavaHome:(JvmListPtr)rawJvmList
-{
-  NSString *appleScriptString = @"set jvmlist to {\"Newest\"";
-  for (auto item : *rawJvmList) {
-    auto str = strprintf(",\"%s\"", item->JVMName.c_str()).c_str();
-    NSString* tmp = [NSString stringWithUTF8String:str];
-    appleScriptString = [appleScriptString stringByAppendingString:tmp];
-  }
-  appleScriptString = [appleScriptString stringByAppendingString:@"}\nchoose from list jvmlist\n"];
-  NSAppleScript *theScript = [[NSAppleScript alloc] initWithSource:appleScriptString];
-  NSDictionary *theError = nil;
-  NSString* userResult = [[theScript executeAndReturnError: &theError] stringValue];
-  NSLog(@"User choosed %@.\n", userResult);
-  if (theError != nil)
-  {
-    NSLog(@"Error: %@.\n", theError);
-  }
-  return userResult;
 }
 
 - (void)setApplicationDefaultPreferences {
-  auto defaultJVMHome = check_output({"/usr/libexec/java_home","-v",DEF_MIN_JVM_VER});
-  auto tmpStdStr = std::string(defaultJVMHome.buf.data());
-  trim(tmpStdStr);
-  auto cfDefaultHome  = CFStringCreateWithCString(NULL, const_cast<const char *>(tmpStdStr.c_str()), kCFStringEncodingUTF8);
   [self.userPreferences registerDefaults:@{
-    @"javaHome" : (NSString *)cfDefaultHome,
-    @"lastI2PVersion" : (NSString *)CFSTR(DEF_I2P_VERSION),
     @"enableLogging": @YES,
     @"enableVerboseLogging": @YES,
@@ -197 +149 @@
     @"i2pBaseDirectory": (NSString *)CFStringCreateWithCString(NULL, const_cast<const char *>(getDefaultBaseDir().c_str()), kCFStringEncodingUTF8)
   }];
-  if (self.enableVerboseLogging) NSLog(@"Default JVM home preference set to: %@", cfDefaultHome);
 
   auto dict = [self.userPreferences dictionaryRepresentation];
@@ -206 +157 @@
 
   if (self.enableVerboseLogging) NSLog(@"Default preferences stored!");
+}
+
 #endif
-}
-
-
 
 
@@ -232 +182 @@
 
 #ifdef __cplusplus
-  //gRawJvmList = std::make_shared<std::list<JvmVersionPtr> >(std::list<JvmVersionPtr>());
 
   RouterProcessStatus* routerStatus = [[RouterProcessStatus alloc] init];
@@ -256 +205 @@
 
   NSBundle *launcherBundle = [NSBundle mainBundle];
+  auto sBridge = [[SBridge alloc] init];
   
   // Helper object to hold statefull path information
@@ -270 +220 @@
   jarfile += [self.metaInfo.zipFile UTF8String];
   
-  auto sBridge = [[SBridge alloc] init];
-  
   // Initialize the Swift environment (the UI components)
   [self.swiftRuntime applicationDidFinishLaunching];
@@ -287 +235 @@
       NSLog(@"Done extracting I2P");
       
+      NSLog(@"Time to detect I2P version in install directory");
+      [self.swiftRuntime findInstalledI2PVersion];
       if (shouldAutoStartRouter) {
         [sBridge startupI2PRouter:self.metaInfo.i2pBase javaBinPath:self.metaInfo.javaBinary];
@@ -295 +245 @@
   } else {
     // I2P was already found extracted
+    NSLog(@"Time to detect I2P version in install directory");
+    [self.swiftRuntime findInstalledI2PVersion];
     
     if (shouldAutoStartRouter) {