Commit 436119e0 authored by Max Lv's avatar Max Lv

Disable profile switching when connected

parent e8ff469e
...@@ -42,12 +42,15 @@ libraryDependencies ++= ...@@ -42,12 +42,15 @@ libraryDependencies ++=
"com.google.android.gms" % "play-services-analytics" % "10.0.1" :: "com.google.android.gms" % "play-services-analytics" % "10.0.1" ::
"com.google.android.gms" % "play-services-gcm" % "10.0.1" :: "com.google.android.gms" % "play-services-gcm" % "10.0.1" ::
"com.j256.ormlite" % "ormlite-android" % "5.0" :: "com.j256.ormlite" % "ormlite-android" % "5.0" ::
"com.mikepenz" % "materialdrawer" % "5.8.1" ::
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
"dnsjava" % "dnsjava" % "2.1.7" :: "dnsjava" % "dnsjava" % "2.1.7" ::
"eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" :: "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
"me.dm7.barcodescanner" % "zxing" % "1.9" :: "me.dm7.barcodescanner" % "zxing" % "1.9" ::
"net.glxn.qrgen" % "android" % "2.0" :: "net.glxn.qrgen" % "android" % "2.0" ::
"com.mikepenz" % "materialdrawer" % "5.8.1" ::
"com.mikepenz" % "materialize" % "1.0.0" ::
"com.mikepenz" % "iconics-core" % "2.8.0" ::
"com.mikepenz" % "fastadapter" % "2.1.0" ::
Nil Nil
lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables") lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
......
...@@ -33,7 +33,7 @@ import android.view._ ...@@ -33,7 +33,7 @@ import android.view._
import android.widget.{TextView, Toast} import android.widget.{TextView, Toast}
import com.github.shadowsocks.ShadowsocksApplication.app import com.github.shadowsocks.ShadowsocksApplication.app
import com.github.shadowsocks.database.Profile import com.github.shadowsocks.database.Profile
import com.github.shadowsocks.utils.{Action, Parser, TrafficMonitor, Utils} import com.github.shadowsocks.utils._
import com.github.shadowsocks.widget.UndoSnackbarManager import com.github.shadowsocks.widget.UndoSnackbarManager
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
...@@ -92,10 +92,12 @@ final class ProfilesFragment extends ToolbarFragment with OnMenuItemClickListene ...@@ -92,10 +92,12 @@ final class ProfilesFragment extends ToolbarFragment with OnMenuItemClickListene
} }
def onClick(v: View) { def onClick(v: View) {
val old = app.profileId if (getActivity.asInstanceOf[MainActivity].state == State.STOPPED) {
app.switchProfile(item.id) val old = app.profileId
profilesAdapter.refreshId(old) app.switchProfile(item.id)
bind(item) profilesAdapter.refreshId(old)
bind(item)
}
} }
} }
......
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