Commit 83a6d886 authored by Max Lv's avatar Max Lv

Merge pull request #420 from Mygod/master

Switch to another profile while connected
parents d96cb0ea 4059b785
...@@ -350,11 +350,6 @@ class Shadowsocks ...@@ -350,11 +350,6 @@ class Shadowsocks
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
// Update the profile
if (!ShadowsocksApplication.settings.getBoolean(ShadowsocksApplication.getVersionName, false)) {
currentProfile = ShadowsocksApplication.profileManager.create()
}
// Initialize the profile // Initialize the profile
currentProfile = { currentProfile = {
ShadowsocksApplication.currentProfile getOrElse currentProfile ShadowsocksApplication.currentProfile getOrElse currentProfile
...@@ -392,12 +387,6 @@ class Shadowsocks ...@@ -392,12 +387,6 @@ class Shadowsocks
changeSwitch(checked = false) changeSwitch(checked = false)
case false => case false =>
serviceStop() serviceStop()
if (fab.isEnabled) {
fab.setEnabled(false)
handler.postDelayed(() => {
fab.setEnabled(true)
}, 1000)
}
} }
}) })
fab.setOnLongClickListener((v: View) => { fab.setOnLongClickListener((v: View) => {
...@@ -444,6 +433,8 @@ class Shadowsocks ...@@ -444,6 +433,8 @@ class Shadowsocks
} }
updatePreferenceScreen() updatePreferenceScreen()
serviceStop()
} }
def addProfile(profile: Profile) { def addProfile(profile: Profile) {
...@@ -498,7 +489,6 @@ class Shadowsocks ...@@ -498,7 +489,6 @@ class Shadowsocks
} }
private def setPreferenceEnabled(enabled: Boolean) { private def setPreferenceEnabled(enabled: Boolean) {
preferences.findPreference(Key.profiles).setEnabled(enabled)
preferences.findPreference(Key.isNAT).setEnabled(enabled) preferences.findPreference(Key.isNAT).setEnabled(enabled)
for (name <- Shadowsocks.PROXY_PREFS) { for (name <- Shadowsocks.PROXY_PREFS) {
val pref = preferences.findPreference(name) val pref = preferences.findPreference(name)
......
...@@ -163,10 +163,4 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) { ...@@ -163,10 +163,4 @@ class ProfileManager(settings: SharedPreferences, dbHelper: DBHelper) {
updateProfile(profile) updateProfile(profile)
profile profile
} }
def create(): Profile = {
val profile = loadFromPreferences
createOrUpdateProfile(profile)
profile
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment