From 4059b785b04d71865e4b6ffe1a2039461447ac48 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 10 Nov 2015 18:57:29 +0800 Subject: [PATCH] Switch to another profile while connected --- src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index ccab7de1..853cef0f 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -387,12 +387,6 @@ class Shadowsocks changeSwitch(checked = false) case false => serviceStop() - if (fab.isEnabled) { - fab.setEnabled(false) - handler.postDelayed(() => { - fab.setEnabled(true) - }, 1000) - } } }) fab.setOnLongClickListener((v: View) => { @@ -439,6 +433,8 @@ class Shadowsocks } updatePreferenceScreen() + + serviceStop() } def addProfile(profile: Profile) { @@ -493,7 +489,6 @@ class Shadowsocks } private def setPreferenceEnabled(enabled: Boolean) { - preferences.findPreference(Key.profiles).setEnabled(enabled) preferences.findPreference(Key.isNAT).setEnabled(enabled) for (name <- Shadowsocks.PROXY_PREFS) { val pref = preferences.findPreference(name)