Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Browse Source
This commit is contained in:
Mygod
2016-07-16 13:12:29 +08:00
parent 427ca9b181 781cfb336c
commit cf9cb3127b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.sbt
+2
View File
@@ -24,6 +24,8 @@ typedResources in Android := false
resConfigs in Android := Seq("ru", "zh", "zh-rCN")
dexMaxHeap in Android := "4g"
resolvers += Resolver.jcenterRepo
resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
src/main/scala/com/github/shadowsocks/AppManager.scala
+8 -9
View File
@@ -158,23 +158,22 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
def onMenuItemClick(item: MenuItem): Boolean = {
val clipboard = getSystemService(Context.CLIPBOARD_SERVICE).asInstanceOf[ClipboardManager]
val prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext)
item.getItemId match {
case R.id.action_apply_all =>
app.profileManager.getAllProfiles match {
case Some(profiles) =>
val proxiedAppString = prefs.getString(Key.individual, "")
profiles.foreach(profile => {
profile.individual = proxiedAppString
app.profileManager.updateProfile(profile)
val proxiedAppString = profile.individual
profiles.foreach(p => {
p.individual = proxiedAppString
app.profileManager.updateProfile(p)
})
Toast.makeText(this, R.string.action_apply_all, Toast.LENGTH_SHORT).show
case _ => Toast.makeText(this, R.string.action_export_err, Toast.LENGTH_SHORT).show
}
return true
case R.id.action_export =>
val bypass = prefs.getBoolean(Key.bypass, false)
val proxiedAppString = prefs.getString(Key.individual, "")
val bypass = profile.bypass
val proxiedAppString = profile.individual
val clip = ClipData.newPlainText(Key.individual, bypass + "\n" + proxiedAppString)
clipboard.setPrimaryClip(clip)
Toast.makeText(this, R.string.action_export_msg, Toast.LENGTH_SHORT).show()
@@ -185,13 +184,13 @@ class AppManager extends AppCompatActivity with OnMenuItemClickListener {
if (proxiedAppSequence != null) {
val proxiedAppString = proxiedAppSequence.toString
if (!proxiedAppString.isEmpty) {
val editor = prefs.edit
val i = proxiedAppString.indexOf('\n')
try {
val (enabled, apps) = if (i < 0) (proxiedAppString, "")
else (proxiedAppString.substring(0, i), proxiedAppString.substring(i + 1))
bypassSwitch.setChecked(enabled.toBoolean)
editor.putString(Key.individual, apps).apply()
profile.individual = apps
app.profileManager.updateProfile(profile)
Toast.makeText(this, R.string.action_import_msg, Toast.LENGTH_SHORT).show()
appListView.setVisibility(View.GONE)
loadingView.setVisibility(View.VISIBLE)