try to fix crash when resume

CREATE-RR · Aug 7, 2016 · cf82225 · cf82225
1 parent 9862fd8
commit cf82225
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -338,7 +338,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       .setSession(profile.name)
       .setMtu(VPN_MTU)
       .addAddress(PRIVATE_VLAN.formatLocal(Locale.ENGLISH, "1"), 24)
-      .addDnsServer(profile.dns.split(":")(2))
+      .addDnsServer(profile.dns.split(":")(0))
 
     if (profile.ipv6) {
       builder.addAddress(PRIVATE_VLAN6.formatLocal(Locale.ENGLISH, "1"), 126)

diff --git a/src/main/scala/com/github/shadowsocks/preferences/SummaryEditTextPreference.scala b/src/main/scala/com/github/shadowsocks/preferences/SummaryEditTextPreference.scala
@@ -52,8 +52,11 @@ class SummaryEditTextPreference(context: Context, attrs: AttributeSet, defStyle:
   }
 
   override def setText(text: String) {
-    super.setText(text)
-    setSummary(text)
+    if(text != null)
+    {
+      super.setText(text)
+      setSummary(text)
+    }
   }
 
   override def setSummary(summary: CharSequence) {