diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index 89d01881..cd059227 100755 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -69,6 +69,9 @@ 刷新中... 添加配置文件 + 启用 NAT 模式. + 禁用 NAT 模式. + UDP 转发 由远程服务器转发 UDP 协议的数据包 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fb8bb57b..6bd9bd7d 100755 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -59,6 +59,8 @@ Stop the service Shutting down... Error: \"%s\". + Turn on NAT mode. + Turn off NAT mode. OK diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index a542ec30..02f77df1 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -51,6 +51,7 @@ import android.net.{Uri, VpnService} import android.os._ import android.preference._ import android.util.{DisplayMetrics, Log} +import android.view.View.OnLongClickListener import android.view._ import android.webkit.{WebView, WebViewClient} import android.widget._ @@ -499,13 +500,30 @@ class Shadowsocks getActionBar.setDisplayShowTitleEnabled(false) getActionBar.setDisplayShowCustomEnabled(true) getActionBar.setIcon(R.drawable.ic_stat_shadowsocks) + title.setOnLongClickListener(new OnLongClickListener { + override def onLongClick(v: View): Boolean = { + if (Utils.isLollipopOrAbove && bgService != null + && (bgService.getState == State.INIT || bgService.getState == State.STOPPED)) { + val natEnabled = status.getBoolean(Key.isNAT, false) + status.edit().putBoolean(Key.isNAT, !natEnabled).commit() + if (!natEnabled) { + Toast.makeText(getBaseContext, R.string.enable_nat, Toast.LENGTH_LONG).show() + } else { + Toast.makeText(getBaseContext, R.string.disable_nat, Toast.LENGTH_LONG).show() + } + true + } else { + false + } + } + }) // Register broadcast receiver registerReceiver(preferenceReceiver, new IntentFilter(Action.UPDATE_PREFS)) // Bind to the service spawn { - val isRoot = Console.isRoot + val isRoot = (!Utils.isLollipopOrAbove || status.getBoolean(Key.isNAT, false)) && Console.isRoot handler.post(new Runnable { override def run() { status.edit.putBoolean(Key.isRoot, isRoot).commit() diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 63562eee..2be09d8d 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -117,7 +117,7 @@ class ShadowsocksNatService extends Service with BaseService { val cmdBuf = new ArrayBuffer[String]() networks.foreach(network => { val networkInfo = manager.getNetworkInfo(network) - if (networkInfo.isAvailable) { + if (networkInfo.isConnected) { val netId = getNetId(network) val curDnsList = manager.getLinkProperties(network).getDnsServers if (curDnsList != null) { @@ -507,7 +507,7 @@ class ShadowsocksNatService extends Service with BaseService { filter.addAction(Action.CLOSE) closeReceiver = new BroadcastReceiver() { def onReceive(p1: Context, p2: Intent) { - Toast.makeText(p1, R.string.stopping, Toast.LENGTH_SHORT) + Toast.makeText(p1, R.string.stopping, Toast.LENGTH_SHORT).show() stopRunner() } } diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala index aed2a286..c233bac8 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala @@ -50,7 +50,8 @@ import com.github.shadowsocks.aidl.IShadowsocksService class ShadowsocksRunnerActivity extends Activity { - lazy val settings = PreferenceManager.getDefaultSharedPreferences(this) + private lazy val settings = PreferenceManager.getDefaultSharedPreferences(this) + private lazy val status = getSharedPreferences(Key.status, Context.MODE_PRIVATE) val handler = new Handler() val connection = new ServiceConnection { @@ -72,10 +73,10 @@ class ShadowsocksRunnerActivity extends Activity { def isVpnEnabled: Boolean = { if (vpnEnabled < 0) { - vpnEnabled = if (!Console.isRoot) { - 1 - } else { + vpnEnabled = if ((!Utils.isLollipopOrAbove || status.getBoolean(Key.isNAT, false)) && Console.isRoot) { 0 + } else { + 1 } } if (vpnEnabled == 1) true else false diff --git a/src/main/scala/com/github/shadowsocks/utils/Constants.scala b/src/main/scala/com/github/shadowsocks/utils/Constants.scala index 1f2a3405..bcd3dafa 100644 --- a/src/main/scala/com/github/shadowsocks/utils/Constants.scala +++ b/src/main/scala/com/github/shadowsocks/utils/Constants.scala @@ -65,6 +65,7 @@ object Key { val proxied = "Proxyed" + val isNAT = "isNAT" val isRoot = "isRoot" val status = "status" val proxyedApps = "proxyedApps"