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

src/main/jni/Android.mk

@@ -254,7 +254,7 @@ SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c j
 
 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
+LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \
@@ -281,7 +281,7 @@ SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c
 
 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
+LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \

src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala

@@ -9,7 +9,8 @@ import com.github.shadowsocks.utils.Action
   * @author Mygod
   */
 trait ServiceBoundContext extends Context {
-  val connection = new ServiceConnection {
+
+  class ShadowsocksServiceConnection extends ServiceConnection {
     override def onServiceConnected(name: ComponentName, service: IBinder) {
       bgService = IShadowsocksService.Stub.asInterface(service)
       if (callback != null) try {
@@ -37,6 +38,7 @@ trait ServiceBoundContext extends Context {
   def onServiceDisconnected() = ()
 
   private var callback: IShadowsocksServiceCallback.Stub = _
+  private var connection: ShadowsocksServiceConnection = _
 
   // Variables
   var bgService: IShadowsocksService = _
@@ -46,9 +48,13 @@ trait ServiceBoundContext extends Context {
     if (bgService == null) {
       val s =
         if (ShadowsocksApplication.isVpnEnabled) classOf[ShadowsocksVpnService] else classOf[ShadowsocksNatService]
+
       val intent = new Intent(this, s)
       intent.setAction(Action.SERVICE)
+
+      connection = new ShadowsocksServiceConnection()
       bindService(intent, connection, Context.BIND_AUTO_CREATE)
+
       startService(new Intent(this, s))
     }
   }
@@ -62,8 +68,10 @@ trait ServiceBoundContext extends Context {
           case ignored: RemoteException => // Nothing
         }
       }
-      unbindService(connection)
-      bgService = null
+      if (connection != null) {
+        unbindService(connection)
+        connection = null
+      }
     }
   }
 }

src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala

@@ -73,10 +73,13 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
   }
 
   def onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) = key match {
-    case Key.isNAT => if (ShadowsocksApplication.isRoot) activity.handler.post(() => {
-      activity.deattachService()
-      activity.attachService()
-    })
+    case Key.isNAT => if (ShadowsocksApplication.isRoot && activity != null) {
+      activity.handler.post(() => {
+        val intent = activity.getIntent
+        activity.finish()
+        startActivity(intent)
+      })
+    }
     case _ =>
   }
 }