From 84f5af0d99dc208468e29c2c423591b75a060795 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 18 Dec 2012 11:25:45 +0100
Subject: Fix the Illegal Thread State bug

---
 src/de/blinkt/openvpn/OpenVPNThread.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/de/blinkt/openvpn/OpenVPNThread.java')

diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index b4ead269..13b8688b 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -39,9 +39,11 @@ public class OpenVPNThread implements Runnable {
 		} finally {
 			int exitvalue = 0;
 			try {
-				 exitvalue = mProcess.exitValue();
+				 exitvalue = mProcess.waitFor();
 			} catch ( IllegalThreadStateException ite) {
 				OpenVPN.logError("Illegal Thread state: " + ite.getLocalizedMessage());
+			} catch (InterruptedException ie) {
+				OpenVPN.logError("InterruptedException: " + ie.getLocalizedMessage());
 			}
 			if( exitvalue != 0)
 				OpenVPN.logError("Process exited with exit value " + exitvalue);
@@ -84,12 +86,12 @@ public class OpenVPNThread implements Runnable {
 			mProcess.getOutputStream().close();
 			InputStream in = mProcess.getInputStream();
 			BufferedReader br = new BufferedReader(new InputStreamReader(in));
-			
-			
+				
 			while(true) {
 				String logline = br.readLine();
-				if(logline==null)
+				if(logline==null) {
 					return;
+				}
 				OpenVPN.logMessage(0, "P:", logline);
 			}
 			
-- 
cgit v1.2.3


From 192410e3f1d5588712a85bbd7e9fd801dc5a0989 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 24 Dec 2012 07:47:50 +0100
Subject: Make send mini dump work with non Gmail Mail app, make google sending
 better placed

---
 src/de/blinkt/openvpn/OpenVPNThread.java | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/de/blinkt/openvpn/OpenVPNThread.java')

diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index 13b8688b..7d58552a 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -1,19 +1,24 @@
 package de.blinkt.openvpn;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.LinkedList;
 
 import android.util.Log;
+import de.blinkt.openvpn.OpenVPN.LogItem;
 
 public class OpenVPNThread implements Runnable {
+	private static final String DUMP_PATH_STRING = "Dump path: ";
 	private static final String TAG = "OpenVPN";
 	private String[] mArgv;
 	private Process mProcess;
 	private String mNativeDir;
 	private OpenVpnService mService;
+	private String mDumpPath;
 
 	public OpenVPNThread(OpenVpnService service,String[] argv, String nativelibdir)
 	{
@@ -49,7 +54,18 @@ public class OpenVPNThread implements Runnable {
 				OpenVPN.logError("Process exited with exit value " + exitvalue);
 			
 			OpenVPN.updateStateString("NOPROCESS","No process running.");
-
+			if(mDumpPath!=null) {
+				try {
+					BufferedWriter logout = new BufferedWriter(new FileWriter(mDumpPath + ".log"));
+					for(LogItem li :OpenVPN.getlogbuffer()){
+						logout.write(li.getString(null) + "\n");
+					}
+					logout.close();
+					OpenVPN.logError(R.string.minidump_generated);
+				} catch (IOException e) {
+					OpenVPN.logError("Writing minidump log: " +e.getLocalizedMessage());
+				}
+			}
 
 			mService.processDied();
 			Log.i(TAG, "Exiting");
@@ -89,6 +105,9 @@ public class OpenVPNThread implements Runnable {
 				
 			while(true) {
 				String logline = br.readLine();
+				if (logline.startsWith(DUMP_PATH_STRING))
+					mDumpPath = logline.substring(DUMP_PATH_STRING.length());
+					
 				if(logline==null) {
 					return;
 				}
-- 
cgit v1.2.3