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

[BUG] Fix #211 Exported server settings JSON does not include KCPTUN related configuration

Browse Source
This commit is contained in:
Charlie Qiu
2017-01-17 01:57:49 +08:00
parent d4aa0f7b47
commit e5c8e965d4
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ShadowsocksX-NG/ServerProfileManager.swift
View File

@ -97,6 +97,13 @@ class ServerProfileManager: NSObject {
profile.method = item["method"] as! String profile.method = item["method"] as! String
profile.password = item["password"] as! String profile.password = item["password"] as! String
profile.remark = item["remarks"] as! String profile.remark = item["remarks"] as! String
// Kcptun
profile.enabledKcptun = item["enabled_kcptun"]?.boolValue ?? false
if let kcptun = item["kcptun"] {
profile.kcptunProfile = KcptunProfile.fromDictionary(kcptun as! [String : Any?])
}
self.profiles.append(profile) self.profiles.append(profile)
self.save() self.save()
} }
@ -141,6 +148,11 @@ class ServerProfileManager: NSObject {
configProfile.setValue(profile.method, forKey: "method") configProfile.setValue(profile.method, forKey: "method")
configProfile.setValue(profile.remark, forKey: "remarks") configProfile.setValue(profile.remark, forKey: "remarks")
configProfile.setValue(profile.remark.data(using: String.Encoding.utf8)?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0)), forKey: "remarks_base64") configProfile.setValue(profile.remark.data(using: String.Encoding.utf8)?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0)), forKey: "remarks_base64")
// Kcptun
configProfile.setValue(profile.enabledKcptun, forKey: "enabled_kcptun")
configProfile.setValue(profile.kcptunProfile.toDictionary(), forKey: "kcptun")
configsArray.add(configProfile) configsArray.add(configProfile)
} }
jsonArr1.setValue(configsArray, forKey: "configs") jsonArr1.setValue(configsArray, forKey: "configs")