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

Merge branch 'pr/197' into develop

Browse Source 
# Conflicts:
#	ShadowsocksX-NG/ServerProfile.swift
This commit is contained in:
Charlie Qiu
2017-01-10 14:14:54 +08:00
parent 845c554330 59e3de1697
commit 0acfc98474
4 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ShadowsocksX-NG/ServerProfile.swift
View File

@ -8,7 +8,9 @@
import Cocoa
class ServerProfile: NSObject {
class ServerProfile: NSObject, NSCopying {
var uuid: String
var serverHost: String = ""
@ -75,8 +77,19 @@ class ServerProfile: NSObject {
ota = NSString(string: otaStr).boolValue
}
}
static func fromDictionary(_ data:[String: Any?]) -> ServerProfile {
public func copy(with zone: NSZone? = nil) -> Any {
let copy = ServerProfile()
copy.serverHost = self.serverHost
copy.serverPort = self.serverPort
copy.method = self.method
copy.password = self.password
copy.remark = self.remark
copy.ota = self.ota
return copy;
}
static func fromDictionary(_ data:[String:Any?]) -> ServerProfile {
let cp = {
(profile: ServerProfile) in
profile.serverHost = data["ServerHost"] as! String