From 2bf44c7efddb5c976c94c57beede22457270514a Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 26 Feb 2014 11:01:47 +0800
Subject: [PATCH] fix some issues

---
 src/main/scala/com/github/shadowsocks/BaseService.scala | 4 ++--
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala
index 38ea7636..75eb4cb4 100644
--- a/src/main/scala/com/github/shadowsocks/BaseService.scala
+++ b/src/main/scala/com/github/shadowsocks/BaseService.scala
@@ -106,8 +106,8 @@ trait BaseService {
       override def run() {
         if (state != s) {
           val n = callbacks.beginBroadcast()
-          for (i <- 0 to n -1) {
-            callbacks.getBroadcastItem(i).stateChanged(s, msg)
+          for (i <- 0 to n - 1) {
+            callbacks.getBroadcastItem(i).stateChanged(s, msg.substring(0, 64))
           }
           callbacks.finishBroadcast()
           state = s
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 4baabaa0..dbd3d43b 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -606,7 +606,11 @@ class Shadowsocks
 
   def deattachService() {
     if (bgService != null) {
-      bgService.unregisterCallback(callback)
+      try {
+        bgService.unregisterCallback(callback)
+      } catch {
+        case ignored: RemoteException => // Nothing
+      }
       unbindService(connection)
       bgService = null
     }