From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 8 Apr 2014 12:04:17 +0200
Subject: Rename app->bitmask_android

This way, gradle commands generate apks correctly named.
---
 .../main/java/se/leap/openvpn/OpenVPNThread.java   | 130 ---------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 app/src/main/java/se/leap/openvpn/OpenVPNThread.java

(limited to 'app/src/main/java/se/leap/openvpn/OpenVPNThread.java')

diff --git a/app/src/main/java/se/leap/openvpn/OpenVPNThread.java b/app/src/main/java/se/leap/openvpn/OpenVPNThread.java
deleted file mode 100644
index ffd21732..00000000
--- a/app/src/main/java/se/leap/openvpn/OpenVPNThread.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package se.leap.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 se.leap.bitmaskclient.R;
-
-import android.util.Log;
-import se.leap.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)
-	{
-		mArgv = argv;
-		mNativeDir = nativelibdir;
-		mService = service;
-	}
-	
-	public void stopProcess() {
-		mProcess.destroy();
-	}
-
-	
-	
-	@Override
-	public void run() {
-		try {
-			Log.i(TAG, "Starting openvpn");			
-			startOpenVPNThreadArgs(mArgv);
-			Log.i(TAG, "Giving up");
-		} catch (Exception e) {
-			e.printStackTrace();
-			Log.e(TAG, "OpenVPNThread Got " + e.toString());
-		} finally {
-			int exitvalue = 0;
-			try {
-				 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);
-			
-//			OpenVPN.updateStateString("NOPROCESS","No process running.", R.string.state_noprocess); fixes bug #4565
-			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");
-		}
-	}
-	
-	private void startOpenVPNThreadArgs(String[] argv) {
-		LinkedList<String> argvlist = new LinkedList<String>();
-		
-		for(String arg:argv)
-			argvlist.add(arg);
-	
-		ProcessBuilder pb = new ProcessBuilder(argvlist);
-		// Hack O rama
-		
-		// Hack until I find a good way to get the real library path
-		String applibpath = argv[0].replace("/cache/" + VpnProfile.MINIVPN , "/lib");
-		
-		String lbpath = pb.environment().get("LD_LIBRARY_PATH");
-		if(lbpath==null) 
-			lbpath = applibpath;
-		else
-			lbpath = lbpath + ":" + applibpath;
-		
-		if (!applibpath.equals(mNativeDir)) {
-			lbpath = lbpath + ":" + mNativeDir;
-		}
-		
-		pb.environment().put("LD_LIBRARY_PATH", lbpath);
-		pb.redirectErrorStream(true);
-		try {
-			mProcess = pb.start();
-			// Close the output, since we don't need it
-			mProcess.getOutputStream().close();
-			InputStream in = mProcess.getInputStream();
-			BufferedReader br = new BufferedReader(new InputStreamReader(in));
-				
-			while(true) {
-				String logline = br.readLine();
-				if(logline==null) 
-					return;
-
-				if (logline.startsWith(DUMP_PATH_STRING))
-					mDumpPath = logline.substring(DUMP_PATH_STRING.length());
-					
-
-				OpenVPN.logMessage(0, "P:", logline);
-			}
-			
-		
-		} catch (IOException e) {
-			OpenVPN.logMessage(0, "", "Error reading from output of OpenVPN process"+ e.getLocalizedMessage());
-			e.printStackTrace();
-			stopProcess();
-		}
-		
-		
-	}
-}
-- 
cgit v1.2.3