From 66f0e663507eada91c8a04453f5eaf741bdabc5d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 14 May 2012 19:42:43 +0200
Subject: Apply patch from issue #20 (closes issue #20)

---
 AndroidManifest.xml                       |  4 ++--
 src/de/blinkt/openvpn/OpenVpnService.java | 28 ++++++----------------------
 src/de/blinkt/openvpn/Settings_Basic.java |  1 -
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 50d6c9f1..4655509a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.blinkt.openvpn"
-    android:versionCode="24"
-    android:versionName="0.5.3" >
+    android:versionCode="25"
+    android:versionName="0.5.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index 48ab03b6..1bbc468c 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -159,27 +159,6 @@ public class OpenVpnService extends VpnService implements Handler.Callback {
 		return START_NOT_STICKY;
 	}
 
-
-
-
-
-	private void checkForRemainingMiniVpns() {
-		 ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
-	      if (manager == null)
-	    	  return;
-		List<RunningAppProcessInfo> service= manager.getRunningAppProcesses();
-		// Does not return the minivpn binarys :S
-		for(RunningAppProcessInfo rapi:service){
-			if(rapi.processName.equals("minivpn"))
-				android.os.Process.killProcess(rapi.pid);
-		}
-	}
-
-
-
-
-
-
 	@Override
 	public void onDestroy() {
 		if (mServiceThread != null) {
@@ -254,7 +233,12 @@ public class OpenVpnService extends VpnService implements Handler.Callback {
 		bconfig[4] = String.format(getString(R.string.routes_info, joinString(mRoutes)));
 		bconfig[5] = String.format(getString(R.string.routes_info6, joinString(mRoutesv6)));
 
-		builder.setSession(mProfile.mName + " - " + mLocalIP);
+		String session = mProfile.mName;
+		if(mLocalIP!=null)
+			session+= " - " + mLocalIP;
+		if(mLocalIPv6!=null)
+			session+= " - " + mLocalIPv6;
+		builder.setSession(session);
 
 
 		OpenVPN.logBuilderConfig(bconfig);
diff --git a/src/de/blinkt/openvpn/Settings_Basic.java b/src/de/blinkt/openvpn/Settings_Basic.java
index 6e829228..3234d0df 100644
--- a/src/de/blinkt/openvpn/Settings_Basic.java
+++ b/src/de/blinkt/openvpn/Settings_Basic.java
@@ -39,7 +39,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.ToggleButton;
 
 
-- 
cgit v1.2.3