Merge pull request #32 from xuxiaokang/develop

Modify new version update check url and acl files' url

ShadowsocksX-NG/AppDelegate.swift

@@ -85,9 +85,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
             "LocalSocks5.EnableUDPRelay": NSNumber(value: false as Bool),
             "LocalSocks5.EnableVerboseMode": NSNumber(value: false as Bool),
             "GFWListURL": "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt",
-            "ACLWhiteListURL": "https://raw.githubusercontent.com/shadowsocksr/shadowsocksr-libev/master/acl/chn.acl",
-            "ACLAutoListURL": "https://raw.githubusercontent.com/shadowsocksr/shadowsocksr-libev/master/acl/gfwlist.acl",
-            "ACLProxyBackCHNURL":"https://raw.githubusercontent.com/shadowsocksr/ShadowsocksX-NG/develop/ShadowsocksX-NG/backchn.acl",
+            "ACLWhiteListURL": "https://raw.githubusercontent.com/shadowsocks/shadowsocks-libev/master/acl/chn.acl",
+            "ACLAutoListURL": "https://raw.githubusercontent.com/shadowsocks/shadowsocks-libev/master/acl/gfwlist.acl",
+            "ACLProxyBackCHNURL":"https://raw.githubusercontent.com/shadowsocks/shadowsocks-libev/master/ShadowsocksX-NG/server_block_chn.acl",
             "AutoConfigureNetworkServices": NSNumber(value: true as Bool),
             "LocalHTTP.ListenAddress": "127.0.0.1",
             "LocalHTTP.ListenPort": NSNumber(value: 1087 as UInt16),
@@ -759,7 +759,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
                     let alertResult = versionChecker.showAlertView(Title: newVersion["Title"] as! String, SubTitle: newVersion["SubTitle"] as! String, ConfirmBtn: newVersion["ConfirmBtn"] as! String, CancelBtn: newVersion["CancelBtn"] as! String)
                     print(alertResult)
                     if (newVersion["newVersion"] as! Bool && alertResult == 1000){
-                        NSWorkspace.shared().open(URL(string: "https://github.com/shadowsocksr/ShadowsocksX-NG/releases")!)
+                        NSWorkspace.shared().open(URL(string: "https://github.com/qinyuhang/ShadowsocksX-NG-R/releases")!)
                     }
                 }
             }

ShadowsocksX-NG/Base.lproj/PreferencesWindowController.xib

@@ -375,7 +375,7 @@ DQ
                         <constraints>
                             <constraint firstAttribute="width" constant="69" id="s2I-cF-RJc"/>
                         </constraints>
-                        <buttonCell key="cell" type="push" title="Cacnel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW">
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                             <string key="keyEquivalent" base64-UTF8="YES">

ShadowsocksX-NG/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.1-R8</string>
+	<string>1.4.3-R8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

ShadowsocksX-NG/LaunchAgentUtils.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-let SS_LOCAL_VERSION = "2.5.6.9.static"
+let SS_LOCAL_VERSION = "2.5.6.12.static"
 let PRIVOXY_VERSION = "3.0.26.static"
 let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
 let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"

ShadowsocksX-NG/PreferencesWindowController.swift

@@ -81,6 +81,7 @@ class PreferencesWindowController: NSWindowController
             "auth_aes128_sha1",
             "auth_aes128_md5",
             "auth_chain_a",
+            "auth_chain_b",
             ])
         ObfsTextField.addItems(withObjectValues: [
             "plain",

ShadowsocksX-NG/SWBQRCodeWindowController.m

@@ -50,9 +50,9 @@
     CGContextRef bitmapRef = CGBitmapContextCreate(nil, width, height, 8, 0, cs, (CGBitmapInfo)kCGImageAlphaNone);
     
 #if TARGET_OS_IPHONE
-    CIContext *context = [CIContext contextWithOptions:nil];
+    CIContext *context = [CIContext contextWithOptions: @{kCIContextUseSoftwareRenderer: true}];
 #else
-    CIContext *context = [CIContext contextWithCGContext:bitmapRef options:nil];
+    CIContext *context = [CIContext contextWithCGContext:bitmapRef options:@{kCIContextUseSoftwareRenderer: @true}];
 #endif
     
     CGImageRef bitmapImage = [context createCGImage:image fromRect:extent];

ShadowsocksX-NG/ServerProfileManager.swift

@@ -94,7 +94,7 @@ class ServerProfileManager: NSObject {
     
     func isExisted(profile: ServerProfile) -> (Bool, Int){
         for (index, value) in profiles.enumerated() {
-            let ret = value.serverHost == profile.serverHost
+            let ret = (value.serverHost == profile.serverHost && value.serverPort == profile.serverPort)
             if ret {
                 return (ret, index)
             }

ShadowsocksX-NG/Utils.m

@@ -45,7 +45,7 @@ void ScanQRCodeOnScreen() {
     NSMutableArray* foundSSUrls = [NSMutableArray array];
     
     CIDetector *detector = [CIDetector detectorOfType:@"CIDetectorTypeQRCode"
-                                              context:nil
+                                              context:[CIContext contextWithOptions:@{kCIContextUseSoftwareRenderer: @true}]
                                               options:@{ CIDetectorAccuracy:CIDetectorAccuracyHigh }];
     
     for (unsigned int displaysIndex = 0; displaysIndex < dspCount; displaysIndex++)
@@ -66,7 +66,7 @@ void ScanQRCodeOnScreen() {
     }
     
     free(displays);
-    
+    // TODO if not find any urls push a notification tells there is no QR on the screen
     [[NSNotificationCenter defaultCenter]
      postNotificationName:@"NOTIFY_FOUND_SS_URL"
      object:nil

ShadowsocksX-NG/VersionChecker.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-let _VERSION_XML_URL = "https://raw.githubusercontent.com/shadowsocksr/ShadowsocksX-NG/develop/ShadowsocksX-NG/Info.plist"
+let _VERSION_XML_URL = "https://raw.githubusercontent.com/qinyuhang/ShadowsocksX-NG-R/develop/ShadowsocksX-NG/Info.plist"
 let _VERSION_XML_LOCAL:String = Bundle.main.bundlePath + "/Contents/Info.plist"
 
 class VersionChecker: NSObject {

ShadowsocksX-NG/install_ss_local.sh

@@ -8,7 +8,7 @@
 
 
 cd `dirname "${BASH_SOURCE[0]}"`
-ssLocalVersion=2.5.6.9.static
+ssLocalVersion=2.5.6.12.static
 mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
 cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/"
 rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"

ShadowsocksX-NG/zh-Hans.lproj/PreferencesWindowController.strings

@@ -26,7 +26,7 @@
 /* Class = "NSTextFieldCell"; title = "Obfs Param"; ObjectID = "g7c-fW-7J4"; */
 "g7c-fW-7J4.title" = "混淆参数:";
 
-/* Class = "NSButtonCell"; title = "Cacnel"; ObjectID = "j03-9E-uHW"; */
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "j03-9E-uHW"; */
 "j03-9E-uHW.title" = "取消";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */