From b79fd315dd89e7a9f648c6a500b41ce7d9970081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 14 May 2014 20:05:30 +0200
Subject: Copy all java files from ics-openvpn.

imports from se.leap.bitmaskclient java files have also been updated.

WARNING: compiling errors for de.blinkt.openvpn.R, aidl.de.blinkt.openvpn.
---
 .../java/se/leap/openvpn/NetworkSateReceiver.java  | 86 ----------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 app/src/main/java/se/leap/openvpn/NetworkSateReceiver.java

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

diff --git a/app/src/main/java/se/leap/openvpn/NetworkSateReceiver.java b/app/src/main/java/se/leap/openvpn/NetworkSateReceiver.java
deleted file mode 100644
index 777402b4..00000000
--- a/app/src/main/java/se/leap/openvpn/NetworkSateReceiver.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package se.leap.openvpn;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
-import android.preference.PreferenceManager;
-import se.leap.bitmaskclient.R;
-
-public class NetworkSateReceiver extends BroadcastReceiver {
-	private int lastNetwork=-1;
-	private OpenVpnManagementThread mManangement;
-
-	private String lastStateMsg=null;
-	
-	public NetworkSateReceiver(OpenVpnManagementThread managementThread) {
-		super();
-		mManangement = managementThread;
-	}
-
-	@Override
-	public void onReceive(Context context, Intent intent) {
-		NetworkInfo networkInfo = getCurrentNetworkInfo(context);
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);        
-		boolean sendusr1 = prefs.getBoolean("netchangereconnect", true);
-
-		String netstatestring;
-		if(networkInfo==null)
-			netstatestring = "not connected";
-		else  {
-			String subtype = networkInfo.getSubtypeName();
-			if(subtype==null) 
-				subtype = "";
-			String extrainfo = networkInfo.getExtraInfo();
-			if(extrainfo==null)
-				extrainfo="";
-			
-			/*
-			if(networkInfo.getType()==android.net.ConnectivityManager.TYPE_WIFI) {
-				WifiManager wifiMgr = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);			
-				WifiInfo wifiinfo = wifiMgr.getConnectionInfo();
-				extrainfo+=wifiinfo.getBSSID();
-				
-				subtype += wifiinfo.getNetworkId();
-			}*/
-			
-			
-			
-			netstatestring = String.format("%2$s %4$s to %1$s %3$s",networkInfo.getTypeName(),
-					networkInfo.getDetailedState(),extrainfo,subtype );
-		}
-		
-		
-		
-		if(networkInfo!=null && networkInfo.getState() == State.CONNECTED) {
-				int newnet = networkInfo.getType();
-			
-				if(sendusr1 && lastNetwork!=newnet)
-					mManangement.reconnect();
-							
-				lastNetwork = newnet;
-		} else if (networkInfo==null) {
-			// Not connected, stop openvpn, set last connected network to no network
-			lastNetwork=-1;
-			if(sendusr1)
-				mManangement.signalusr1();
-		}
-		
-		if(!netstatestring.equals(lastStateMsg))
-			OpenVPN.logInfo(R.string.netstatus, netstatestring);
-		lastStateMsg=netstatestring;
-
-	}
-
-	private NetworkInfo getCurrentNetworkInfo(Context context) {
-		ConnectivityManager conn =  (ConnectivityManager)
-				context.getSystemService(Context.CONNECTIVITY_SERVICE);
-		
-		NetworkInfo networkInfo = conn.getActiveNetworkInfo();
-		return networkInfo;
-	}
-
-}
-- 
cgit v1.2.3