xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/multiple_select

Browse Source
This commit is contained in:
Qiu Yuzhou
2017-07-20 10:06:02 +08:00
committed by GitHub
parent efd0c76763 55971b4c05
commit 5a9ccc456a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -39,7 +39,7 @@ From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/)
- Scan QRCode from screen. - Scan QRCode from screen.
- Auto launch at login. - Auto launch at login.
- User rules for PAC. - User rules for PAC.
- Support OTA - Support for [AEAD Ciphers](https://shadowsocks.org/en/spec/AEAD-Ciphers.html)
- HTTP Proxy by [privoxy](http://www.privoxy.org/) - HTTP Proxy by [privoxy](http://www.privoxy.org/)
- Over [kcptun](https://github.com/xtaci/kcptun). Version 20170322 - Over [kcptun](https://github.com/xtaci/kcptun). Version 20170322
- Export/Import configure file. - Export/Import configure file.

2
ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib
View File

@ -190,7 +190,7 @@
</textField> </textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="tGd-pe-2xJ"> <button translatesAutoresizingMaskIntoConstraints="NO" id="tGd-pe-2xJ">
<rect key="frame" x="240" y="108" width="222" height="18"/> <rect key="frame" x="240" y="108" width="222" height="18"/>
<buttonCell key="cell" type="check" title="Enable Udp Replay" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="R3v-iN-zu8"> <buttonCell key="cell" type="check" title="Enable UDP Relay" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="R3v-iN-zu8">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>

4
ShadowsocksX-NG/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.5.0</string> <string>1.5.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
@ -36,7 +36,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>5</string> <string>1</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

4
ShadowsocksX-NG/LaunchAgentUtils.swift
View File

@ -151,7 +151,9 @@ func SyncSSLocal() {
changed = changed || generateSSLocalLauchAgentPlist() changed = changed || generateSSLocalLauchAgentPlist()
let mgr = ServerProfileManager.instance let mgr = ServerProfileManager.instance
if mgr.activeProfileId != nil { if mgr.activeProfileId != nil {
changed = changed || writeSSLocalConfFile((mgr.getActiveProfile()?.toJsonConfig())!) if let profile = mgr.getActiveProfile() {
changed = changed || writeSSLocalConfFile((profile.toJsonConfig()))
}
let on = UserDefaults.standard.bool(forKey: "ShadowsocksOn") let on = UserDefaults.standard.bool(forKey: "ShadowsocksOn")
if on { if on {