From ffdde981fbdd49adbe3f93cdb0ad380bd1a624b1 Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 23 Nov 2015 20:06:11 +0800 Subject: [PATCH] Fix realtime traffic in profile selector --- .../com/github/shadowsocks/ProfileManagerActivity.scala | 5 +++-- .../scala/com/github/shadowsocks/ShadowsocksNatService.scala | 4 ++-- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala index 96ba5106..1c07c504 100644 --- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala @@ -1,7 +1,7 @@ package com.github.shadowsocks import android.content.Intent -import android.os.Bundle +import android.os.{Handler, Bundle} import android.support.design.widget.Snackbar import android.support.v7.app.{AlertDialog, AppCompatActivity} import android.support.v7.widget.RecyclerView.ViewHolder @@ -69,7 +69,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe builder.setSpan(new TextAppearanceSpan(ProfileManagerActivity.this, android.R.style.TextAppearance_Small), start + 1, builder.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) } - text.setText(builder) + handler.post(() => text.setText(builder)) } def bind(item: Profile) { @@ -129,6 +129,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe } private var selectedItem: ProfileViewHolder = _ + private val handler = new Handler private lazy val profilesAdapter = new ProfilesAdapter private var removedSnackbar: Snackbar = _ diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index d00e2eff..75f7cca0 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -40,9 +40,9 @@ package com.github.shadowsocks import java.io.File +import java.lang.Process import java.net.{Inet6Address, InetAddress} import java.util.Locale -import java.lang.{Process, ProcessBuilder} import android.app._ import android.content._ @@ -56,8 +56,8 @@ import android.widget.Toast import com.github.shadowsocks.aidl.Config import com.github.shadowsocks.utils._ -import scala.collection._ import scala.collection.JavaConversions._ +import scala.collection._ import scala.collection.mutable.ArrayBuffer import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 53ecdfbc..7c07e8e2 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -40,8 +40,8 @@ package com.github.shadowsocks import java.io.File +import java.lang.Process import java.util.Locale -import java.lang.{Process, ProcessBuilder} import android.app._ import android.content._