diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 1c36a6e4..4f33c818 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionName="2.7.5"> diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index 23ff3bf9..b3911fc8 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 23ff3bf96aec807a2e3e31d4a80fcab6e56c11f2 +Subproject commit b3911fc84fe9dd269fd53b1c9767433f84050415 diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 7775f854..5809a927 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -399,6 +399,11 @@ class Shadowsocks def prepareStartService() { showProgress(getString(R.string.connecting)) spawn { + if (!status.getBoolean(getVersionName, false)) { + status.edit.putBoolean(getVersionName, true).commit() + install() + } + if (isVpnEnabled) { val intent = VpnService.prepare(this) if (intent != null) { @@ -476,13 +481,7 @@ class Shadowsocks // Update the profile if (!status.getBoolean(getVersionName, false)) { - val h = showProgress(getString(R.string.initializing)) - status.edit.putBoolean(getVersionName, true).apply() currentProfile = profileManager.create() - spawn { - install() - h.sendEmptyMessage(0) - } } // Initialize the profile diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index c44750bb..6770929d 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -63,7 +63,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { private lazy val application = getApplication.asInstanceOf[ShadowsocksApplication] val TAG = "ShadowsocksVpnService" - val VPN_MTU = 1500 + val VPN_MTU = 1400 val PRIVATE_VLAN = "26.26.26.%s" var conn: ParcelFileDescriptor = null var notificationManager: NotificationManager = null