libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 
 import com.safemobile.lib.AppParams;
@@ -37,19 +38,21 @@ public class TCPhandler implements Runnable {
 	private String leftOver = "";
 
 	public static LinkedList<TCPmsg> msgList;
+	private volatile int n = 0;
 
 	public Boolean isConnectionUP = false;
 	public Boolean previousConnectionWasUP = false;
 
-	private final Context context;
+	private Context context;
-	private boolean isWiFiOn;
+	private boolean isWiFiOn = true;
 
 	public TCPhandler(Context context, String hostName, int p) {
+
 		this.context = context;
 		serverHostname = hostName;
 		port = p;
 
-		msgList = new LinkedList<>();
+		msgList = new LinkedList<TCPmsg>();
 		SM.Debug("---TCPhandler constructor [" + hostName + "," + p + "] ---");
 		listenThread = new Thread(this, "TCPlisten");
 		listenThread.start(); // (2) Start the thread.
@@ -61,6 +64,7 @@ public class TCPhandler implements Runnable {
 			public void run() {
 				try {
 					previousConnectionWasUP = isConnectionUP;
+
 					// try to send something
 					TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
 				} catch (Exception e) {
@@ -70,18 +74,16 @@ public class TCPhandler implements Runnable {
 		}, 0, 3000);
 
 		// get WiFi state 
-		isWiFiOn = isNetworkConnected();
+		ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+		if (mWifi.isConnectedOrConnecting())
+			isWiFiOn = true;
 
 		IntentFilter intentFilter = new IntentFilter();
 		intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
 		context.registerReceiver(mReceived, intentFilter);
 	}
 
-	private boolean isNetworkConnected() {
-		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-		return cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnected();
-	}
-
 	@Override
 	public void run() {
 		try {
@@ -98,19 +100,20 @@ public class TCPhandler implements Runnable {
 				isConnectionUP = true;
 				triggerTCPConnectionStateEvent();
 			}
+
 		} catch (UnknownHostException e) {
-			SM.Debug("UnknownHostException", "TCPhandler break:"+ e);
+			SM.Debug("UnknownHostException", "TCPhandler break:" + e.toString());
 		} catch (IllegalArgumentException e) {
-			SM.Debug("IllegalArgumentException", "TCPhandler break:"+ e);
+			SM.Debug("IllegalArgumentException", "TCPhandler break:" + e.toString());
 		} catch (IOException e) {
-			SM.Debug("IOException", "TCPhandler break:"+ e);
+			SM.Debug("IOException", "TCPhandler break:" + e.toString());
 		}
 
 		while (alive) {
 			try {
 				Thread.sleep(3000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash1 on sleep:"+ e);
+				SM.Debug("TCPhandler Crash1 on sleep:" + e.toString());
 			}
 
 			while (Boolean.TRUE.equals(isConnectionUP)) {
@@ -163,7 +166,7 @@ public class TCPhandler implements Runnable {
 					//end process leftover
 
 					String data = "";
-					int n = 0;
+					n = 0;
 
 					byte[] buf = new byte[1024];
 					// read data into buffer
@@ -178,6 +181,7 @@ public class TCPhandler implements Runnable {
 						break;
 					}
 
+
 					byte[] temp = new byte[n];
 					if (n >= 0) System.arraycopy(buf, 0, temp, 0, n);
 
@@ -187,8 +191,9 @@ public class TCPhandler implements Runnable {
 					data = new String(temp);
 
 					//if we have any leftovers from previous message add them
-			    	if(leftOver.length() > 1) { // avoid case with only one #
+					if (leftOver.length() > 1) // avoid case with only one #
-			    		data = leftOver+data;
+					{
+						data = leftOver + data;
 						leftOver = "";
 					}
 
@@ -212,14 +217,13 @@ public class TCPhandler implements Runnable {
 					}
 					char[] temMSG = data.toCharArray();
 					if (data.length() != messLen) {
-			        	//if expected string message is smaller then actual string then exit processing;
 						if (messLen > data.length()) {
 							leftOver = data; // Add by bigu
 							continue;
 						}
 						//perform cut
-			        	temMSG = data.substring(0,messLen).toCharArray();
+						temMSG = data.substring(0, messLen).toCharArray();
-			        	leftOver = data.substring(messLen);
+						leftOver = data.substring(messLen, data.length());
 					}
 					//decode TCP msg
 					TCPmsg msg = new TCPmsg(temMSG);
@@ -230,28 +234,33 @@ public class TCPhandler implements Runnable {
 						prioritizePongReceived();
 
 					msgList.add(msg);
-				} catch(Exception ex) {
+
-					SM.Debug("TCPHandler", "TCPhandler/run/break:"+ ex);
+				} catch (Exception ex) {
+					SM.Debug("TCPHandler", "TCPhandler/run/break:" + ex.toString());
 					isConnectionUP = false;
 					triggerTCPConnectionStateEvent();
 				}
 			}
 
+
 			//
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash2 on sleep:"+ e);
+				SM.Debug("TCPhandler Crash2 on sleep:" + e.toString());
 			}
+
 			//try to restart connection
 			if (alive && isWiFiOn)
 				restartTCP();
+
 		}
 		SM.Debug("==================================");
 		SM.Debug("TCP listenThread stoped!! alive = false");
 		SM.Debug("==================================");
 	}
 
+
 	/**
 	 * Create a bypass in order to trigger the ping received event
 	 */
@@ -259,6 +268,7 @@ public class TCPhandler implements Runnable {
 		TCPmsgParser._firePONGReceivedEvent();
 	}
 
+
 	/* Broadcast Received for WiFi Connect/Disconnect */
 	public BroadcastReceiver mReceived = new BroadcastReceiver() {
 
@@ -267,17 +277,23 @@ public class TCPhandler implements Runnable {
 			final String action = intent.getAction();
 			SM.Debug("WIFI STATE", action);
 
-		    if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)){
+			if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+				NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
 				// close socket if the wifi is disconnecting or disconnected
-				isWiFiOn = isNetworkConnected();
+				if (!info.isConnectedOrConnecting()) {
-				if (!isWiFiOn)
 					closeSocket();
+					isWiFiOn = false;
+				} else
+					isWiFiOn = true;
 			}
 		}
 	};
 
-	/** Send a message through the TCP Socket
+
-	 * @param seqID The messages's sequence ID (a number of order)
+	/**
+	 * Send a message through the TCP Socket
+	 *
+	 * @param seqID The messages's sequence id (a number of order)
 	 * @param msg   The messages which will be sent
 	 * @return True if the message was sent
 	 */
@@ -323,28 +339,51 @@ public class TCPhandler implements Runnable {
 		return false;
 	}
 
+
+
+
+	public void setConnectionIsDown() {
+		if (input != null) {
+			try {
+				input.close();
+			} catch (IOException e) {
+			} finally {
+				input = null;
+			}
+		}
+
+		isConnectionUP = false;
+	}
+
 	/* Encrypt a string using an encryption algorithm,
 	 * in this case TEA */
 	public static byte[] encryptTEA(String toEncryptData) {
+		byte[] encryptedByteArray = new byte[]{};
+
 		// no encryption
-		return toEncryptData.getBytes();
+		encryptedByteArray = toEncryptData.getBytes();
+
+		return encryptedByteArray;
 	}
 
 	/* Decrypt a string using an encryption algorithm,
 	 * in this case TEA */
 	public static byte[] decryptTEA(byte[] toDecryptData) {
-		byte[] decryptedByteArray;
+		byte[] decryptedByteArray = new byte[]{};
 
 		// no decryption
 		decryptedByteArray = toDecryptData;
+
 		return decryptedByteArray;
 	}
 
+
 	public int getPort() {
 		return port;
 	}
 
 	public void updateTCPparameters(String ip, String _port) {
+
 		// stop socket
 		try {
 			if (soc != null)
@@ -356,8 +395,9 @@ public class TCPhandler implements Runnable {
 		serverHostname = ip;
 		try {
 			port = Integer.parseInt(_port);
-		} catch (Exception ignored) { }
+		} catch (Exception e) {
-		finally {
+
+		} finally {
 			port = 13589;
 		}
 	}
@@ -398,11 +438,23 @@ public class TCPhandler implements Runnable {
 			SM.Exception("restartTCP break:" + e.toString());
 			isConnectionUP = false;
 		}
+
 		triggerTCPConnectionStateEvent();
 	}
 
-	/** close Socket when unReachable */
+	public boolean isAlive() {
+		return alive;
+	}
+
+	public void setAlive(boolean alive) {
+		this.alive = alive;
+	}
+
+	/**
+	 * close Socket when unReachable
+	 */
 	public void closeSocket() {
+
 		try {
 			input = null;
 			output = null;
@@ -418,10 +470,12 @@ public class TCPhandler implements Runnable {
 		SM.Debug("Stopping TCP", "TCP Connection is stopping on " + AppParams.IP + ":" + port);
 		alive = false;
 
-		if (mReceived!= null)
+
+		if (mReceived != null)
 			try {
 				context.unregisterReceiver(mReceived);
-			} catch(Exception ex) {/* receiver not registered  //*/}
+			} catch (Exception ex) {/* receiver not registered  //*/}
+		;
 
 		// stop thread
 		if (listenThread != null) {
@@ -430,6 +484,7 @@ public class TCPhandler implements Runnable {
 			moribund.interrupt();
 		}
 
+
 		if (input != null) {
 			try {
 				input.close();
@@ -448,13 +503,14 @@ public class TCPhandler implements Runnable {
 			}
 		}
 
-		if (soc !=null) {
+		if (soc != null) {
 			try {
 				soc.close();
 				soc = null;
 			} catch (IOException e) {
-				SM.Exception("TCPClient[STOP]", "Stop break:"+ e);
+				SM.Exception("TCPClient[STOP]", "Stop break:" + e.toString());
 			}
 		}
 	}
+
 }