authorize helper manually; version updated

Author: Cenmrev

V2RayX/AppDelegate.m

@@ -44,7 +44,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     // create a serial queue used for NSTask operations
     taskQueue = dispatch_queue_create("cenmrev.v2rayx.nstask", DISPATCH_QUEUE_SERIAL);
 
-    if (![self installHelper]) {
+    if (![self installHelper:false]) {
         [[NSApplication sharedApplication] terminate:nil];// installation failed or stopped by user,
     };
 
@@ -689,35 +689,38 @@ -(BOOL)currentProxySetByMe {
     return YES;
 }*/
 
-- (BOOL)installHelper {
+- (IBAction)authorizeV2sys:(id)sender {
+    [self installHelper:true];
+}
+
+- (BOOL)installHelper:(BOOL)force {
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    if (![fileManager fileExistsAtPath:kV2RayXHelper] || ![self isSysconfVersionOK]) {
-        NSAlert *installAlert = [[NSAlert alloc] init];
-        [installAlert addButtonWithTitle:@"Install"];
-        [installAlert addButtonWithTitle:@"Quit"];
-        [installAlert setMessageText:@"V2RayX needs to install a small tool to /Library/Application Support/V2RayX/ with administrator privileges to set system proxy quickly.\nOtherwise you need to type in the administrator password every time you change system proxy through V2RayX."];
-        if ([installAlert runModal] == NSAlertFirstButtonReturn) {
-            NSLog(@"start install");
-            NSString *helperPath = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], @"install_helper.sh"];
-            NSLog(@"run install script: %@", helperPath);
-            NSDictionary *error;
-            NSString *script = [NSString stringWithFormat:@"do shell script \"bash %@\" with administrator privileges", helperPath];
-            NSAppleScript *appleScript = [[NSAppleScript new] initWithSource:script];
-            if ([appleScript executeAndReturnError:&error]) {
-                NSLog(@"installation success");
-                return YES;
-            } else {
-                NSLog(@"installation failure");
-                //unknown failure
-                return NO;
-            }
+    if (!force && [fileManager fileExistsAtPath:kV2RayXHelper] && [self isSysconfVersionOK]) {
+        // helper already installed
+        return YES;
+    }
+    NSAlert *installAlert = [[NSAlert alloc] init];
+    [installAlert addButtonWithTitle:@"Install"];
+    [installAlert addButtonWithTitle:@"Quit"];
+    [installAlert setMessageText:@"V2RayX needs to install a small tool to /Library/Application Support/V2RayX/ with administrator privileges to set system proxy quickly.\nOtherwise you need to type in the administrator password every time you change system proxy through V2RayX."];
+    if ([installAlert runModal] == NSAlertFirstButtonReturn) {
+        NSLog(@"start install");
+        NSString *helperPath = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], @"install_helper.sh"];
+        NSLog(@"run install script: %@", helperPath);
+        NSDictionary *error;
+        NSString *script = [NSString stringWithFormat:@"do shell script \"bash %@\" with administrator privileges", helperPath];
+        NSAppleScript *appleScript = [[NSAppleScript new] initWithSource:script];
+        if ([appleScript executeAndReturnError:&error]) {
+            NSLog(@"installation success");
+            return YES;
         } else {
-            // stopped by user
+            NSLog(@"installation failure");
+            //unknown failure
             return NO;
         }
     } else {
-        // helper already installed
-        return YES;
+        // stopped by user
+        return NO;
     }
 }
 

V2RayX/Base.lproj/MainMenu.xib

@@ -756,6 +756,12 @@
                         <action selector="resetPac:" target="Voe-Tx-rLC" id="WUw-A2-aU5"/>
                     </connections>
                 </menuItem>
+                <menuItem title="Authorize v2rayx_sysconf..." id="mOc-zi-Beb">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="authorizeV2sys:" target="Voe-Tx-rLC" id="ycW-j1-Sv7"/>
+                    </connections>
+                </menuItem>
                 <menuItem isSeparatorItem="YES" id="YAD-DW-T91"/>
                 <menuItem title="Help" id="Yq1-i5-ecF">
                     <modifierMask key="keyEquivalentModifierMask"/>

V2RayX/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>198</string>
+	<string>201</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>