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

Update for swift 3.

Browse Source 
- Convert code to swift 3
- Update alamofire to 4.0.1 for swift 3.
This commit is contained in:
Charlie Qiu
2016-10-02 01:17:07 +08:00
parent 7076523cbd
commit 7a7249b80f
41 changed files with 6976 additions and 4963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ShadowsocksX-NG/ServerProfileManager.swift
View File

@ -15,45 +15,45 @@ class ServerProfileManager: NSObject {
var profiles:[ServerProfile]
var activeProfileId: String?
private override init() {
fileprivate override init() {
profiles = [ServerProfile]()
let defaults = NSUserDefaults.standardUserDefaults()
if let _profiles = defaults.arrayForKey("ServerProfiles") {
let defaults = UserDefaults.standard
if let _profiles = defaults.array(forKey: "ServerProfiles") {
for _profile in _profiles {
let profile = ServerProfile.fromDictionary(_profile as! [String : AnyObject])
profiles.append(profile)
}
}
activeProfileId = defaults.stringForKey("ActiveServerProfileId")
activeProfileId = defaults.string(forKey: "ActiveServerProfileId")
}
func setActiveProfiledId(id: String) {
func setActiveProfiledId(_ id: String) {
activeProfileId = id
let defaults = NSUserDefaults.standardUserDefaults()
defaults.setObject(id, forKey: "ActiveServerProfileId")
let defaults = UserDefaults.standard
defaults.set(id, forKey: "ActiveServerProfileId")
}
func save() {
let defaults = NSUserDefaults.standardUserDefaults()
let defaults = UserDefaults.standard
var _profiles = [AnyObject]()
for profile in profiles {
if profile.isValid() {
let _profile = profile.toDictionary()
_profiles.append(_profile)
_profiles.append(_profile as AnyObject)
}
}
defaults.setObject(_profiles, forKey: "ServerProfiles")
defaults.set(_profiles, forKey: "ServerProfiles")
if getActiveProfile() == nil {
activeProfileId = nil
}
if activeProfileId != nil {
defaults.setObject(activeProfileId, forKey: "ActiveServerProfileId")
defaults.set(activeProfileId, forKey: "ActiveServerProfileId")
writeSSLocalConfFile((getActiveProfile()?.toJsonConfig())!)
} else {
defaults.removeObjectForKey("ActiveServerProfileId")
defaults.removeObject(forKey: "ActiveServerProfileId")
removeSSLocalConfFile()
}
}