Bump Build version

Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into develop
Fix show QR require GPU
2026-11-05 20:55:07 +00:00 · 2017-10-21 10:23:10 +08:00 · 2017-10-21 10:12:06 +08:00 · 2017-10-21 10:09:59 +08:00 · 2017-09-07 18:02:21 +08:00 · 2017-08-18 18:39:36 +08:00
9 changed files with 10 additions and 9 deletions
@@ -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">
@@ -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>2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -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/"
@@ -81,6 +81,7 @@ class PreferencesWindowController: NSWindowController
            "auth_aes128_sha1",
            "auth_aes128_md5",
            "auth_chain_a",
+            "auth_chain_b",
            ])
        ObfsTextField.addItems(withObjectValues: [
            "plain",
@@ -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];
@@ -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)
            }
@@ -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"
@@ -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"; */
Author	SHA1	Message	Date
秦宇航	f38ade4584	Bump Build version	2017-10-21 10:23:10 +08:00
秦宇航	abfb8c1dd3	Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into develop	2017-10-21 10:12:06 +08:00
秦宇航	61e40e77bf	Fix show QR require GPU	2017-10-21 10:09:59 +08:00
ImPerat0R_	8baf1c8485	Fix typo. (#12 ) * Fix typo. * Fix typo	2017-09-07 18:02:21 +08:00
秦宇航	682fc346f8	Compile with macOS 10.11 To avoid install ss-local failed	2017-08-18 18:39:36 +08:00
秦宇航	8e09347fac	compile with macOS 10.11	2017-08-17 21:13:23 +08:00
秦宇航	e94ba06959	更新libev	2017-08-03 12:04:00 +08:00
秦宇航	25d2dfdd4a	修改订阅去重复策略	2017-08-03 12:03:41 +08:00
秦宇航	294c2a94e1	Bump version	2017-07-31 10:11:50 +08:00
秦宇航	8162d7346b	add auth_chain_b	2017-07-31 08:48:08 +08:00