remove barcode from conversation

Reviewed-on: #25

libSafeMobile/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java

@@ -255,13 +255,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 		return res;
 	}
 
-	public boolean getAlarms(long userID)
+	public boolean getAlarms(long userID) {
-	{
+		if (tcp == null)
-		if(tcp == null) 
 			return false;
 
 		boolean res = tcp.Write("0.0", "#27#" + userID + "#");
-		if(res)
+		if (res)
 			SM.Debug("Message [GetAlarms] sent to app server");
 		else
 			SM.Debug("Could not send message [GetAlarms]!!");

libSafeMobile/src/main/java/com/safemobile/adapters/RecordingsGridViewAdapter.java

@@ -1,18 +1,8 @@
 package com.safemobile.adapters;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.TimeZone;
-
 import android.app.Activity;
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -20,34 +10,32 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.safemobile.activities.AbstractRecordingsActivity;
-import com.safemobile.lib.AppParams;
 import com.safemobile.lib.R;
 import com.safemobile.lib.Recording;
-import com.safemobile.lib.Contact;
 import com.safemobile.lib.SM;
 
-public class RecordingsGridViewAdapter extends BaseAdapter
+import java.text.SimpleDateFormat;
-{
+import java.util.ArrayList;
-	private ArrayList<Recording> listRecordings;
+import java.util.Calendar;
-	private ArrayList<Boolean> recordingExists;
+import java.util.Date;
-	private ArrayList<Boolean> playingPositions;
+import java.util.Hashtable;
-	private Activity activity;
-	private Context context;
-	private int removePosition = -1;
-	//public String time;
-	//private int[] colors = new int[] { Color.parseColor("#FFFFFF"), Color.parseColor("#D2E4FC") };  
-	private Hashtable<Integer, View> hash = new Hashtable<Integer, View>(); 
 
-	public RecordingsGridViewAdapter(Activity activity, Context context, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists) 
+public class RecordingsGridViewAdapter extends BaseAdapter {
-	{
+	private final ArrayList<Recording> listRecordings;
+	private final ArrayList<Boolean> recordingExists;
+	private final ArrayList<Boolean> playingPositions;
+	private final Activity activity;
+
+	private final Hashtable<Integer, View> hash = new Hashtable<>();
+
+	public RecordingsGridViewAdapter(Activity activity, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists) {
 		super();
 		this.activity = activity;
-		this.context = context;
 		this.listRecordings = listRecordings;
 		this.recordingExists = recordingExists;
 
-		playingPositions = new ArrayList<Boolean>();
+		playingPositions = new ArrayList<>();
-		for(int i=0; i<recordingExists.size(); i++) {
+		for (int i = 0; i < recordingExists.size(); i++) {
 			playingPositions.add(false);
 
 			listRecordings.get(i).date = listRecordings.get(i).startGMT;
@@ -70,185 +58,184 @@ public class RecordingsGridViewAdapter extends BaseAdapter
 		return 0;
 	}
 
-	/** Define Row Template */
+	/**
-	public static class ViewHolder
+	 * Define Row Template
-	{
+	 */
-		public LinearLayout layoutRecording;
+	public static class ViewHolder {
-		public ImageView imageViewPlay, imageViewRecycle;
+		private LinearLayout layoutRecording;
-		public TextView textViewSender, textViewDuration, textViewDate;
+		private ImageView imageViewPlay;
+		private ImageView imageViewRecycle;
+		private TextView textViewSender;
+		private TextView textViewDuration;
+		private TextView textViewDate;
+
+		public LinearLayout getLayoutRecording() {
+			return layoutRecording;
+		}
+
+		public void setLayoutRecording(LinearLayout layoutRecording) {
+			this.layoutRecording = layoutRecording;
+		}
+
+		public ImageView getImageViewPlay() {
+			return imageViewPlay;
+		}
+
+		public void setImageViewPlay(ImageView imageViewPlay) {
+			this.imageViewPlay = imageViewPlay;
+		}
+
+		public ImageView getImageViewRecycle() {
+			return imageViewRecycle;
+		}
+
+		public void setImageViewRecycle(ImageView imageViewRecycle) {
+			this.imageViewRecycle = imageViewRecycle;
+		}
+
+		public TextView getTextViewSender() {
+			return textViewSender;
+		}
+
+		public void setTextViewSender(TextView textViewSender) {
+			this.textViewSender = textViewSender;
+		}
+
+		public TextView getTextViewDuration() {
+			return textViewDuration;
+		}
+
+		public void setTextViewDuration(TextView textViewDuration) {
+			this.textViewDuration = textViewDuration;
+		}
+
+		public TextView getTextViewDate() {
+			return textViewDate;
+		}
+
+		public void setTextViewDate(TextView textViewDate) {
+			this.textViewDate = textViewDate;
+		}
 	}
 
 	@Override
 	public View getView(final int position, View convertView, ViewGroup parent) {
 		final ViewHolder view;
-		LayoutInflater inflator = activity.getLayoutInflater();
+		LayoutInflater layoutInflater = activity.getLayoutInflater();
-		if(convertView==null)
+		if (convertView == null) {
-		{
 			view = new ViewHolder();
-			convertView = inflator.inflate(R.layout.row_recordings, null);
+			convertView = layoutInflater.inflate(R.layout.row_recordings, null);
-			view.layoutRecording = (LinearLayout) convertView.findViewById(R.id.layoutRecording);
+			view.setLayoutRecording(convertView.findViewById(R.id.layoutRecording));
-			view.imageViewPlay = (ImageView) convertView.findViewById(R.id.imageViewPlay);
+			view.setImageViewPlay(convertView.findViewById(R.id.imageViewPlay));
-			view.textViewSender = (TextView) convertView.findViewById(R.id.textViewSender);
+			view.setTextViewSender(convertView.findViewById(R.id.textViewSender));
-			view.textViewDuration = (TextView) convertView.findViewById(R.id.textViewDuration);
+			view.setTextViewDuration(convertView.findViewById(R.id.textViewDuration));
-			view.textViewDate = (TextView) convertView.findViewById(R.id.textViewDate);
+			view.setTextViewDate(convertView.findViewById(R.id.textViewDate));
-			view.imageViewRecycle = (ImageView) convertView.findViewById(R.id.imageViewRecycle);
+			view.setImageViewRecycle(convertView.findViewById(R.id.imageViewRecycle));
-			view.imageViewRecycle.setVisibility(View.GONE);
+			view.getImageViewRecycle().setVisibility(View.GONE);
 			convertView.setTag(view);
-		}
+		} else {
-		else
-		{
 			view = (ViewHolder) convertView.getTag();
 		}
 
 		hash.put(position, convertView);
 
-		
-		
 		/* if recording doesn't exists change background */
-		if(!recordingExists.get(position))
+		if (Boolean.FALSE.equals(recordingExists.get(position)))
-			view.layoutRecording.setBackgroundColor(0xFFFFFFFF);
+			view.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
-		else 
+		else {
-		{
 			/* if recording is not playing let background to white */
-			if(!playingPositions.get(position))
+			if (Boolean.FALSE.equals(playingPositions.get(position)))
-				view.layoutRecording.setBackgroundColor(0xFFFFFFFF);
+				view.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
 			else
-				view.layoutRecording.setBackgroundColor(0xFF457c98);
+				view.getLayoutRecording().setBackgroundColor(0xFF457c98);
 		}
 
 		/* change icon according to call type [outgoing or incoming] */
-		SM.Exception("REC TYPE : " + listRecordings.get(position).type);
+		SM.Exception("REC TYPE : " + listRecordings.get(position).callType);
-		switch(listRecordings.get(position).type)
+		switch (listRecordings.get(position).callType) {
-		{
+			case 6:
-			case AppParams.AllCall:
+				view.getImageViewPlay().setImageResource(R.drawable.call_received_all);
-					if(listRecordings.get(position).destinationRadioID == 0)
+				break;
-						view.imageViewPlay.setImageResource(R.drawable.call_received_all);
+			case 2:
-					else
+				view.getImageViewPlay().setImageResource(R.drawable.call_made_all);
-						view.imageViewPlay.setImageResource(R.drawable.call_made_all);
+				break;
-					break;
+			case 4:
-			case AppParams.PrivateCall:
+				view.getImageViewPlay().setImageResource(R.drawable.call_received);
-					if(listRecordings.get(position).destinationRadioID == 0)
+				break;
-						view.imageViewPlay.setImageResource(R.drawable.call_received);
+			case 0:
-					else
+				view.getImageViewPlay().setImageResource(R.drawable.call_made);
-						view.imageViewPlay.setImageResource(R.drawable.call_made);
+				break;
-					break;
+			case 5:
-			case AppParams.GroupCall: 
+				view.getImageViewPlay().setImageResource(R.drawable.call_received_group);
-					if(listRecordings.get(position).destinationRadioID == 0)
+				break;
-						view.imageViewPlay.setImageResource(R.drawable.call_received_group);
+			case 1:
-					else
+				view.getImageViewPlay().setImageResource(R.drawable.call_made_group);
-						view.imageViewPlay.setImageResource(R.drawable.call_made_group);
+				break;
-					break;
+			default:
+				view.getImageViewPlay().setImageResource(R.drawable.alert);
 		}
-		/*
-		try
-		{
-			if(receivedPositions.get(position))
-			{
-				if(playingPositions.get(position))
-					view.imageViewPlay.setImageResource(R.drawable.play_received);
-				else
-					view.imageViewPlay.setImageResource(R.drawable.call_received);
-					
-			}
-			else
-			{
-				if(playingPositions.get(position))
-					view.imageViewPlay.setImageResource(R.drawable.play_made);
-				else
-					view.imageViewPlay.setImageResource(R.drawable.call_made);
-			}
-		}
-		catch(Exception ex)
-		{
-			SM.Exception("EXCeptioN", ex.toString());
-			view.imageViewPlay.setImageResource(R.drawable.play);
-		}*/
 
 		/* intercept Recycle click */
-		view.imageViewRecycle.setOnClickListener(new OnClickListener() {
+		view.getImageViewRecycle().setOnClickListener(v -> {
-			@Override
+			// change the background for marked record
-			public void onClick(View v) {
+			View view1 = hash.get(position);
-				// save the position of the marked record
+			ViewHolder viewHolder = null;
-				removePosition = position;
+			if (view1 != null) {
-				
+				viewHolder = (ViewHolder) view1.getTag();
-				// change the background for marked record
-				View view = (View) hash.get(position);
-				ViewHolder viewHolder = (ViewHolder) view.getTag();
-				viewHolder.layoutRecording.setBackgroundColor(0xFF457c98);
-				((AbstractRecordingsActivity) activity).deleteSelected(position);
 			}
+			if (viewHolder != null) {
+				viewHolder.getLayoutRecording().setBackgroundColor(0xFF457c98);
+			}
+			((AbstractRecordingsActivity) activity).deleteSelected(position);
 		});
 
-		// set recording image 
+		view.getTextViewSender().setText(String.format("%s -> %s", getItem(position).userWhoCalled, getItem(position).userWhoWasCalled));
-		if(getItem(position).NameForDisplay.equals(AppParams.USERNAME))
+		view.textViewDuration.setText(String.format("[%d sec]", getItem(position).duration));
-			view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_made_group));
-		else 
-			view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_received_group));
-		
-		view.textViewSender.setText(getItem(position).NameForDisplay);
-		view.textViewDuration.setText("[" + getItem(position).duration + " sec]");
 
 		/* Add call Date */
 		Date date = new Date();
 		date.setTime(listRecordings.get(position).date * 1000);
 
-		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
 		Calendar calendar = Calendar.getInstance();
-		calendar.set(Calendar.HOUR_OF_DAY,0);
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
 
-		
+		if (date.after(calendar.getTime()))
-		
+			simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
-		if(date.after(calendar.getTime()))
-			sdf = new SimpleDateFormat("HH:mm:ss");
 		else
-			sdf = new SimpleDateFormat("MMM-dd HH:mm");
+			simpleDateFormat = new SimpleDateFormat("MMM-dd HH:mm");
 
-		// set gmt time
+		view.getTextViewDate().setText(simpleDateFormat.format(date));
-		//sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-		
-		view.textViewDate.setText(sdf.format(date));
 
 		return convertView;
 	}
 
-	
+	/**
-	/** Reset row background when recycle was canceled */
+	 * Get the View for one row in the GridView
-	public void cancelDelete()
+	 */
-	{
+	public View getView(int position) {
-		View view = (View) hash.get(removePosition);
+		return hash.get(position);
-		if(recordingExists.get(removePosition))
-			view.setBackgroundColor(0xFFFFFFFF);
-		else
-			view.setBackgroundColor(0xFFDDDDDD);
-		
-		removePosition = -1;
 	}
 
-	
+	/**
-	/** Get the View for one row in the GridView */
+	 * Change playing recording background
-	public View getView(int position)
+	 */
-	{
+	public void changePlaying(int position, boolean playing) {
-		return (View) hash.get(position);
-	}
-	
-	
-	/** Change playing recording background */
-	public void changePlaying(int position, boolean playing)
-	{
 		// change value in the vector
 		playingPositions.set(position, playing);
 
 		RecordingsGridViewAdapter.ViewHolder viewHolder = (RecordingsGridViewAdapter.ViewHolder) getView(position).getTag();
-		if(!playing)
+		if (!playing)
-			viewHolder.layoutRecording.setBackgroundColor(0xFFFFFFFF);
+			viewHolder.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
 		else
-			viewHolder.layoutRecording.setBackgroundColor(0xFF457c98);
+			viewHolder.getLayoutRecording().setBackgroundColor(0xFF457c98);
 
+		View view = hash.get(position);
 		// update hash
-		hash.get(position).setTag(viewHolder);
+		if (view != null)
-		
+			view.setTag(viewHolder);
 	}
 }

libSafeMobile/src/main/java/com/safemobile/database/DatabaseCommunication.java

@@ -285,7 +285,7 @@ public class DatabaseCommunication {
 	 		while (cursor.isAfterLast() == false) 
 	 		{
 	 			Recording rec = new Recording();
-	 			rec.ID =cursor.getInt(0);
+	 			rec.id =cursor.getInt(0);
 	 			rec.sourceRadioID = cursor.getInt(1);
 	 			rec.destinationRadioID = cursor.getInt(2);
 	 			rec.date = cursor.getInt(3);
@@ -315,7 +315,7 @@ public class DatabaseCommunication {
 			if(cursor.getCount() > 0)
 			{
 				Recording rec = new Recording();
-				rec.ID =cursor.getInt(0);
+				rec.id =cursor.getInt(0);
 				rec.sourceRadioID = cursor.getInt(1);
 				rec.destinationRadioID = cursor.getInt(2);
 				rec.date = cursor.getInt(3);
@@ -364,7 +364,7 @@ public class DatabaseCommunication {
 	 		values.put("duration", rec.duration);
 	 		values.put("filename", rec.filename);
 	 		values.put("type", rec.type);
-	 		id = database.delete("Recordings", "_id=" + rec.ID, null);
+	 		id = database.delete("Recordings", "_id=" + rec.id, null);
 	 		SM.Debug("DBQuery","Database Remove result: " + id);
 	 	}
 		//INSERT into SMS (timeGMT, imei_sour, imei_dest, mess, status) VALUES( 1324016412, 0, 101, 'two', 1)

libSafeMobile/src/main/java/com/safemobile/lib/RecordMSG.java

@@ -4,36 +4,43 @@ import java.util.ArrayList;
 
 public class RecordMSG extends TCPmsg {
 
-	public ArrayList<Recording> recordList;
+	private ArrayList<Recording> recordList;
-	public static int count=0;
+
-	public RecordMSG(TCPmsg tcp) 
+	public RecordMSG(TCPmsg tcp) {
-	{
 		super(tcp);
-		recordList = new ArrayList<Recording>();
+		setRecordList(new ArrayList<>());
 		String date4parsing = super.data;
-		//SM.Debug("SMS date4parsing:"+date4parsing);
 		String[] tempArr = date4parsing.split(";");
 
-		//SM.Debug("SMS tempArr.length:" +tempArr.length);
+		for (String s : tempArr) {
-		for(int i =0; i<tempArr.length;i++)
+			String[] tempRec = s.split("&", -1);
-		{			
+			if (tempRec.length < 11)
-			String[] tempRec = tempArr[i].split("&");		
-			if(tempRec.length<7)
 				continue;
 
-			Recording RecValue = new Recording();
+			Recording recValue = new Recording();
-			RecValue.ID = Long.parseLong(tempRec[0]);
+			recValue.id = Long.parseLong(tempRec[0]);
-			RecValue.startGMT = Integer.parseInt(tempRec[1]);
+			recValue.startGMT = Integer.parseInt(tempRec[1]);
-			RecValue.endGMT = Integer.parseInt(tempRec[2]);
+			recValue.endGMT = Integer.parseInt(tempRec[2]);
-			RecValue.gwID = Integer.parseInt(tempRec[3]);
+			recValue.gwID = Integer.parseInt(tempRec[3]);
-			RecValue.radioGWID = Integer.parseInt(tempRec[4]);
+			recValue.radioGWID = Integer.parseInt(tempRec[4]);
-			RecValue.subID = Integer.parseInt(tempRec[5]);
+			recValue.subID = (tempRec[5] == null || tempRec[5].isEmpty()) ? 0 : Integer.parseInt(tempRec[5]);
-			RecValue.typeID = Integer.parseInt(tempRec[6]);
+			recValue.typeID = Integer.parseInt(tempRec[6]);
+			recValue.callType = Integer.parseInt(tempRec[7]);
+			recValue.groupCpsId = (tempRec[8] == null || tempRec[8].isEmpty()) ? 0 : Integer.parseInt(tempRec[8]);
+			recValue.dispatcherId = (tempRec[9] == null || tempRec[9].isEmpty()) ? 0 : Integer.parseInt(tempRec[9]);
+			recValue.groupName =  tempRec[10];
 
-			recordList.add(RecValue);
+			getRecordList().add(recValue);
 		}
 
-		count +=this.recordList.size();
+		SM.Debug("alarmList size:" + this.getRecordList().size() + " total:" + this.getRecordList().size());
-		SM.Debug("alarmList size:" +this.recordList.size() + " total:" +count);												
+	}
+
+	public ArrayList<Recording> getRecordList() {
+		return recordList;
+	}
+
+	public void setRecordList(ArrayList<Recording> recordList) {
+		this.recordList = recordList;
 	}
 }

libSafeMobile/src/main/java/com/safemobile/lib/Recording.java

@@ -1,14 +1,19 @@
 package com.safemobile.lib;
 
 public class Recording {
-	public long ID;
+	public long id;
 	public int startGMT;
 	public int endGMT;
 	public int gwID;
 	public int radioGWID;
+	public int callType;
+	public int groupCpsId;
+	public int dispatcherId;
 	public int subID;
 	public int typeID;
-	public String NameForDisplay="";
+	public String userWhoCalled="";
+	public String userWhoWasCalled = "";
+	public String groupName = "";
 
 	/** RadioPad */
 	public long date;
@@ -18,13 +23,8 @@ public class Recording {
 	public long sourceRadioID;
 	public int type;
 	
-	public Recording()
-	{
-		
-	}
-	
 	public String toString()
 	{
-		return "ID: " + ID + " | start: " + startGMT + " | end: " + endGMT + " | gwID: " + gwID + " | radioGWID: " + radioGWID + " | subID: " + subID + " | typeID: " + typeID; 
+		return "id: " + id + " | start: " + startGMT + " | end: " + endGMT + " | gwID: " + gwID + " | radioGWID: " + radioGWID + " | subID: " + subID + " | typeID: " + typeID;
 	}
 }

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

@@ -1,266 +1,204 @@
 package com.safemobile.services;
-import java.io.*;
-import java.net.*;
-import java.nio.charset.Charset;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import android.content.BroadcastReceiver;
 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;
 import com.safemobile.lib.SM;
 import com.safemobile.lib.TCPmsg;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Timer;
+import java.util.TimerTask;
 
-public class TCPhandler implements Runnable
+
-{
+public class TCPhandler implements Runnable {
 	private boolean alive = true;
 
-	public String serverHostname = new String ("10.120.1.114");//
+	public String serverHostname;
 	private int port;
 	private Thread listenThread;
-	private Socket soc =null;
+	private Socket soc = null;
-	
-	//private BufferedReader recv;
-	//private PrintWriter writer;
 
 	private DataInputStream input;
 	private DataOutputStream output;
-	private Timer timer;
 
 	private String leftOver = "";
 
 	public static LinkedList<TCPmsg> msgList;
-	private volatile int n=0;
 
 	public Boolean isConnectionUP = false;
 	public Boolean previousConnectionWasUP = false;
 	
-	private Context context;
+	private final Context context;
-	private boolean isWiFiOn = true;
+	private boolean isWiFiOn;
-	
-	public TCPhandler(Context context, String hostName, int p)
-	{
 
+	public TCPhandler(Context context, String hostName, int p) {
 		this.context = context;
-		serverHostname=hostName;
+		serverHostname = hostName;
-		port=p;
+		port = p;
 
-		msgList = new LinkedList<TCPmsg>();
+		msgList = new LinkedList<>();
 		SM.Debug("---TCPhandler constructor [" + hostName + "," + p + "] ---");
 		listenThread = new Thread(this, "TCPlisten");
 		listenThread.start(); // (2) Start the thread.
 
-		
 		// create timer to check socket status
-		timer = new Timer();
+		Timer timer = new Timer();
 		timer.scheduleAtFixedRate(new TimerTask() {
-		@Override
+			@Override
-		public void run() {
+			public void run() {
-			try {
+				try {
-				//Looper.prepare();
+					previousConnectionWasUP = isConnectionUP;
-				//mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+					// try to send something
-				// get if is authenticated
+					TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
-				//Write("0.0", "d");
+				} catch (Exception e) {
-				previousConnectionWasUP = isConnectionUP;
-				
-				// try to send something 
-				TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
-				} 
-				catch (Exception e) {
-					//e.printStackTrace();
 					SM.Exception("TIMERException", e.toString());
 				}
 			}
 		}, 0, 3000);
 		
 		// get WiFi state
-		ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		isWiFiOn = isNetworkConnected();
-		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() 
+	public void run() {
-	{
+		try {
-			try 
+			if (soc != null)
-			{		
+				soc.close();
-				if(soc!=null)
-					soc.close();
 
-				soc = new Socket();
+			soc = new Socket();
-				soc.connect(new InetSocketAddress(serverHostname, port), 5000); 
+			soc.connect(new InetSocketAddress(serverHostname, port), 5000);
 
-				//soc.setSoTimeout(3000);
+			input = new DataInputStream(soc.getInputStream());
-				//SM.Debug("Socket timeout:" + soc.getSoTimeout() );
+			output = new DataOutputStream(soc.getOutputStream());
-				//soc.setSoTimeout(5000);
-				
-				input = new DataInputStream(soc.getInputStream());
-				output = new DataOutputStream(soc.getOutputStream());
-				
-				//recv= new BufferedReader(new InputStreamReader(soc.getInputStream()));
-				//writer =new PrintWriter(soc.getOutputStream()) ;
-				
-				
-				if(soc !=null) {
-					//previousConnectionWasUP = isConnectionUP;
-					isConnectionUP = true;
-					triggerTCPConnectionStateEvent();
-				}
 
+			if (soc != null) {
+				isConnectionUP = true;
+				triggerTCPConnectionStateEvent();
 			}
-			catch (UnknownHostException e) 
+		} 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);
-			catch (IllegalArgumentException e) 
+		} catch (IOException e) {
-			{
+			SM.Debug("IOException", "TCPhandler break:"+ e);
-				SM.Debug("IllegalArgumentException", "TCPhandler break:"+e.toString()); 
+		}
-			} 
-			catch (IOException e) 
-			{
-				SM.Debug("IOException", "TCPhandler break:"+e.toString());
-			}
 
-		while(alive)
+		while (alive) {
-		{
-			//SM.Debug("Waiting for data...");
 			try {
 				Thread.sleep(3000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash1 on sleep:"+e.toString());
+				SM.Debug("TCPhandler Crash1 on sleep:"+ e);
 			}
 
-			while(isConnectionUP)
+			while (Boolean.TRUE.equals(isConnectionUP)) {
-			{
+				try {
-				try
-				{
 					Thread.sleep(100);
-					//SM.Debug("Waiting for data...");
+					//process leftover
-				//process leftover 
+					try {
-				try
+						boolean FinishLeftOver = true;
-				{	
+						while (FinishLeftOver) {
-					boolean FinishLeftOver =true;
+							String[] tempArr2 = leftOver.split("#");
-				while (FinishLeftOver)
+							if (tempArr2.length > 1) {
-				{
+								int messLen;
-					// add this replacement if message length doesn't contain the last #
+								try {
-					// leftOver = leftOver.replace("##", "#");
+									messLen = Integer.parseInt(tempArr2[1]);
-			    	String[] tempArr2 = leftOver.split("#");
+								} catch (Exception e) {
-			        if (tempArr2.length > 1)
+									SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]);
-			        {			         
+									messLen = -1;
-			        	int messLen;
+								}
-			        	try 
-			        	{
-			        		messLen = Integer.parseInt(tempArr2[1]);
 
-			        		//TODO talk to Gaby to fix this on Bridge
+								if (messLen > leftOver.length()) {
+									FinishLeftOver = false;
+									break;
+								} else if (messLen == leftOver.length()) {
+									TCPmsg msg = new TCPmsg(leftOver.toCharArray());
+									SM.Debug("leftovers", "RX from leftOver:" + msg.allData);
 
-			        	} 
+									if (msg.allData.contains("#92#"))
-			        	catch (Exception e) 
+										prioritizePongReceived();
-			        	{
-			        		SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]);
-			        		messLen =-1;
-			        	} 
 
-			        	  if(messLen>leftOver.length()) 
+									msgList.add(msg);
-			        	  {
+									leftOver = "";
-			        		  FinishLeftOver =false;
+									FinishLeftOver = false;
-			        		  break;
+									break;
-			        	  }
+								} else // we have more message in leftover
-			        	  else if(messLen==leftOver.length()) 
+								{
-			        	  {
+									TCPmsg msg = new TCPmsg(leftOver.substring(0, messLen).toCharArray());
-			        		  TCPmsg msg = new TCPmsg(leftOver.toCharArray());					
+									SM.Debug("leftovers", "RX from leftOver:" + msg.allData);
-				        	  SM.Debug("leftovers", "RX from leftOver:"+msg.allData);
 
-				        	  if(msg.allData.contains("#92#"))
+									if (msg.allData.contains("#92#"))
-									prioritizePongReceived();
+										prioritizePongReceived();
 
-				        	  msgList.add(msg);
+									msgList.add(msg);
-				        	  leftOver ="";
+									leftOver = leftOver.substring(messLen, leftOver.length());
-			        		  FinishLeftOver =false;
+								}
-			        		  break;
+							} else FinishLeftOver = false;
-			        	  } 
+						}
-			        	  else // we have more message in leftover 
+					} catch (Exception e) {
-			        	  {			        		  
+						SM.Debug("leftovers", "Error on process leftover" + e.toString());
-			        		  TCPmsg msg = new TCPmsg(leftOver.substring(0,messLen).toCharArray());
+					}
-			        		  SM.Debug("leftovers", "RX from leftOver:"+msg.allData);
-			        		  
-			        		  if(msg.allData.contains("#92#"))
-									prioritizePongReceived();
-			        		  
-				        	  msgList.add(msg);
-			        		  leftOver = leftOver.substring(messLen,leftOver.length());
-			        	  }				        					        			        	
-			        }
-			        else FinishLeftOver = false;
-				}
-				}
-				catch (Exception e) 
-				{
-					SM.Debug("leftovers", "Error on process leftover"+e.toString());
-				}
 					//end process leftover
 
-					String data ="";
+					String data = "";
-					n=0;
+					int n = 0;
-					//char[] buf = new char[1024];	
-					//n  = recv.read(buf);
 
 					byte[] buf = new byte[1024];
 					// read data into buffer
 					n = input.read(buf);
 					//connection closed by server
-					if(n==-1)
+					if (n == -1) {
-					{
 						SM.Debug("TCP Client", "Connection closed by server!");
 						soc.close();
-						//previousConnectionWasUP = isConnectionUP;
 						isConnectionUP = false;
 						triggerTCPConnectionStateEvent();
 						soc = null;
 						break;
 					}
 
-					
 					byte[] temp = new byte[n];
-			    	for(int i=0;i<n;i++) temp[i] = buf[i];
+					if (n >= 0) System.arraycopy(buf, 0, temp, 0, n);
-			    	//String data =new String(temp);
 
-			    	// decryptData 
+					// decryptData
-			    	temp = decryptTEA(temp);
+					temp = decryptTEA(temp);
 
-			    	data = new String(temp);
+					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;
 			    		leftOver = "";
 			    	}
 
 			    	//search for overflow message
 			    	String[] tempArr = data.split("#");
-			        if ((tempArr.length == 0) || (tempArr.length == 1))
+			        if ((tempArr.length == 0) || (tempArr.length == 1)) {
-			        {
 			            SM.Debug("TCP Client", "incorect messagebuss message=" + data);
 			            continue;
 			        }
 			        //get msg len
-			       // for(int i=0;i<tempArr.length;i++)
-			       // 	SM.Debug("I:"+i+" tempArr[i]:"+tempArr[i]);
 			        int messLen;
 					try {
 						messLen = Integer.parseInt(tempArr[1]);
@@ -269,72 +207,51 @@ public class TCPhandler implements Runnable
 						continue;
 					} 					
 			        //messLen not int
-			        if(messLen == -1) 
+			        if (messLen == -1) {
-		        	{
-		        		//SM.Debug("messLen not int=" + messLen +" tempArr[1]:" +tempArr[1]);
 		        		continue;
 		        	}
 			        char[] temMSG = data.toCharArray();
-			        //SM.Debug("MessLen:"+messLen+" Data len:"+data.length()+"IF:"+(data.length() != messLen));
+			        if (data.length() != messLen) {
-			        if (data.length() != messLen)			        
-			        {
 			        	//if expected string message is smaller then actual string then exit processing;
-			        	if(messLen>data.length())
+			        	if (messLen > data.length()) {
-			        	//if(messLen>n)
-		        		{
-			        		//SM.Debug("duda","messLen=" + messLen +" data.length():" +data.length()+"n:"+n);
 			        		leftOver = data; // Add by bigu
 		        			continue;
 		        		}
 			        	//perform cut
-			        	//SM.Debug("We got leftover ....message length("+messLen+") != actual length("+data.length()+")");
 			        	temMSG = data.substring(0,messLen).toCharArray();
-			        	//SM.Debug("temMSG:"+temMSG.toString());
+			        	leftOver = data.substring(messLen);
-			        	leftOver = data.substring(messLen,data.length());
-			        	//SM.Debug("leftOver:"+leftOver);
-			        	//leftOver = data.substring(messLen,n);
-			        	//SM.Debug("left over string:"+leftOver);
 			        }
 					//decode TCP msg
 					TCPmsg msg = new TCPmsg(temMSG);
 
 					SM.Debug("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", msg.allData);
 					
-					if(msg.allData.contains("#92#"))
+					if (msg.allData.contains("#92#"))
 						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());
-					//previousConnectionWasUP = isConnectionUP;
 					isConnectionUP = false;
 					triggerTCPConnectionStateEvent();
 				}
-			}//while(connOK)
+			}
-			
 			
 			//
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash2 on sleep:"+e.toString());
+				SM.Debug("TCPhandler Crash2 on sleep:"+ e);
-				//previousConnectionWasUP = isConnectionUP;
 			}
-			
 			//try to restart connection
-			if(alive && isWiFiOn)
+			if (alive && isWiFiOn)
-				RestartTCP();
+				restartTCP();
-			
+		}
-		}//while(alive)
 		SM.Debug("==================================");
 		SM.Debug("TCP listenThread stoped!! alive = false");
 		SM.Debug("==================================");
 	}
 
-	
 	/**
 	 * Create a bypass in order to trigger the ping received event
 	 */
@@ -342,7 +259,6 @@ public class TCPhandler implements Runnable
 		TCPmsgParser._firePONGReceivedEvent();
 	}
 
-	
 	/* Broadcast Received for WiFi Connect/Disconnect */
 	public BroadcastReceiver mReceived = new BroadcastReceiver() {
 
@@ -351,298 +267,146 @@ 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
-		        if(!info.isConnectedOrConnecting()) {
+				isWiFiOn = isNetworkConnected();
-		        	closeSocket();
+				if (!isWiFiOn)
-		        	isWiFiOn = false;
+					closeSocket();
-		        }
-		        else 
-		        	isWiFiOn = true;
 		    }      
 		}
 	};
 	
-	
-	
 	/** 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
 	 */
-	public boolean Write(String seqID, String msg)
+	public boolean Write(String seqID, String msg) {
-	{
+		try {
-		
+			if (output != null) {
-		try 
-		{
-			
-			/*
-			if(writer != null)
-			{
-				String cmdok = "#" + seqID + msg; 
-				Integer tmp = cmdok.length() + 1; 
-				//SM.Debug("tmp:"+tmp);
-				
-				tmp += Integer.toString(tmp).length();// tmp.ToString().Length; 
-				if((tmp==10)||(tmp==100)||(tmp==1000)) tmp++;
-				cmdok = "#" + Integer.toString(tmp) + cmdok;
-				writer.write(encryptTEA(cmdok));
-				writer.flush();
-				SM.Debug("TX:"+encryptTEA(cmdok));
-				return true;
-			}*/
-			
-			if(output != null)
-			{
 				try {
 					Thread.sleep(10);
 					String cmdok = "#" + seqID + msg;
 					Integer tmp = cmdok.length() + 1;
-					//SM.Debug("tmp:"+tmp);
 
-					tmp += Integer.toString(tmp).length();// tmp.ToString().Length; 
+					tmp += Integer.toString(tmp).length();
-					if((tmp==10)||(tmp==100)||(tmp==1000)) tmp++;
+					if ((tmp == 10) || (tmp == 100) || (tmp == 1000)) tmp++;
 					cmdok = "#" + Integer.toString(tmp) + cmdok;
 
 					byte[] mess = encryptTEA(cmdok);
+					Thread tcpThread = new Thread(() -> {
+						try  {
+							output.write(mess);
+							output.flush();
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+					});
+
+					tcpThread.start();
 
 
-					output.write(mess);
-					output.flush();
-					
-					// show only notACK messages
-					//if(mess[3] != 0x0C)
 					SM.Debug(" ", new String(mess));
 					return true;
+				} catch (InterruptedException e) {
+					SM.Exception("TCPClient[Send]", e.toString());
+					Thread.currentThread().interrupt();
+				} catch (NoSuchElementException e) {
+					SM.Exception("TCPClient[Send]", e.toString());
 				}
-			catch (IOException e) {
+			} else {
-				//e.printStackTrace();
-				SM.Exception("TCPClient[Send]", e.toString());
-			} catch (InterruptedException e) {
-				SM.Exception("TCPClient[Send]", e.toString());
-			} catch (NoSuchElementException e) {
-				SM.Exception("TCPClient[Send]", e.toString());
-			}
-			}
-			else
-			{
 				return false;
 			}
-		} 
+		} catch (Exception e) {
-		catch (Exception e) 
+			SM.Debug("TCPhandler Write Procedure:" + e);
-		{
-			SM.Debug("TCPhandler Write Procedure:"+e.toString());
 		}
 		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[]{};
-		
-		/*
-		//encrypt message using TEA
-		try {
-			encryptedByteArray = TEA.encrypt(toEncryptData);
-		} catch (UnsupportedEncodingException e) {
-			SM.Exception("encryptTEA Exception(UEE): " + e.toString());
-		} catch (IndexOutOfBoundsException e) {
-			SM.Exception("encryptTEA Exception(IOoBE): " + e.toString());
-		} catch (NullPointerException e) {
-			SM.Exception("encryptTEA Exception(NPE): " + e.toString());
-		}
-		//*/
-		
 		// no encryption
-		encryptedByteArray = toEncryptData.getBytes();
+		return toEncryptData.getBytes();
-		
-		return encryptedByteArray;
 	}
 
 	/* Decrypt a string using an encryption algorithm,
 	 * in this case TEA */
 	public static byte[] decryptTEA(byte[] toDecryptData) {
-		byte[] decryptedByteArray = new byte[]{};
+		byte[] decryptedByteArray;
-
-		/*
-		String sm = "";
-		for(int i=0; i<toDecryptData.length; i++)
-			sm+=toDecryptData[i] + "  "; 
-		
-		SM.Debug("DDDDDD: " + sm);
-		//*/
-		/*
-		//decrypt message using TEA
-		try {
-			decryptedByteArray = TEA.decrypt(toDecryptData);
-		} catch (UnsupportedEncodingException e) {
-			SM.Exception("encryptTEA Exception(UEE): " + e.toString());
-		} catch (IndexOutOfBoundsException e) {
-			SM.Exception("encryptTEA Exception(IOoBE): " + e.toString());
-		} catch (NullPointerException e) {
-			SM.Exception("encryptTEA Exception(NPE): " + e.toString());
-		}
-		
-		String sm = "";
-		for(int i=0; i<decryptedByteArray.length; i++)
-			sm+= (int)decryptedByteArray[i] + " "; 
-		//sm = new String(decryptedByteArray.toString());
-		try {
-			SM.Debug("##### " + new String(decryptedByteArray, "UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		SM.Debug("DEcrypted: " + decryptedByteArray.toString());
-		
-		//*/
 		
 		// no decryption
 		decryptedByteArray = toDecryptData;
-		
 		return decryptedByteArray;
 	}
 
-	
 	public int getPort() {
 		return port;
 	}
 	
-	public void updateTCPparameters(String ip, String _port)
+	public void updateTCPparameters(String ip, String _port) {
-	{
-		
 		// stop socket
 		try {
-			if(soc != null)
+			if (soc != null)
 				soc.close();
 		} catch (IOException e1) {
 			e1.printStackTrace();
 		}
 
 		serverHostname = ip;
-		try
+		try {
-		{
 			port = Integer.parseInt(_port);
-		}
+		} catch (Exception ignored) { }
-		catch (Exception e) {
+		finally {
-			
-		}
-		finally
-		{
 			port = 13589;
 		}
 	}
 
 	public void triggerTCPConnectionStateEvent() {
-		if(!isConnectionUP)
+		if (!isConnectionUP)
 			TCPmsgParser._fireTCPConnectionDownEvent(previousConnectionWasUP);
 		else
 			TCPmsgParser._fireTCPConnectionUpEvent(previousConnectionWasUP);
 	}
 
-	private void RestartTCP()
+	private void restartTCP() {
-	{
+		try {
-		try 
-		{
 			isConnectionUP = false;
 			previousConnectionWasUP = false;
 
-			SM.Debug("Restarting TCP...ip:"+serverHostname + ":" + port);
+			SM.Debug("Restarting TCP...ip:" + serverHostname + ":" + port);
 			soc = new Socket();
 			soc.connect(new InetSocketAddress(serverHostname, port), 5000);
 
 			input = new DataInputStream(soc.getInputStream());
-			//input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			//output stream
 			output = new DataOutputStream(soc.getOutputStream());
 
-			//recv= new BufferedReader(new InputStreamReader(soc.getInputStream()));
+			if (soc != null) {
-			//writer =new PrintWriter(soc.getOutputStream()) ;
-			if(soc !=null)
-			{
-				//previousConnectionWasUP = isConnectionUP;
 				isConnectionUP = true;
-				//triggerTCPConnectionStateEvent();
-				
-				/*
-				//init connection
-				boolean res = Write("0.0", "#19#" + AppParams.crtRadio.ip + "&"
-							+ AppParams.crtRadio.id + "#");
-				if(res){
-					SM.Debug("Message (AirPadInit) sent to controller");
-				}else{
-					SM.Debug("Could not send message(AirPadInit)!!");
-				}
-				
-				//get 
-				res = Write("0.0", "#30#104#0#0#0#0#");
-				if(res){
-					SM.Debug("Message (GetSetZoneAndChannel) sent to app server zoneNR:"+0+ " channelNR:"+0);
-				}else{
-					SM.Debug("Could not send message(GetSetZoneAndChannel)!!!");
-				}
-				*/
-				//init audio 
-				//AudioHandle.b_SendinitUDP = true;
 			}
 
-		} 
+		} catch (UnknownHostException e) {
-		catch (UnknownHostException e) 
+			SM.Exception("restartTCP break:" + e.toString());
-		{
-			SM.Exception("RestartTCP break:"+e.toString()); 
 			isConnectionUP = false;
-		
+		} catch (IllegalArgumentException e) {
-		} 
+			SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
-		catch (IllegalArgumentException e) 
+		} catch (IOException e) {
-		{
+			SM.Exception("restartTCP break:" + e.toString());
-			SM.Debug("IllegalArgumentException", "RestartTCP break:"+e.toString()); 
+			isConnectionUP = false;
-		} 
+		} catch (NullPointerException e) {
-		catch (IOException e) 
+			SM.Exception("restartTCP break:" + e.toString());
-		{
-			SM.Exception("RestartTCP break:"+e.toString());
 			isConnectionUP = false;
 		}
-		catch (NullPointerException e) 
-		{
-			SM.Exception("RestartTCP break:"+e.toString());
-			isConnectionUP = false;
-		}
-		
 		triggerTCPConnectionStateEvent();
 	}
 
-	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;
-			if(soc!=null)
+			if (soc != null)
 				soc.close();
 			soc = null;
 		} catch (IOException e) {
@@ -650,27 +414,23 @@ public class TCPhandler implements Runnable
 		}
 	}
 	
-	
+	public void Stop() {
-	public void Stop()
-	{	
 		SM.Debug("Stopping TCP", "TCP Connection is stopping on " + AppParams.IP + ":" + port);
 		alive = false;
 		
-		
+		if (mReceived!= null)
-		if(mReceived!= null)
+			try {
-			try{ context.unregisterReceiver(mReceived); } catch(Exception ex) {/* receiver not registered  //*/};
+				context.unregisterReceiver(mReceived);
+			} catch(Exception ex) {/* receiver not registered  //*/}
 
 		// stop thread
-		if(listenThread != null)
+		if (listenThread != null) {
-		{
 			Thread moribund = listenThread;
 			listenThread = null;
 			moribund.interrupt();
 		}
 
-				 
+		if (input != null) {
-		if(input!=null)
-		{
 			try {
 				input.close();
 				input = null;
@@ -679,8 +439,7 @@ public class TCPhandler implements Runnable
 			}
 		}
 		
-		if(output!=null)
+		if (output != null) {
-		{
 			try {
 				output.close();
 				output = null;
@@ -689,16 +448,13 @@ public class TCPhandler implements Runnable
 			}
 		}
 		
-		if(soc !=null)
+		if (soc !=null) {
-		{
 			try {
 				soc.close();
 				soc = null;
-			} 
+			} catch (IOException e) {
-			catch (IOException e) {
+				SM.Exception("TCPClient[STOP]", "Stop break:"+ e);
-				SM.Exception("TCPClient[STOP]", "Stop break:"+e.toString());
 			}
 		}
 	}
-
 }

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

@@ -1,7 +1,6 @@
 package com.safemobile.services;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -12,16 +11,14 @@ import com.safemobile.lib.SM;
 import com.safemobile.lib.TCPmsg;
 
 
-public class TCPmsgParser implements Runnable{
+public class TCPmsgParser implements Runnable {
-
 
 	public boolean run = true;
 	private TCPmsg _msg;
-	private static List<ITCPListener> _listeners = new ArrayList<ITCPListener>();
+	private static final List<ITCPListener> _listeners = new ArrayList<>();
 	private Thread TCPmsgParserThread;
 
-	public TCPmsgParser()
+	public TCPmsgParser() {
-	{
 		TCPmsgParserThread = new Thread(this, "TCPmsgParserThread"); 		
 		TCPmsgParserThread.start(); // (2) Start the thread.		
 	}
@@ -38,177 +35,151 @@ public class TCPmsgParser implements Runnable{
     	_listeners.clear();
     }
 
-    public int getListenersSize()
-    {
-    	return _listeners.size();
-    }
-    
     private synchronized void _fireLoginEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onLoginReceived(event);
-            ( (ITCPListener) listeners.next() ).onLoginReceived( event );
         }
     }
     private synchronized void _fireGPSEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onGPSReceived(event);
-            ( (ITCPListener) listeners.next() ).onGPSReceived(event);
         }
     }
     private synchronized void _fireSMSEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onSMSReceived(event);
-            ( (ITCPListener) listeners.next() ).onSMSReceived( event );
         }
     }
     
     private synchronized void _fireLastSMSEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onLastSMSsReceived(event);
-            ( (ITCPListener) listeners.next() ).onLastSMSsReceived(event);
         }
     }
     
     private synchronized void _fireVehEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onVehiclesReceived(event);
-            ( (ITCPListener) listeners.next() ).onVehiclesReceived( event );
         }
     }
     
     private synchronized void _fireNewSMS() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onNewSMSReceived(event);
-            ( (ITCPListener) listeners.next() ).onNewSMSReceived(event);
         }
     }
     
     private synchronized void _fireSMSconfirm() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onSMSAckReceived(event);
-            ( (ITCPListener) listeners.next() ).onSMSAckReceived(event);
         }
     }
     
     private synchronized void _fireLastPos() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onLastPositionsReceived(event);
-            ( (ITCPListener) listeners.next() ).onLastPositionsReceived(event);
         }
     }
     
     private synchronized void _fireRadioEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRadioMsgReceived(event);
-            ( (ITCPListener) listeners.next() ).onRadioMsgReceived(event);
         }
     }
     
     private synchronized void _fireHistPos() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onHistoryPositionsReceived(event);
-            ( (ITCPListener) listeners.next() ).onHistoryPositionsReceived(event);
         }
     }
     
     private synchronized void _fireHistCount() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onHistoryPositionsCountReceived(event);
-            ( (ITCPListener) listeners.next() ).onHistoryPositionsCountReceived(event);
         }
     }
     
     private synchronized void _fireAlarmList() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onAlarmsReceived(event);
-            ( (ITCPListener) listeners.next() ).onAlarmsReceived(event);
         }
     }
     
     private synchronized void _fireAlarmACK() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onAlarmAckReceived(event);
-            ( (ITCPListener) listeners.next() ).onAlarmAckReceived(event);
         }
     }
     
     private synchronized void _fireAlarmLive() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.alarmLiveReceived(event);
-            ( (ITCPListener) listeners.next() ).alarmLiveReceived(event);
         }
     }
     
     private synchronized void _fireRecordList() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRecordingsListReceived(event);
-            ( (ITCPListener) listeners.next()).onRecordingsListReceived(event);
         }
     }
     
     private synchronized void _fireRecordPlay() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRecordingPlayReceived(event);
-            ( (ITCPListener) listeners.next()).onRecordingPlayReceived(event);
         }
     }
     
     private synchronized void _firePOLLEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onPollReceived(event);
-            ( (ITCPListener) listeners.next()).onPollReceived(event);
         }
     }
      
     private synchronized void _fireConnectionReplyEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onConnectionReplyReceived(event);
-            ( (ITCPListener) listeners.next()).onConnectionReplyReceived(event);
         }
     }
     
     private synchronized void _fireContactsReceivedEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
 
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onContactsListReceived(event);
-            ( (ITCPListener) listeners.next()).onContactsListReceived(event);
         }
     }
     
     private synchronized void _fireRecordingsReceivedEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
 
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRecordingsListReceived(event);
-            ( (ITCPListener) listeners.next()).onRecordingsListReceived(event);
         }
     }
     
     private synchronized void _fireTextMessagesReceivedEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
 
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTextMessagesListReceived(event);
-            ( (ITCPListener) listeners.next()).onTextMessagesListReceived(event);
         }
     }
     
@@ -216,225 +187,196 @@ public class TCPmsgParser implements Runnable{
     private synchronized void _fireRecordingPlayReceivedEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
 
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRecordingPlayReceived(event);
-            ( (ITCPListener) listeners.next()).onRecordingPlayReceived(event);
         }
     }
     
     
     public static synchronized void _fireTCPConnectionDownEvent(boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionDown(previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionDown(previuosWasConnectionUp);
         }
     }
     
     public static synchronized void _fireTCPConnectionUpEvent(boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionUp(previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionUp(previuosWasConnectionUp);
         }
     }
     
     
     public static synchronized void _fireonTCPConnectionStatusEvent(boolean isConnectionUp, boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
         }
     }
     
     public static synchronized void _firePONGReceivedEvent() {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onPONGReceived();
-            ( (ITCPListener) listeners.next()).onPONGReceived();
         }
     }
     
     
 	@Override
-	public void run() 
+	public void run() {
-	{
+		while(run) {
-		while(run)
-		{
-			//SM.Debug("TCPmsgParser waiting for data...");
 			sleep(1);
 
-			if(TCPhandler.msgList==null)
+			if (TCPhandler.msgList == null)
 				continue;
-			if(!TCPhandler.msgList.isEmpty())
+			if(!TCPhandler.msgList.isEmpty()) {
-			{
+				try {
-				try
-				{
 					_msg = TCPhandler.msgList.poll();
 					if(_msg == null)
 						continue;
-					if(_msg.OK == false)
+					if(!_msg.OK)
 						continue;
 					//parse the rest of the message;
 
-					switch(_msg.opCode)
+					switch(_msg.opCode) {
-					{
+                        case 40:{
-					case 40:{
+                            _fireLoginEvent();
-						_fireLoginEvent();
+                            break;
-						break;
+					    }
-					}
 
-					case 41:{
+                        case 41:{
-						_fireVehEvent();
+                            _fireVehEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case 42:{
+                        case 42:{
-						_fireSMSEvent();
+                            _fireSMSEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case 43:{
+                        case 43:{
-						_fireLastSMSEvent();
+                            _fireLastSMSEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case OperationCodes.TM_ACK:{
+                        case OperationCodes.TM_ACK:
-						_fireSMSconfirm();
+                        case OperationCodes.TM_ACK_SD: {
-						break;
+                            _fireSMSconfirm();
-					}
+                            break;
-					case OperationCodes.TM_ACK_SD:{
+                        }
-						_fireSMSconfirm();
-						break;
-					}
 
-					case OperationCodes.RECEIVED_TM:{
+                        case OperationCodes.RECEIVED_TM:{
-						_fireNewSMS();
+                            _fireNewSMS();
-						break;
+                            break;
-					}
+					    }
 
-					case 45:{
+                        case 45:{
-						_fireLastPos();
+                            _fireLastPos();
-						break;
+                            break;
-					}
+                        }
 
-					case 131:{
+                        case 131:{
-						_fireGPSEvent();
+                            _fireGPSEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case 231:{
+                        case 231:{
-						_firePOLLEvent();
+                            _firePOLLEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case 50:{
+                        case 50:{
-						_fireRadioEvent();
+                            _fireRadioEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case 46:{
+                        case 46:{
-						_fireHistPos();
+                            _fireHistPos();
-						break;
+                            break;
-					}
+                        }
 
-					case 86:{
+                        case 86:{
-						_fireHistCount();
+                            _fireHistCount();
-						break;
+                            break;
-					}
+                        }
 
-					case 47:{
+                        case 47:{
-						_fireAlarmList();
+                            _fireAlarmList();
-						break;
+                            break;
-					}
+                        }
 
-					case 48:{
+                        case 48:{
-						_fireAlarmACK();
+                            _fireAlarmACK();
-						break;
+                            break;
-					}
+                        }
 
-					case 49:{							 
+                        case 49:{
-						_fireRecordList();
+                            _fireRecordList();
-						break;
+                            break;
-					}
+                        }
 
-					case 38:{							 
+                        case 38:{
-						_fireRecordPlay();
+                            _fireRecordPlay();
-						break;
+                            break;
-					}
+                        }
 
-					case 135:
+                        case 135:
-					case 136:
+                        case 136:
-					case 137:
+                        case 137:
-					case 138:
+                        case 138:
-					case 140:{
+                        case 140:{
-						_fireAlarmLive();
+                            _fireAlarmLive();
-						break;
+                            break;
-					}
+                        }
 					
-					case OperationCodes.PONG: {
+                        case OperationCodes.PONG: {
-						//_firePONGReceivedEvent();
+                            //_firePONGReceivedEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case OperationCodes.CONNECTION_REP: {
+                        case OperationCodes.CONNECTION_REP: {
-						_fireConnectionReplyEvent();
+                            _fireConnectionReplyEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case OperationCodes.CONTACTS_REP: {
+                        case OperationCodes.CONTACTS_REP: {
-						sleep(15);
+                            sleep(15);
-						_fireContactsReceivedEvent();
+                            _fireContactsReceivedEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case OperationCodes.TM_LIST_REP: {
+                        case OperationCodes.TM_LIST_REP: {
-						_fireTextMessagesReceivedEvent();
+                            _fireTextMessagesReceivedEvent();
-						break;
+                            break;
-					}
+                        }
 
-					case OperationCodes.RECORDINGS_LIST_REP: {
+                        case OperationCodes.RECORDINGS_LIST_REP: {
-						_fireRecordingsReceivedEvent();
+                            _fireRecordingsReceivedEvent();
-						break;
+                            break;
-					}
+                        }
-
-					case OperationCodes.RECORDING_REP: {
-						_fireRecordingPlayReceivedEvent();
-						break;
-					}
-
-					default:
-						break;
-					}
-				}
-				catch(Exception ex)
-				{
-					try {
-						if(TCPhandler.msgList.size() > 0)
-							_msg = TCPhandler.msgList.remove(0);
-					}
-					catch(NoSuchElementException exe)
-					{
-						SM.Exception("TCP msg Parser", "NoSuchElementException");
-					}
-				}
-			}
 
+                        case OperationCodes.RECORDING_REP: {
+                            _fireRecordingPlayReceivedEvent();
+                            break;
+                        }
 
+                        default:
+                            break;
+                    }
+                } catch(Exception ex) {
+                    try {
+                        if(TCPhandler.msgList.size() > 0)
+                            _msg = TCPhandler.msgList.remove(0);
+                    } catch(NoSuchElementException exe) {
+                        SM.Exception("TCP msg Parser", "NoSuchElementException");
+                    }
+                }
+            }
 		}
-		/*
-			catch (Exception e) 
-			{
-				SM.Debug("Error on fire Event:"+e.toString());
-				break;
-			}		
-
-		}*/
 		SM.Debug("TCPmsgParser listen thread stoped.");
 	}
 
 	private void sleep(int miliseconds) {
 		try {
 			Thread.sleep(miliseconds);
-		} catch (InterruptedException e) {
+		} catch (InterruptedException ignored) { }
-		}
 	}
 
 	public void clearMsgList()
@@ -442,17 +384,14 @@ public class TCPmsgParser implements Runnable{
 		TCPhandler.msgList.clear();
 	}
 
-	public void Stop()
+	public void Stop() {
-	{
 		run = false;
 		// stop thread
-		if(TCPmsgParserThread != null)
+		if(TCPmsgParserThread != null) {
-		{
 			Thread moribund = TCPmsgParserThread;
 			TCPmsgParserThread = null;
 			moribund.interrupt();
 		}
 		SM.Debug("Stoping TCPmsgParser");
 	}
-
 }

libSafeMobile/src/main/res/layout/map_marker_info_bubble.xml

@@ -1,15 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
-     Copyright (C) 2012 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -74,17 +63,17 @@
             android:id="@+id/tvTimeAgo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/time"
             android:layout_alignTop="@+id/time"
+            android:layout_alignBottom="@+id/time"
             android:layout_gravity="center_horizontal"
             android:layout_toEndOf="@+id/time"
             android:layout_toRightOf="@+id/time"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
-            tools:text="a year ago [01:05:01]"
             android:textColor="#ff000000"
-            android:textSize="10sp" />
+            android:textSize="10sp"
+            tools:text="a year ago [01:05:01]" />
 
         <ImageView
             android:id="@+id/speed"

safeDispatch/build.gradle

@@ -78,6 +78,4 @@ dependencies {
 
     // add Gson
     implementation 'com.google.code.gson:gson:2.8.6'
-
-    //retrofit
 }

safeDispatch/src/main/AndroidManifest.xml

@@ -45,7 +45,6 @@
             android:name="com.safemobile.safedispatch.SDMobileActivity"
             android:configChanges="orientation"
             android:exported="true"
-            android:label="@string/app_name_demo"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

safeDispatch/src/main/java/com/safemobile/lib/sound/AudioHandle.java

@@ -22,7 +22,7 @@ public class AudioHandle implements Runnable{
 	private DataOutputStream outData =null;
 	private Thread t_micListner;
 	private UDPclient udp;
-	private TCPaudioClient tcp;
+	private TcpAudioClient tcp;
 	private int audioport = 50001;
 	
 	public int typeUDP;
@@ -56,7 +56,7 @@ public class AudioHandle implements Runnable{
 		else
 		{
 			try {
-				tcp = new TCPaudioClient(IP,audioport);
+				tcp = new TcpAudioClient(IP,audioport);
 				bufferSize = AudioTrack.getMinBufferSize(SAMPLE_RATE, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
 				
 				
@@ -155,7 +155,7 @@ public class AudioHandle implements Runnable{
 						 /*
 						 tempBuffer = new byte[16384];//128];//invers3.bufferSize];
 						 bRead = recDev.read(tempBuffer, 0,16384);// 128);//invers3.bufferSize);*/
-						 tcp.Send(tempBuffer,bRead);
+						 tcp.send(tempBuffer,bRead);
 						 SM.Debug("TCP sending b:"+bRead);
 					 }
 				 }		

safeDispatch/src/main/java/com/safemobile/lib/sound/RecordingHandle.java

@@ -1,84 +1,65 @@
 package com.safemobile.lib.sound;
 
-import com.safemobile.lib.SM;
-
 import android.media.AudioFormat;
 import android.media.AudioManager;
-import android.media.AudioRecord;
 import android.media.AudioTrack;
-import android.media.MediaRecorder;
+
+import com.safemobile.lib.SM;
 
 public class RecordingHandle {
-	public Boolean isAlive = false;
+	private Boolean soundNeeded = false;
-	public Boolean soundNeeded = false;
+	private AudioTrack playDev = null;
-	private AudioTrack playDev =null;
-	private int bufferSize;
-	private TCPaudioClient tcp;
-	private int recport = 50002;
 
-	public RecordingHandle(String IP)
+	public RecordingHandle(String ip) {
-	{
 		try {
-			tcp = new TCPaudioClient(IP,recport);
+			final int RECORDING_PORT = 50003;
-			int sampleRate = 8000;
+			TcpAudioClient tcp = new TcpAudioClient(ip, RECORDING_PORT);
-			int bufsize = AudioTrack.getMinBufferSize(sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
+			final int sampleRate = 8000;
+			int bufferSize = AudioTrack.getMinBufferSize(sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
 			//init play device
-			playDev = new AudioTrack(AudioManager.STREAM_MUSIC,sampleRate,AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT,bufsize, AudioTrack.MODE_STREAM);	
+			playDev = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferSize, AudioTrack.MODE_STREAM);
 
-			tcp.addTCPListener(new ITCPaudioLis() 
+			tcp.addTCPListener(event -> {
-			{
+				byte[] data = event.data();
-				
+				int len = event.len();
-				@Override
+				SM.Debug("received b:" + len + " data.length:" + data.length);
-				public void dataRecv(TCPaudioEvent event) {
+				playSound(data);
-					byte[] data = event.data();
-					int len = event.len();
-					SM.Debug("recv b:"+len+" data.length:"+data.length);
-					if(data!=null)
-						PlaySound(data, len);
-					
-				}
 			});
-		}
+		} catch (Exception ex) {
-		catch(Exception ex) {
 			SM.Exception("recordings", ex.toString());
 		}
 	}
 
-	private void PlaySound(byte[] data, int len)
+	private void playSound(byte[] data) {
-	{
+		if (Boolean.TRUE.equals(getSoundNeeded())) {
-		if(soundNeeded)
+			if (playDev.getState() == AudioTrack.STATE_INITIALIZED) {
-		{
+				playDev.write(data, 0, data.length);
-			if(playDev.getState() == playDev.STATE_INITIALIZED)
-			{
-				playDev.write(data, 0 , data.length);
 				playDev.play();
-				
+			} else {
-			}
+				SM.Debug("Cannot play sound playDev NOT init correctly");
-			else
-			{
-				SM.Debug("Cannot play sound playDev NOT init corectly");
 			}
 		}
 	}
 
-	public void StartSound()
+	public void startSound() {
-	{
+		setSoundNeeded(true);
-		
-		soundNeeded = true;
 	}
 
-	public void StopSound()
+	public void stopSound() {
-	{
+		if (playDev != null && playDev.getState() == AudioTrack.STATE_INITIALIZED) {
-		if(playDev.getState() == playDev.STATE_INITIALIZED)
+			if (playDev.getPlayState() == AudioTrack.PLAYSTATE_PLAYING)
-		{
-			if(playDev.getPlayState() == playDev.PLAYSTATE_PLAYING)
 				playDev.stop();
-			
+		} else {
-		}
-		else
-		{
 			SM.Debug("Cannot STOP playDev");
 		}
-		soundNeeded= false;
+		setSoundNeeded(false);
+	}
+
+	public Boolean getSoundNeeded() {
+		return soundNeeded;
+	}
+
+	public void setSoundNeeded(Boolean soundNeeded) {
+		this.soundNeeded = soundNeeded;
 	}
 }

safeDispatch/src/main/java/com/safemobile/lib/sound/TCPaudioClient.java

@@ -1,195 +0,0 @@
-package com.safemobile.lib.sound;
-
-import com.safemobile.lib.SM;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class TCPaudioClient implements Runnable{
-private boolean alive = true;
-	
-	public String serverHostname = new String ("10.120.1.114");//
-	private int port = 50001;
-	private Thread listenThread;
-	private Socket soc =null;
-	
-	private InputStream recv;
-	private OutputStream writer;
-
-	private volatile int n=0;
-	
-	public Boolean connOK=false;
-	byte[] buffer = new byte[16384];
-	private List<ITCPaudioLis> _listeners = new ArrayList<ITCPaudioLis>();
-	
-	public TCPaudioClient(String hostName, int _port)
-	{
-		serverHostname=hostName;
-		this.port = _port;
-		SM.Debug("---TCPhandler construcort--- port:"+_port);
-		listenThread = new Thread(this, "TCPlisten"); 		
-		listenThread.start(); // (2) Start the thread.
-		
-	}
-	
-	@Override
-	public void run() 
-	{
-		try 
-		{
-			soc = new Socket(serverHostname, port);
-			SM.Debug("Socket timeout:" + soc.getSoTimeout() );
-			//soc.setSoTimeout(5000);
-			recv= soc.getInputStream();
-			writer =soc.getOutputStream() ;
-			if(soc !=null)
-				connOK = true;
-			
-		} 
-		catch (UnknownHostException e) 
-		{
-			SM.Debug("UnknownHostException", "break:"+e.toString()); 
-		} 
-		catch (IOException e) 
-		{
-			SM.Debug("IOException", "break:"+e.toString());
-		}
-		
-		while(alive)
-		{
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				SM.Debug(e.toString());
-			}
-			while(connOK)
-			{
-				try
-				{
-					buffer = new byte[16384];					
-					n  = recv.read(buffer);
-					if(n==-1)
-						break;
-					_fireDataArrived(buffer,n);
-				}
-				catch(Exception ex)
-				{
-					SM.Debug("break:"+ex.toString());
-					connOK = false;
-				}
-			}//while(connOK)
-			
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				SM.Debug(e.toString());
-			}
-			if(alive)RestartTCP();
-		}//while(alive)
-		SM.Debug("==================================");
-		SM.Debug("TCP listenThread stoped!! alive = false");
-		SM.Debug("==================================");
-	}
-	
-	public boolean Send(byte[] data,int len)
-	{
-		
-		try 
-		{
-			
-			if(writer != null)
-			{
-				writer.write(data,0,len);
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		} 
-		catch (Exception e) 
-		{
-			// TODO Auto-generated catch block
-			SM.Debug(e.toString());
-		}
-		return false;
-	}
-	
-	private void RestartTCP()
-	{
-		try 
-		{
-			SM.Debug("Restarting TCP...ip:"+serverHostname);
-			soc = new Socket(serverHostname, port);
-			recv= soc.getInputStream();
-			writer =soc.getOutputStream();
-			if(soc !=null)
-				connOK = true;
-			
-		} 
-		catch (UnknownHostException e) 
-		{
-			SM.Debug("break:"+e.toString()); 
-		} 
-		catch (IOException e) 
-		{
-			SM.Debug("break:"+e.toString());
-		}
-	}
-
-	public boolean isAlive() {
-		return alive;
-	}
-
-	public void setAlive(boolean alive) {
-		this.alive = alive;
-	}
-	
-	public void Stop()
-	{
-		
-		this.alive = false;
-		if(soc !=null)
-		{
-			try {
-				soc.close();
-				soc = null;
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				SM.Debug("break:"+e.toString());
-			}
-			connOK = false;
-		}
-		// stop thread
-		 if(listenThread != null)
-		 {
-		    Thread moribund = listenThread;
-		    listenThread = null;
-		    moribund.interrupt();
-		 }
-	}
-	
-	public synchronized void addTCPListener( ITCPaudioLis l ) {
-        _listeners.add( (ITCPaudioLis) l );
-	}	
-    
-	public synchronized void removeTCPListener( ITCPaudioLis l ) {
-	    _listeners.remove( l );
-	}
-	    
-	private synchronized void _fireDataArrived(byte[] data, int len) {
-	    TCPaudioEvent event = new TCPaudioEvent( this, data, len );
-	    Iterator<ITCPaudioLis> listeners = _listeners.iterator();
-	    while( listeners.hasNext() ) {
-	        ( (ITCPaudioLis) listeners.next() ).dataRecv(event);
-	    }
-	}
-}

safeDispatch/src/main/java/com/safemobile/lib/sound/TcpAudioClient.java

@@ -0,0 +1,174 @@
+package com.safemobile.lib.sound;
+
+import com.safemobile.lib.SM;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TcpAudioClient implements Runnable {
+	private boolean alive = true;
+
+	private String serverHostname;
+	private final int port;
+	private Thread listenThread;
+	private Socket soc = null;
+
+	private InputStream recv;
+	private OutputStream writer;
+
+	private Boolean connOK = false;
+	byte[] buffer = new byte[16384];
+	private final List<ITCPaudioLis> listeners = new ArrayList<>();
+
+	public TcpAudioClient(String hostName, int port) {
+		setServerHostname(hostName);
+		this.port = port;
+		SM.Debug("---TcpHandler constructor--- port:" + port);
+		listenThread = new Thread(this, "TcpListen");
+		listenThread.start(); // (2) Start the thread.
+
+	}
+
+	@Override
+	public void run() {
+		try {
+			soc = new Socket(getServerHostname(), port);
+			SM.Debug("Socket timeout:" + soc.getSoTimeout());
+			recv = soc.getInputStream();
+			writer = soc.getOutputStream();
+			if (soc != null)
+				setConnOK(true);
+
+		} catch (UnknownHostException e) {
+			SM.Debug("UnknownHostException", "break:" + e);
+		} catch (IOException e) {
+			SM.Debug("IOException", "break:" + e);
+		}
+
+		while (alive) {
+			try {
+				Thread.sleep(3000);
+			} catch (InterruptedException e) {
+				SM.Debug(e.toString());
+				Thread.currentThread().interrupt();
+			}
+			while (Boolean.TRUE.equals(getConnOK())) {
+				try {
+					buffer = new byte[16384];
+					int n = recv.read(buffer);
+					if (n == -1)
+						break;
+					fireDataArrived(buffer, n);
+				} catch (Exception ex) {
+					SM.Debug("break:" + ex);
+					setConnOK(false);
+				}
+			}
+
+			try {
+				Thread.sleep(3000);
+			} catch (InterruptedException e) {
+				SM.Debug(e.toString());
+				Thread.currentThread().interrupt();
+			}
+
+			if (alive) restartTCP();
+		}
+		SM.Debug("==================================");
+		SM.Debug("TCP listenThread stopped!! alive = false");
+		SM.Debug("==================================");
+	}
+
+	public boolean send(byte[] data, int len) {
+
+		try {
+
+			if (writer != null) {
+				writer.write(data, 0, len);
+				return true;
+			} else {
+				return false;
+			}
+		} catch (Exception e) {
+			SM.Debug(e.toString());
+		}
+		return false;
+	}
+
+	private void restartTCP() {
+		try {
+			SM.Debug("Restarting TCP...ip:" + getServerHostname());
+			soc = new Socket(getServerHostname(), port);
+			recv = soc.getInputStream();
+			writer = soc.getOutputStream();
+			setConnOK(true);
+
+		} catch (IOException e) {
+			SM.Debug("break:" + e);
+		}
+	}
+
+	public boolean isAlive() {
+		return alive;
+	}
+
+	public void setAlive(boolean alive) {
+		this.alive = alive;
+	}
+
+	public void stop() {
+
+		this.alive = false;
+		if (soc != null) {
+			try {
+				soc.close();
+				soc = null;
+			} catch (IOException e) {
+				SM.Debug("break:" + e);
+			}
+			setConnOK(false);
+		}
+		// stop thread
+		if (listenThread != null) {
+			Thread moribund = listenThread;
+			listenThread = null;
+			moribund.interrupt();
+		}
+	}
+
+	public synchronized void addTCPListener(ITCPaudioLis l) {
+		listeners.add(l);
+	}
+
+	public synchronized void removeTCPListener(ITCPaudioLis l) {
+		listeners.remove(l);
+	}
+
+	private synchronized void fireDataArrived(byte[] data, int len) {
+		TCPaudioEvent event = new TCPaudioEvent(this, data, len);
+		for (ITCPaudioLis listener : listeners) {
+			listener.dataRecv(event);
+		}
+	}
+
+	public String getServerHostname() {
+		return serverHostname;
+	}
+
+	public void setServerHostname(String serverHostname) {
+		this.serverHostname = serverHostname;
+	}
+
+	public Boolean getConnOK() {
+		return connOK;
+	}
+
+	public void setConnOK(Boolean connOK) {
+		this.connOK = connOK;
+	}
+}

safeDispatch/src/main/java/com/safemobile/lib/sound/UDPclient.java

@@ -15,7 +15,7 @@ import com.safemobile.lib.SM;
 public class UDPclient implements Runnable{
 	
 	public String serverHostname = new String ("10.120.1.114");//
-	private int UDP_SERVER_PORT_IN = 50002;
+	private int UDP_SERVER_PORT_IN = 50003;
 	private int UDP_SERVER_PORT_OUT = 50001;
 	private DatagramSocket ds = null;
 	private Thread listenThread;

safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java

@@ -42,7 +42,6 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
     public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
         isLiveTab = false;
         this.context = context;
-//        this.superVehHash = vehicles;
         mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
     }
 
@@ -73,7 +72,7 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
             }
         } else {
             try {
-                position = Integer.getInteger(marker.getTitle());
+                position = Integer.parseInt(marker.getTitle());
             } catch (Exception e) {
                 Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
             }
@@ -94,14 +93,14 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         String speed, address, gpsLocation, name = "";
         if (isLiveTab) {
             SuperVehicle vehicle = superVehHash.get(key);
-            positionTime = new Date(vehicle.timeGMT);
+            positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
             address = vehicle.Address != null ? vehicle.Address : "";
             name = vehicle.name;
             speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
             gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
         } else {
             HistPos histPos = histPosList.get(position);
-            positionTime = new Date(histPos.timeGMT);
+            positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
             address = histPos.Address != null ? histPos.Address : "";
             speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
             gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";

safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java

@@ -3,6 +3,7 @@ package com.safemobile.safedispatch;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.graphics.Color;
@@ -10,9 +11,11 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -51,6 +54,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
     private final ArrayList<Vehicle> allVehicle = new ArrayList<>();
     private final ArrayList<String> allVehicleNames = new ArrayList<>();
     private final SimpleDateFormat sdf = new SimpleDateFormat("MMMM dd yyyy");
+    private boolean showVehicles = true;
 
 
     @Override
@@ -99,6 +103,32 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
             }
         });
 
+        ImageView mapType = findViewById(R.id.changeMapTypeHeader);
+        mapType.setOnClickListener(view -> {
+            if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
+                mapType.setImageResource(R.drawable.map);
+                googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+            } else {
+                mapType.setImageResource(R.drawable.satellite);
+                googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+            }
+        });
+
+        LinearLayout slideLayout = findViewById(R.id.slidelayout);
+        LinearLayout linearLayoutVehicles = findViewById(R.id.layoutBig);
+        ImageView slideLayoutImageView = findViewById(R.id.slideLayoutImage);
+        slideLayout.setOnClickListener(v -> {
+            if (showVehicles) {
+                linearLayoutVehicles.setVisibility(View.GONE);
+                slideLayoutImageView.setImageResource(R.drawable.arrow_right);
+                showVehicles = false;
+            } else {
+                linearLayoutVehicles.setVisibility(View.VISIBLE);
+                slideLayoutImageView.setImageResource(R.drawable.arrow_left);
+                showVehicles = true;
+            }
+        });
+
         setDate();
     }
 
@@ -124,6 +154,18 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
     }
 
+    @Override
+    public void onBackPressed() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(getString(R.string.exit))
+                .setCancelable(false)
+                .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
+                .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
+                .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+        AlertDialog alert = builder.create();
+        alert.show();
+    }
+
     private void setDate() {
         Calendar calendar = Calendar.getInstance();
         endDate = calendar.getTime();
@@ -234,6 +276,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 
         infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this);
         this.googleMap.setInfoWindowAdapter(infoBubble);
+        this.googleMap.getUiSettings().setMapToolbarEnabled(false);
 
         parentTab.demoPositionsList();
         displayButton.performClick();

safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java

@@ -32,6 +32,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
+import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
@@ -88,7 +89,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
     private boolean isAck = false;
     private boolean showVehicle = true;
     private int contextMenuPosition;
-    private int vehStatus;
+    private int vehStatus, lastItemClicked;
     private int position; // vehStatus = vehicle status received from apps
 
     /* Live Vehicle GridView */
@@ -145,11 +146,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // image View for changing map type satellite or map
         ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
         changeMapTypeImageView.setOnClickListener(v -> {
-            if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
+            if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
-                changeMapTypeImageView.setImageResource(R.drawable.satellite);
+                changeMapTypeImageView.setImageResource(R.drawable.map);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
             } else {
-                changeMapTypeImageView.setImageResource(R.drawable.map);
+                changeMapTypeImageView.setImageResource(R.drawable.satellite);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
             }
         });
@@ -254,7 +255,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             }
 
             // refresh UI
-            displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+            displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
         });
 
         displayButton = findViewById(R.id.buttonDisplay);
@@ -285,11 +286,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             }
 
             // refresh UI
-            displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+            displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
         });
 
         // display Vehicles
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
 
         // register to receive broadcasts
         registerBroadcastIntents();
@@ -309,6 +310,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         this.googleMap = googleMap;
         GoogleMapsInfoBubble infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this, getParentTab().getSuperVehHash());
         this.googleMap.setInfoWindowAdapter(infoBubble);
+        this.googleMap.getUiSettings().setMapToolbarEnabled(false);
     }
 
 
@@ -371,7 +373,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
 
         // clear previous vehicles
         SM.Debug("onResume");
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
     }
 
     final Runnable cancelLoadingDialogRUN = LiveActivity.this::cancelLoadingDialog;
@@ -440,7 +442,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         });
     }
 
-    public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) {
+    public void displayVehicle(double latZoom, double lngZoom) {
         if (googleMap != null) {
             String openWindow = "";
             for (Marker marker : markers) {
@@ -462,18 +464,17 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                         markerOptions.icon(markerIcon);
 
                         Marker marker = this.googleMap.addMarker(markerOptions);
-                        if (openWindow.equals(marker.getTitle()))
+                        if (openWindow.equals(marker.getTitle()) || i == lastItemClicked) {
                             marker.showInfoWindow();
+                            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
+                        }
 
                         markers.add(marker);
                     }
                 }
             }
         }
-    }
+        lastItemClicked = 0;
-
-    public void showOpenedBalloon(boolean demo) {
-        //TODO: add show balloon
     }
 
     private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
@@ -650,7 +651,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
     }
 
     // Create runnable for posting
-    final Runnable updateMapResults = () -> displayVehicle(false, LAT_OUTLIMIT, LNG_OUTLIMIT);
+    final Runnable updateMapResults = () -> displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
 
     // Create runnable for posting
     final Runnable updatePollResults = () -> {
@@ -660,7 +661,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             adapter.changeDisplayed(position, true);
         }
 
-        displayVehicle(true, latPoll, lngPoll); };
+        displayVehicle(latPoll, lngPoll); };
 
     // Create runnable for posting
     final Runnable updateOptionsRUN = this::updateOptionsUI;
@@ -678,8 +679,9 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
      * @param view     View in which will do the modifications
      */
     private void itemClick(int position, View view) {
+        lastItemClicked = position;
         // change displayed state
-        displayedVehicles.set(position, !Boolean.TRUE.equals(displayedVehicles.get(position)));
+        displayedVehicles.set(position, !displayedVehicles.get(position));
 
         // change in the adapter
         adapter.changeDisplayed(position, displayedVehicles.get(position));
@@ -687,30 +689,30 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // change check image for selected value
         VehiclesGridViewAdapter.ViewHolder viewLive = (VehiclesGridViewAdapter.ViewHolder) view.getTag();
 
-        if (Boolean.TRUE.equals(displayedVehicles.get(position)))
+        if (displayedVehicles.get(position))
             viewLive.imgViewChecked.setImageResource(R.drawable.checked);
         else
             viewLive.imgViewChecked.setImageResource(R.drawable.unchecked);
 
         // check if all values are identical
-        boolean identical = true;
+        boolean allDisplayed = true;
-        for (Boolean displ : displayedVehicles)
+        for (Boolean displayed : displayedVehicles)
-            if (!Objects.equals(displ, displayedVehicles.get(0))) {
+            if (!displayed) {
-                identical = false;
+                allDisplayed = false;
                 break;
             }
 
         // change image when all values are identical
-        if (identical && Boolean.TRUE.equals(displayedVehicles.get(0))) {
+        if (allDisplayed) {
             imageViewCheckAll.setSelected(true);
             imageViewCheckAll.setBackgroundResource(R.drawable.check_all);
-        } else if (identical && Boolean.TRUE.equals(!displayedVehicles.get(0))) {
+        } else {
             imageViewCheckAll.setSelected(false);
             imageViewCheckAll.setBackgroundResource(R.drawable.uncheck_all);
         }
 
         // display vehicle
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
     }
 
     /**

safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java

@@ -124,16 +124,6 @@ public class MessagesActivity extends Activity {
 		textViewSelectedContact = findViewById(R.id.textViewSelectedContact);
 		imageViewSelectedContact = findViewById(R.id.imageViewSelectedContact);
 
-		ImageView imageBarcode = findViewById(R.id.imageBarcode);
-		imageBarcode.setOnClickListener(v -> {
-			try {
-				Intent intent = new Intent("com.google.zxing.client.android.SCAN");
-				startActivityForResult(intent, 0);
-			} catch (Exception e) {
-				showErrorDialog(getResources().getString(R.string.barcodeError));
-			}
-		});
-
 		// change tab header fontFace
 		TextView textView1 = findViewById(R.id.textView1);
 		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));

safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java

@@ -16,17 +16,22 @@ public class NotificationActivity extends Activity{
 	public void onCreate(Bundle savedInstanceState) {
 		 super.onCreate(savedInstanceState);
 		 
-		 // get notification type
+		// get notification type
-		 int key = getIntent().getExtras().getInt("key");
+		int key = getIntent().getExtras().getInt("key");
 
 		 // broadcast intent
-		 Intent i = new Intent();
+		Intent i = new Intent();
-		 switch(key)
+		switch(key) {
-		 {
+			case AppParams.messageNotif:
-		 		case AppParams.messageNotif: i.setAction(NOTIFICATION_MESSAGE_INTENT); break;
+				i.setAction(NOTIFICATION_MESSAGE_INTENT);
-		 		case AppParams.alertNotif: i.setAction(NOTIFICATION_ALERT_INTENT); break;
+				break;
-		 		case AppParams.pollNotif: i.setAction(NOTIFICATION_POLL_INTENT); break;
+			case AppParams.alertNotif:
-		 }
+				i.setAction(NOTIFICATION_ALERT_INTENT);
+				break;
+			case AppParams.pollNotif:
+				i.setAction(NOTIFICATION_POLL_INTENT);
+				break;
+		}
 		 
 		 getBaseContext().sendBroadcast(i);
 		 
@@ -35,6 +40,4 @@ public class NotificationActivity extends Activity{
 		 /* Finish activity and return to parent activity */
 		 finish();
 	}
-
 }
-

safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java

@@ -2,10 +2,8 @@ package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.AssetFileDescriptor;
@@ -14,13 +12,12 @@ import android.graphics.Typeface;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.GridView;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -36,251 +33,217 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Locale;
 
-/**
- * fix import
- */
-
 public class RecordingsActivity extends Activity {
 	private Context context;
 	private Activity activity;
-	public TabLayoutActivity parentTab;
+	private TabLayoutActivity parentTab;
-	public ArrayList<Recording> allRecordings = new ArrayList<Recording>();
+	private ArrayList<Recording> allRecordings = new ArrayList<>();
-	private ArrayList<Boolean> playingPositions = new ArrayList<Boolean>();
+	private ArrayList<Boolean> playingPositions = new ArrayList<>();
-	private ArrayList<String> allGWsIP = new ArrayList<String>();
 	private GridView gridView;
 	private RecordingsGridViewAdapter adapter;
-	public View convertViewRecording;
+	private View convertViewRecording;
+	private boolean isRecordingPlaying = false;
 
-	public int playingPosition = -1;
+	private int playingPosition = -1;
 
 	// Need handler for callbacks to the UI thread
-    private final Handler myHandler = new Handler();
+	private final Handler myHandler = new Handler(Looper.getMainLooper());
+	private final ArrayList<String> allGWsIP = new ArrayList<>();
 
-    //recoding TCP and audio
+	//recoding TCP and audio
-    private RecordingHandle recHandle = null;
+	private RecordingHandle recHandle = null;
 
-    /* Dialog */
+	/* Dialog */
-    private TextView textViewCount, textViewGateway;
+	private TextView textViewCount;
+	private TextView textViewGateway;
 
-    public Bundle savedInstanceState;
+	private Bundle savedInstanceState;
 
-	/** Called when the activity is first created. */
+	/**
-    public void onCreate(Bundle savedInstanceState) {
+	 * Called when the activity is first created.
-        super.onCreate(savedInstanceState);
+	 */
-        this.savedInstanceState = savedInstanceState;
+	@Override
-        // get parentTab
+	public void onCreate(Bundle savedInstanceState) {
-    	parentTab = (TabLayoutActivity)getParent();
+		super.onCreate(savedInstanceState);
+		this.setSavedInstanceState(savedInstanceState);
+		setParentTab((TabLayoutActivity) getParent());
 
-    	Locale locale = new Locale(AppParams.LANGUAGETMP);
+		Locale locale = new Locale(AppParams.LANGUAGETMP);
-        Locale.setDefault(locale);
+		Locale.setDefault(locale);
-        Configuration config = new Configuration();
+		Configuration config = new Configuration();
-        config.locale = locale;
+		config.locale = locale;
-        getBaseContext().getResources().updateConfiguration(config,
+		getBaseContext().getResources().updateConfiguration(config,	getBaseContext().getResources().getDisplayMetrics());
-        getBaseContext().getResources().getDisplayMetrics());
 
-        setContentView(R.layout.tabrecordings);
+		setContentView(R.layout.tabrecordings);
 
+		// get context
+		context = this;
+		activity = this;
 
-        // get context
+		// change tab header fontFace
-        context = this;
+		TextView textView1 = findViewById(R.id.textViewTitle);
-        activity = this;
+		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
+		textView1.setTextSize(24);
 
+		gridView = findViewById(R.id.gridViewRecordings);
+		adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
+		gridView.setAdapter(adapter);
 
-        // change tab header fontface
+		gridView.setOnItemClickListener(onItemClickListener);
-        TextView textView1 = (TextView) findViewById(R.id.textViewTitle);
+		gridView.setOnTouchListener((v, event) -> isRecordingPlaying);
-        textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
-        textView1.setTextSize(24);
 
-        gridView = (GridView) findViewById(R.id.gridViewRecordings);
+		if (recHandle == null && !AppParams.DEMO)
-        adapter = new RecordingsGridViewAdapter(activity, context, allRecordings, playingPositions);
+			recHandle = new RecordingHandle(AppParams.IP);
-        gridView.setAdapter(adapter);
 
-        gridView.setOnItemClickListener(onItemClickListener);
+		textViewCount = findViewById(R.id.textViewCount);
+		updateNumberOfRecordings();
 
-        if(recHandle == null && !AppParams.DEMO)
+		textViewGateway = findViewById(R.id.textViewGateway);
-        	recHandle = new RecordingHandle(AppParams.IP);
+		textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
-        
-        
-        textViewCount = (TextView) findViewById(R.id.textViewCount);
-        updateNumberOfRecordings();
-        
-        textViewGateway = (TextView) findViewById(R.id.textViewGateway);
-        textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
 		textViewGateway.setTextSize(24);
-		textViewGateway.setOnClickListener(new OnClickListener() {
+		textViewGateway.setOnClickListener(v -> {
-			@Override
+			allGWsIP.clear();
-			public void onClick(View v) {
+			for (RadioGW radio : AppParams.listRadios)
-				allGWsIP.clear();
+				allGWsIP.add(radio.IP);
-				for(RadioGW radio: AppParams.listRadios)
-					allGWsIP.add(radio.IP);
 
-				ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, R.layout.template_simple_list_item,
+			ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.template_simple_list_item,
-						allGWsIP);
+					allGWsIP);
 
-				AlertDialog.Builder builder = new AlertDialog.Builder(
+			AlertDialog.Builder builder = new AlertDialog.Builder(
-						context);
+					context);
-				builder.setTitle("Select RadioGW");
+			builder.setTitle("Select RadioGW");
-				builder.setAdapter(adapter,
+			builder.setAdapter(adapter,
-						new DialogInterface.OnClickListener() {
+					(dialog, which) -> {
-							@Override
+						// change gateway
-							public void onClick(DialogInterface dialog,	int which) {
+						textViewGateway.setText(allGWsIP.get(which));
-								// change gateway
+						Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
-								textViewGateway.setText(allGWsIP.get(which));
+						getRecordings(getParentTab().getAllRadios().get(which).GW_ID, getParentTab().getAllRadios().get(which).ID);
-								Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
+					});
-								GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID);
+			AlertDialog alert = builder.create();
-							}
+			alert.show();
-						});
-				AlertDialog alert = builder.create();
-				alert.show();
-			}
 		});
 		textViewGateway.setVisibility(View.INVISIBLE);
 
+		getParentTab().setRecordingsActivity(this);
 
-        parentTab.setRecordingsActivity(this);
+		// register to receive broadcasts
+		registerBroadcastIntents();
+	}
 
-        // register to receive broadcasts
+	@Override
-        registerBroadcastIntents();
+	public void onBackPressed() {
-    }
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setMessage(getString(R.string.exit))
+				.setCancelable(false)
+				.setNeutralButton(getString(R.string.logout), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.logout))
+				.setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit))
+				.setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+		AlertDialog alert = builder.create();
+		alert.show();
+	}
 
-    @Override
+	/**
-    public void onBackPressed()
+	 * Update the number of recordings displayed on the top layout
-    {
+	 */
-    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
+	private void updateNumberOfRecordings() {
-    	builder.setMessage(getString(R.string.exit))
+		textViewCount.setText("[" + AppParams.recordings.size() + "]");
-    	       .setCancelable(false)
+	}
-    	       .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.logout);
-    	           }
-    	       })
-    	       .setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.exit);
-    	           }
-    	       })
-    	       .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	                dialog.cancel();
-    	           }
-    	       });
-    	AlertDialog alert = builder.create();
-    	alert.show();
-    }
 
+	@Override
+	public void onPause() {
+		super.onPause();
+		SM.Debug("onPause");
+	}
 
-    /** Update the number of recordings displayed on the top layout */
+	@Override
-  	private void updateNumberOfRecordings() {
+	public void onResume() {
-  		textViewCount.setText("[" + AppParams.recordings.size() + "]");
+		super.onResume();
-  	}
+		if (getParentTab().getTCPState() != null && !AppParams.DEMO) {
 
+			Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
 
+			if (getParentTab().getCrtRadio() != null)
+				textViewGateway.setText(getParentTab().getCrtRadio().IP);
 
-	public void showDialog(String errorMsg)
+			if (getPlayingPosition() < 0 && getParentTab().getCrtRadio() != null) {
-	{
+				SM.Debug("getRecordings resume + crtRadio:" + getParentTab().getCrtRadio().toString());
-		Dialog dialog = new Dialog(context);
+				getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().getCrtRadio().ID);
-		dialog.setContentView(R.layout.dialog);
+			}
-		dialog.setTitle("Message");
+		}
-		dialog.setCancelable(true);
+		SM.Debug("onResume");
-		dialog.setCanceledOnTouchOutside(true);
-
-		TextView text = dialog.findViewById(R.id.text);
-		ImageView image = dialog.findViewById(R.id.image);
-		
-		image.setImageResource(R.mipmap.ic_launcher);
-		text.setText(errorMsg);
-		dialog.show();
 	}
 
 
-	 @Override
-    public void onPause()
-    {
-    	super.onPause();
-    	SM.Debug("onPause");
-    }
 
-    @Override
+	private final OnItemClickListener onItemClickListener = new OnItemClickListener() {
-    public void onResume()
-    {
-    	super.onResume();
-    	if(parentTab.getTCPState() != null && !AppParams.DEMO){
-    		
-    		Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
-    		
-    		if(parentTab.getCrtRadio() != null)
-    			textViewGateway.setText(parentTab.getCrtRadio().IP);
-    		
-    		/*
-    		if(parentTab.allRadios == null)
-    			GetGWRadios();
-    		 */
-    		if(playingPosition < 0 && parentTab.getCrtRadio() != null)
-    		{
-    			SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
-    			GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
-    		}
-    		
-    	}
-    	SM.Debug("onResume");
-    }
-    
-    private OnItemClickListener onItemClickListener = new OnItemClickListener() {
 		@Override
 		public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
 
 			// disable grid scrolling and item click
-			gridView.setEnabled(false);
+			if (isRecordingPlaying)
-			convertViewRecording = view;
+				return;
+
+			isRecordingPlaying = true;
+			setConvertViewRecording(view);
 
 			// change background to playing
 			adapter.changePlaying(position, true);
 
 			// if no recording is playing and not DEMO
-			if(playingPosition<0 && !AppParams.DEMO)
+			if (getPlayingPosition() < 0 && !AppParams.DEMO) {
-			{
 				// send recording request to App Server
-				SendPlayRequest(allRecordings.get(position).ID);
+				sendPlayRequest(getAllRecordings().get(position).id);
 				// flag that sound is needed
-				recHandle.StartSound();
+				recHandle.startSound();
-				recHandle.soundNeeded = true;
+				recHandle.setSoundNeeded(true);
 			}
 			// no recording is playing and DEMO
-			else if(playingPosition<0 && AppParams.DEMO)
+			else if (getPlayingPosition() < 0 && AppParams.DEMO) {
-			{	
 				// create player which will play demo recordings
 				MediaPlayer player = new MediaPlayer();
 
-				AssetFileDescriptor afd;
+				AssetFileDescriptor assetFileDescriptor = null;
 				try {
-					switch(position)
+					switch (position) {
-					{
+						case 1:
-						case 1: afd = getAssets().openFd("startwindows.mp3"); break;
+							assetFileDescriptor = getAssets().openFd("startwindows.mp3");
-						case 2: afd = getAssets().openFd("exitwindows.mp3"); break;
+							break;
-						default : afd = getAssets().openFd("mike.mp3"); break;
+						case 2:
-					};
+							assetFileDescriptor = getAssets().openFd("exitwindows.mp3");
-					player.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength());
+							break;
+						default:
+							assetFileDescriptor = getAssets().openFd("mike.mp3");
+							break;
+					}
+					player.setDataSource(assetFileDescriptor.getFileDescriptor(), assetFileDescriptor.getStartOffset(), assetFileDescriptor.getLength());
 					player.prepare();
-				    player.start();
+					player.start();
 
-				} catch (IOException e) { }
+				} catch (IOException e) {
+					e.printStackTrace();
+				} finally {
+					if(assetFileDescriptor != null) {
+						try {
+							assetFileDescriptor.close();
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+					}
+				}
 			}
 
 			// save playing position
-			playingPosition = position;
+			setPlayingPosition(position);
 
 			// start the timer which will reset the UI to 'no recording playing'
-			startRecordingStoperTimer(allRecordings.get(playingPosition).endGMT - allRecordings.get(playingPosition).startGMT);
+			startRecordingStopperTimer(getAllRecordings().get(getPlayingPosition()).endGMT - getAllRecordings().get(getPlayingPosition()).startGMT);
 		}
-    };
 
-    
+		/**
-    /** create Timer which will stop the recording after a specific time */
+		 * create Timer which will stop the recording after a specific time
-    private void startRecordingStoperTimer(final int seconds) {
+		 */
-    	new Thread(new Runnable() {
+		private void startRecordingStopperTimer(final int seconds) {
-			
+			new Thread(() -> {
-			@Override
-			public void run() {
 				// sleep for at least 1 second
 				final int ms = (seconds > 1 ? seconds * 1000 : 1000);
 
@@ -289,123 +252,137 @@ public class RecordingsActivity extends Activity {
 					Thread.sleep(ms);
 				} catch (InterruptedException e) {
 					e.printStackTrace();
+					Thread.currentThread().interrupt();
 				}
 
 				// modify the UI after the recording is done playing
 				myHandler.post(stopRecordingRUN);
-			}
+			}).start();
-		}).start();
+		}
-    }
+	};
 
-    // Create runnable for posting
+	// Create runnable for posting
-    final Runnable stopRecordingRUN = new Runnable() {
+	final Runnable stopRecordingRUN = this::updateStopRecording;
-        @Override
-		public void run() {
-            updateStopRecording();
-        }
-    };
 
-    private void updateStopRecording()
+	private void updateStopRecording() {
-    {
+		// change playing icon
-    	// change playing icon
+		adapter.changePlaying(getPlayingPosition(), false);
-    	adapter.changePlaying(playingPosition, false);
 
-    	// enable grid 
+		// enable grid
-    	gridView.setEnabled(true);
+		isRecordingPlaying = false;
 
-    	// set playing Recording position to -1
+		// set playing Recording position to -1
-    	playingPosition = -1;
+		setPlayingPosition(-1);
+	}
 
-    }
+	// Update Recordings received from AppServer
+	public void updateRecordings(ArrayList<Recording> list) {
+		setAllRecordings(new ArrayList<>());
+		for (Recording rec : list) {
+			getAllRecordings().add(rec);
+		}
+		myHandler.post(updateResultsRUN);
+	}
 
-    // Update Recordings received from AppServer 
+	// playRecording received from AppServer
-    public void UpdateRecordings(ArrayList<Recording> list)
+	public void playRecording(long id) {
-    {
+		// change adapter image
-    	//SM.Debug("## UpdateRecordings: " + list.size());
+	}
-    	allRecordings = new ArrayList<Recording>();
-    	for(Recording rec : list)
-    	{
-    		if(rec.typeID == 1 && rec.subID == AppParams.USERID)
-    			allRecordings.add(rec);
-    		else if (rec.typeID != 1)
-    			allRecordings.add(rec);
-    	}
-		myHandler.post(UpdateResultsRUN);
 
-    }
+	// Create runnable for posting
+	final Runnable updateResultsRUN = this::updateResultsInUi;
 
-    // PlayRecording received from AppServer
+	private void updateResultsInUi() {
-    public void PlayRecording(long id)
-    {
-    	// change adapter image
-    	
-    }
-    
-    // Create runnable for posting
-    final Runnable UpdateResultsRUN = new Runnable() {
-        public void run() {
-            updateResultsInUi();
-        }
-    };
-
-	private void updateResultsInUi()
-	{
 		// clear played items
-		playingPositions = new ArrayList<Boolean>();
+		playingPositions = new ArrayList<>();
-		for(int i=0; i<allRecordings.size(); i++)
+		for (int i = 0; i < getAllRecordings().size(); i++)
 			playingPositions.add(true);
 		// set adapter - where playingPositions stores exists values
-		adapter = new RecordingsGridViewAdapter(activity, context, allRecordings, playingPositions);
+		adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
 
 		// playing positions need to be false because no recording is played
 		playingPositions.clear();
-		for(int i=0; i<allRecordings.size(); i++)
+		for (int i = 0; i < getAllRecordings().size(); i++)
 			playingPositions.add(false);
 
 		updateNumberOfRecordings();
 
-        gridView.setAdapter(adapter);
+		gridView.setAdapter(adapter);
 	}
 
-    // send 
+	// send
-    private void GetRecordings(int radioGWID, int radioID)
+	private void getRecordings(int radioGWID, int radioID) {
-	{
+		getParentTab().getRecordings(radioGWID, radioID);
-    	parentTab.getRecordings(radioGWID, radioID);
 	}
 
-    public void SendPlayRequest(long record_id)
+	public void sendPlayRequest(long recordId) {
-    {
+		getParentTab().sendPlayRecordingRequest(recordId);
-    	parentTab.sendPlayRecordingRequest(record_id);
+	}
-    }
 
-    
+	/**
-    /** Register for broadcasts */
+	 * Register for broadcasts
-    private void registerBroadcastIntents() {
+	 */
-    	IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP+"");
+	private void registerBroadcastIntents() {
+		IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP + "");
 		this.registerReceiver(mReceiver, intentFilter);
 
-		intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED+"");
+		intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED + "");
 		this.registerReceiver(mReceiver, intentFilter);
+	}
 
-    }
+	//The BroadcastReceiver that listens for Notification broadcasts
+	public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			final String action = intent.getAction();
+			// zone and/or channel changed
+			if (action.equals(OperationCodes.RECORDINGS_LIST_REP + "")) {
+				updateRecordings(AppParams.recordings);
+				updateNumberOfRecordings();
+			} else if (action.equals(OperationCodes.RADIOID_CHANGED + "")) {
+				textViewGateway.setText(getParentTab().getCrtRadio().IP);
+				getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().getCrtRadio().ID);
+			}
+		}
+	};
 
-    //The BroadcastReceiver that listens for Notification broadcasts
+	public TabLayoutActivity getParentTab() {
-    public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+		return parentTab;
-        @Override
+	}
-        public void onReceive(Context context, Intent intent) {
-        	//SM.Debug("### NOTIFICATION ###", "Radio: " + intent.getAction());
 
-        	final String action = intent.getAction();
+	public void setParentTab(TabLayoutActivity parentTab) {
-        	// zone and/or channel changed
+		this.parentTab = parentTab;
-        	if (action.equals(OperationCodes.RECORDINGS_LIST_REP+"")) { 
+	}
-        		UpdateRecordings(AppParams.recordings);	
+
-        		updateNumberOfRecordings();
+	public ArrayList<Recording> getAllRecordings() {
-        	}
+		return allRecordings;
-        	else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) { 
+	}
-        		textViewGateway.setText(parentTab.getCrtRadio().IP);
+
-        		GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
+	public void setAllRecordings(ArrayList<Recording> allRecordings) {
-        	}
+		this.allRecordings = allRecordings;
-        }
+	}
-    };
+
+	public View getConvertViewRecording() {
+		return convertViewRecording;
+	}
+
+	public void setConvertViewRecording(View convertViewRecording) {
+		this.convertViewRecording = convertViewRecording;
+	}
+
+	public int getPlayingPosition() {
+		return playingPosition;
+	}
+
+	public void setPlayingPosition(int playingPosition) {
+		this.playingPosition = playingPosition;
+	}
+
+	public Bundle getSavedInstanceState() {
+		return savedInstanceState;
+	}
+
+	public void setSavedInstanceState(Bundle savedInstanceState) {
+		this.savedInstanceState = savedInstanceState;
+	}
 }
-

safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java

@@ -10,13 +10,19 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.text.Editable;
 import android.text.InputType;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -114,6 +120,17 @@ public class SDMobileActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		SM.Debug("##### onCREATE ##### with LANGUAGE " + AppParams.LANGUAGETMP);
 
+		ConnectivityManager connectivityManager =
+				(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+			connectivityManager.registerDefaultNetworkCallback(networkCallback);
+		} else {
+			NetworkRequest request = new NetworkRequest.Builder()
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
+			connectivityManager.registerNetworkCallback(request, networkCallback);
+		}
+
 		AppParams.theme = AppParams.Theme.SAFEDISPATCH;
 		if (AppParams.theme == AppParams.Theme.SAFENET)
 			this.setTheme(R.style.Theme_Safenet);
@@ -524,6 +541,22 @@ public class SDMobileActivity extends Activity {
 		SM.Debug("##### onRESUME #####");
 	}
 
+	private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
+		@Override
+		public void onAvailable(Network network) {
+			// network available
+			Log.v("NetworkAvailability", "available");
+			if (tcp != null && !tcp.isConnectionUP)
+				saveIPandRestartTCP(AppParams.IP, AppParams.PORT);
+		}
+
+		@Override
+		public void onLost(Network network) {
+			// network unavailable
+			Log.v("NetworkAvailability", "unavailable");
+		}
+	};
+
 
 	private void startTabActivity(long userID) {
 		// good login - load activity

safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java

@@ -14,13 +14,11 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.TaskCompletionSource;
 import com.safemobile.activities.AbstractEmptyActivity;
 import com.safemobile.activities.AbstractLiveActivity;
 import com.safemobile.activities.AbstractMessagesActivity;
 import com.safemobile.activities.AbstractRadioActivity;
 import com.safemobile.activities.AbstractSDParentActivity;
-import com.safemobile.safedispatch.R;
 import com.safemobile.enums.AuthorizationCode;
 import com.safemobile.enums.AuthorizationStatus;
 import com.safemobile.enums.ProviderSettingsStatus;
@@ -49,6 +47,7 @@ import com.safemobile.lib.SMSmsg;
 import com.safemobile.lib.SerializedObject;
 import com.safemobile.lib.SuperVehicle;
 import com.safemobile.lib.TCPmsg;
+import com.safemobile.lib.User;
 import com.safemobile.lib.VehMSG;
 import com.safemobile.lib.Vehicle;
 import com.safemobile.lib.radio.RadioGW;
@@ -58,8 +57,9 @@ import com.safemobile.services.TCPService.TCPBinder;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
-import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -74,6 +74,7 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -94,6 +95,8 @@ import android.widget.Toast;
 import android.widget.TabHost.TabSpec;
 
 import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 public class TabLayoutActivity extends AbstractSDParentActivity {
 
@@ -404,7 +407,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			}
 		}
 
-		SM.Debug("Logged user:" + AppParams.USERNAME + " | ID: " + AppParams.USERID);
+		SM.Debug("Logged user:" + AppParams.USERNAME + " | id: " + AppParams.USERID);
 		// do not dim the display
 		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
@@ -632,10 +635,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 				tabHost.setCurrentTabByTag(RECORDINGS);
 				AppParams.crtTab = AppParams.Tabs.recordings;
 
-				if (AppParams.DEMO && getRecordingsActivity() != null && getRecordingsActivity().allRecordings != null && getRecordingsActivity().allRecordings.isEmpty()) {
+				if (AppParams.DEMO && getRecordingsActivity() != null && getRecordingsActivity().getAllRecordings() != null && getRecordingsActivity().getAllRecordings().isEmpty()) {
 					ArrayList<Recording> listRecordings = new ArrayList<>();
 					Recording rec = new Recording();
-					rec.NameForDisplay = "Rob";
+					rec.userWhoWasCalled = "Rob";
 					rec.subID = 101;
 					rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
 					rec.startGMT = rec.endGMT - 2;
@@ -643,7 +646,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 					listRecordings.add(rec);
 
 					rec = new Recording();
-					rec.NameForDisplay = "Call1 [Rob]";
+					rec.userWhoWasCalled = "Call1 [Rob]";
 					rec.subID = 102;
 					rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
 					rec.startGMT = rec.endGMT - 2;
@@ -651,13 +654,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 					listRecordings.add(rec);
 
 					rec = new Recording();
-					rec.NameForDisplay = "Call2 [Rob]";
+					rec.userWhoWasCalled = "Call2 [Rob]";
 					rec.subID = 101;
 					rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
 					rec.startGMT = rec.endGMT - 3;
 					listRecordings.add(rec);
 					rec.type = 103;
-					getRecordingsActivity().UpdateRecordings(listRecordings);
+					getRecordingsActivity().updateRecordings(listRecordings);
 				}
 			}
 		});
@@ -1006,8 +1009,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			moribund.interrupt();
 		}
 
-		this.unregisterReceiver(mReceiver);
-
 		// unbound from tcp service
 		if (isBound) {
 			getApplicationContext().unbindService(serviceConnection);
@@ -1047,7 +1048,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 		if (getMessageActivity() != null)
 			getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
 		if (getRecordingsActivity() != null)
-			getRecordingsActivity().onCreate(getRecordingsActivity().savedInstanceState);
+			getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
 		if (getAlarmActivity() != null)
 			getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
 	}
@@ -1233,7 +1234,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 						getMessageActivity().updateSMS(sms.smsList);
 					}
 				} catch (Exception ex) {
-					SM.Debug("Error on smsReceived:" + ex.toString());
+					SM.Debug("Error on smsReceived:" + ex);
 				}
 			}
 
@@ -1361,7 +1362,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 				SM.Debug("Got PlayRec :" + msg.allData);
 
 				if (NO_SOUND) {
-					SM.Debug("Recording Play file ID:" + msg.data);
+					SM.Debug("Recording Play file id:" + msg.data);
 
 					//list for SMS
 					if (AppParams.crtTab == AppParams.Tabs.recordings) {
@@ -1370,7 +1371,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 						try {
 							long id = Long.parseLong(tmp);
 							if (getRecordingsActivity() != null)
-								getRecordingsActivity().PlayRecording(id);
+								getRecordingsActivity().playRecording(id);
 						} catch (Exception ex) {
 							SM.Exception(ex.toString());
 						}
@@ -1398,7 +1399,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 				HistCountmsg histCountMsg = new HistCountmsg(msg);
 				SM.Debug("Message Count:" + histCountMsg.histcountValue.count);
-				if (histCountMsg.histcountValue.count >= 2000 && AppParams.crtTab == AppParams.Tabs.history) {
+				if (AppParams.crtTab != AppParams.Tabs.history) {
 					//list for live
 					SM.Debug("currentActivity instanceof HistoryActivity");
 					try {
@@ -1409,6 +1410,44 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 					} catch (Exception ex) {
 						SM.Debug(HASH_ERROR_MESSAGE + ex);
 					}
+					return;
+				}
+
+				if (histCountMsg.histcountValue.count >= 2000) {
+					try {
+						if (getHistoryActivity() != null) {
+							getHistoryActivity().UpdateCancel();
+							getHistoryActivity().UpdateUnableDisp();
+						}
+					} catch (Exception ex) {
+						SM.Debug(HASH_ERROR_MESSAGE + ex);
+					}
+					runOnUiThread(new Runnable() {
+						public void run() {
+							DialogService dialogService = new DialogService();
+							dialogService.showError(getHistoryActivity(), getString(R.string.too_many_positions, String.valueOf(histCountMsg.histcountValue.count)));
+						}
+					});
+					return;
+				}
+
+				if (histCountMsg.histcountValue.count == 0) {
+					try {
+						if (getHistoryActivity() != null) {
+							getHistoryActivity().UpdateCancel();
+							getHistoryActivity().UpdateUnableDisp();
+						}
+					} catch (Exception ex) {
+						SM.Debug(HASH_ERROR_MESSAGE + ex);
+					}
+
+					runOnUiThread(new Runnable() {
+						public void run() {
+							DialogService dialogService = new DialogService();
+							dialogService.showError(getHistoryActivity(), getString(R.string.no_data_for_interval));
+						}
+					});
+					return;
 				}
 			}
 
@@ -1426,7 +1465,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 						SM.Debug("tmpHist seqID:" + tmpHist.seqID);
 						int pos = Integer.parseInt(tmpHist.seqID.substring(0, tmpHist.seqID.indexOf('.')));
-						int all = Integer.parseInt(tmpHist.seqID.substring(tmpHist.seqID.indexOf('.') + 1, tmpHist.seqID.length()));
+						int all = Integer.parseInt(tmpHist.seqID.substring(tmpHist.seqID.indexOf('.') + 1));
 						if (all != 0) {
 							if (Boolean.TRUE.equals(getFirstHistoryData())) {
 								try {
@@ -1578,7 +1617,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 								if (radioMSG.incCall.callStatus == 3) {
 									setInCall(false);
 									// update recordings list
-									if (AppParams.crtTab == AppParams.Tabs.recordings && getRecordingsActivity() != null && getRecordingsActivity().playingPosition < 0) {
+									if (AppParams.crtTab == AppParams.Tabs.recordings && getRecordingsActivity() != null && getRecordingsActivity().getPlayingPosition() < 0) {
 										// no recording is playing
 										getRecordings(getCrtRadio().GW_ID, getCrtRadio().ID);
 									}
@@ -1612,13 +1651,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 						setAllRadios(radioMSG.RadioGWList);
 						if (getCrtRadio() == null) {
 							setCrtRadio(getAllRadios().get(0));
-							SM.Debug("radioMSG set 0 crtRadio GW_ID:" + getCrtRadio().GW_ID + " ID:" + getCrtRadio().ID + ")");
+							SM.Debug("radioMSG set 0 crtRadio GW_ID:" + getCrtRadio().GW_ID + " id:" + getCrtRadio().ID + ")");
 
 							notifyBroadcast(OperationCodes.RADIOID_CHANGED + "");
 						}
 					}
 
-					// save crt Radio ID and GW
+					// save crt Radio id and GW
 					if (radioMSG.zac != null) {
 						for (RadioGW radio : getAllRadios()) {
 							if (radio.GW_ID == radioMSG.zac.gwID && radio.ID == radioMSG.zac.rgwID)
@@ -1649,66 +1688,61 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 				SM.Debug("Unit imei:" + tempArr[0]);
 				String unitIMEI = tempArr[0];
 
-				//list for SMS
+
-				if (AppParams.crtTab == AppParams.Tabs.alarms) {
+				// change Visual Elements
-					SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
+				setImei(unitIMEI);
-					getAlarms(AppParams.USERID);
+				switch (msg.opCode) {
+					case 135:
+						setMess("speed " + tempArr[1]);
+						break;
+					case 136:
+						setMess("landmark " + tempArr[1]);
+						break;
+					case 137:
+						setMess("zone " + tempArr[1]);
+						break;
+					case 140:
+						setMess("telemetry " + tempArr[1]);
+						break;
+					default:
+//							138
+						setMess("emergency");
 				}
-				// if tab is not TextTab
+				myHandler.post(updateResultsAlarm);
-				if (tabHost.getCurrentTab() != 5) {
-					// change Visual Elements
-					setImei(unitIMEI);
-					switch (msg.opCode) {
-						case 135:
-							setMess("speed " + tempArr[1]);
-							break;
-						case 136:
-							setMess("landmark " + tempArr[1]);
-							break;
-						case 137:
-							setMess("zone " + tempArr[1]);
-							break;
-						case 138:
-							setMess("emergency");
-							break;
-						case 140:
-							setMess("telemetry " + tempArr[1]);
-							break;
-						default:
-							setMess("emergency");
-					}
-					myHandler.post(updateResultsAlarm);
 
-					if ((msg.opCode == 138) && (AppParams.crtTab == AppParams.Tabs.live)) {
+				if ((msg.opCode == 138) && (AppParams.crtTab == AppParams.Tabs.live)) {
-						SuperVehicle superVehicle = getSuperVehHash().get(Long.parseLong(unitIMEI));
+					SuperVehicle superVehicle = getSuperVehHash().get(Long.parseLong(unitIMEI));
 
-						if (superVehicle != null) {
+					if (superVehicle != null) {
-							//if is not check i need to force check to put on the map
+						//if is not check i need to force check to put on the map
-							boolean forceChecked = false;
+						boolean forceChecked = false;
-							if (!superVehicle.needUpdate) {
+						if (!superVehicle.needUpdate) {
-								superVehicle.needUpdate = true;
+							superVehicle.needUpdate = true;
-								forceChecked = true;
+							forceChecked = true;
-							}
+						}
-							try {
+						try {
-								int x = 0;
+							int x = 0;
-								if (forceChecked) {
+							if (forceChecked) {
-									for (Vehicle veh : getAllVehicle()) {
+								for (Vehicle veh : getAllVehicle()) {
-										if (veh.imei.compareTo(unitIMEI) == 0) break;
+									if (veh.imei.compareTo(unitIMEI) == 0) break;
-										x++;
+									x++;
-									}
-								} else x = -1;
-								if (getLiveActivity() != null) {
-									if (x != getAllVehicle().size())
-										getLiveActivity().emergencyAlarmReceived(x, superVehicle.lat, superVehicle.lng);
-									else
-										getLiveActivity().emergencyAlarmReceived(-1, superVehicle.lat, superVehicle.lng);
 								}
-							} catch (Exception ex) {
+							} else x = -1;
-								SM.Debug(HASH_ERROR_MESSAGE + ex);
+							if (getLiveActivity() != null) {
+								if (x != getAllVehicle().size())
+									getLiveActivity().emergencyAlarmReceived(x, superVehicle.lat, superVehicle.lng);
+								else
+									getLiveActivity().emergencyAlarmReceived(-1, superVehicle.lat, superVehicle.lng);
 							}
+						} catch (Exception ex) {
+							SM.Debug(HASH_ERROR_MESSAGE + ex);
 						}
 					}
 				}
+
+				//list for SMS
+				if (AppParams.crtTab == AppParams.Tabs.alarms)
+					getAlarms(AppParams.USERID);
 			}
 
 			@Override
@@ -1719,19 +1753,76 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 				//list for SMS
 				if (AppParams.crtTab == AppParams.Tabs.recordings) {
-					for (Recording rec : recordMSG.recordList) {
+					for (Recording rec : recordMSG.getRecordList()) {
+						SuperVehicle superVehicle = getSuperVehHash().get((long) rec.subID);
 						// set the name to be displayed
-						if (rec.typeID == 1)
+						switch (rec.callType) {
-							rec.NameForDisplay = AppParams.USERNAME;
+							case 0:
-						else {
+								for (User u : AppParams.allUsers) {
-							SuperVehicle superVehicle = getSuperVehHash().get((long) rec.subID);
+									if (u.id == rec.dispatcherId)
-							if (superVehicle != null)
+										rec.userWhoCalled = u.login;
-								rec.NameForDisplay = superVehicle.name;
+								}
+								if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
+									rec.userWhoCalled = String.valueOf(rec.dispatcherId);
+
+								if (superVehicle != null)
+									rec.userWhoWasCalled = superVehicle.name;
+								else
+									rec.userWhoWasCalled = String.valueOf(rec.subID);
+								break;
+							case 4:
+								rec.userWhoWasCalled = AppParams.USERNAME;
+								if (superVehicle != null)
+									rec.userWhoCalled = superVehicle.name;
+								else
+									rec.userWhoCalled = String.valueOf(rec.subID);
+								break;
+							case 1:
+								for (User u : AppParams.allUsers) {
+									if (u.id == rec.dispatcherId)
+										rec.userWhoCalled = u.login;
+								}
+								if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
+									rec.userWhoCalled = String.valueOf(rec.dispatcherId);
+
+								if (rec.groupName == null || rec.groupName.isEmpty())
+									rec.userWhoWasCalled = String.valueOf(rec.groupCpsId);
+								else
+									rec.userWhoWasCalled = rec.groupName;
+								break;
+							case 5:
+								if (superVehicle != null)
+									rec.userWhoCalled = superVehicle.name;
+								else
+									rec.userWhoCalled = String.valueOf(rec.subID);
+
+								if (rec.groupName == null || rec.groupName.isEmpty())
+									rec.userWhoWasCalled = String.valueOf(rec.groupCpsId);
+								else
+									rec.userWhoWasCalled = rec.groupName;
+								break;
+							case 2:
+								for (User u : AppParams.allUsers) {
+									if (u.id == rec.dispatcherId)
+										rec.userWhoCalled = u.login;
+								}
+								if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
+									rec.userWhoCalled = String.valueOf(rec.dispatcherId);
+
+								rec.userWhoWasCalled = "All Call";
+								break;
+							case 6:
+								rec.userWhoWasCalled = "All Call";
+								if (superVehicle != null)
+									rec.userWhoCalled = superVehicle.name;
+								else
+									rec.userWhoCalled = String.valueOf(rec.subID);
+								break;
 						}
 					}
 
 					// save recordings to AppParams
-					AppParams.recordings = recordMSG.recordList;
+					AppParams.recordings = recordMSG.getRecordList();
 
 					// notify recordings were received
 					notifyBroadcast(OperationCodes.RECORDINGS_LIST_REP + "");
@@ -1896,10 +1987,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 	public void createNotification(int icon) {
 		mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		String tickerText = "SafeMobile Dispatch: New Message  from " + getImei();
+		String contentTitle, contentText;
-		String contentTitle = "New Message from " + getImei();
-		String contentText = "\"" + getMess() + "\"";
-
 		Vehicle veh = getVehicle4Imei(getImei());
 
 		int iconValue = icon;
@@ -1912,7 +2000,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			case AppParams.pollNotif:
 				contentText = "\"" + getMess() + "\"";
 				contentTitle = "Poll Reply from " + (veh != null ? getVehicle4Imei(getImei()).name : getImei());
-				tickerText = "SafeMobile Dispatch: Poll Reply from " + (veh != null ? getVehicle4Imei(getImei()).name : getImei());
 				icon = R.drawable.poll;
 				break;
 			case AppParams.alertNotif:
@@ -1921,34 +2008,52 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 					vehName = getString(R.string.from) + ": " + getVehicle4Imei(getImei()).name;
 				contentText = "\"" + getMess() + "\"";
 				contentTitle = getString(R.string.newAlarm) + vehName;
-				tickerText = "SafeMobile Dispatch: " + getString(R.string.newAlarm) + vehName;
+				icon = R.drawable.arrow_down;
-				icon = R.drawable.alert;
 				break;
 			default:
 				throw new IllegalStateException("Unexpected value: " + icon);
 		}
 
-		Notification notification = new Notification(icon, tickerText, System.currentTimeMillis());
-
 		// set intent to be opened on NotificationClick
 		/* Notification */
-		Intent notificationIntent = new Intent(this, NotificationActivity.class);
+		Intent intent = new Intent(this, NotificationActivity.class);
-		notificationIntent.putExtra("key", iconValue);
+		intent.putExtra("key", iconValue);
 
 		// cancel old notification
 		mNotificationManager.cancel(icon);
 
-		PendingIntent contentIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+		PendingIntent pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-
+		createNotificationChannel(icon, contentTitle, contentText, pendingIntent);
-		// flag that the notification will be closed when clicked
-		notification.flags |= Notification.FLAG_AUTO_CANCEL;
-		notification.number = 1;                                // the same notification will be shown;
-		notification.tickerText = tickerText;        // notification text when arrives
-		notification.sound = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.new_sms);
-		// add notification to the manager
-		mNotificationManager.notify(icon, notification);
 	}
 
+	private void createNotificationChannel(int icon, String title, String text, PendingIntent pendingIntent) {
+		// Create the NotificationChannel, but only on API 26+ because
+		// the NotificationChannel class is new and not in the support library
+		String notificationChannelID = String.valueOf(icon);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			CharSequence name = "Notification Channel";
+			int importance = NotificationManager.IMPORTANCE_HIGH;
+			NotificationChannel channel = new NotificationChannel(notificationChannelID, name, importance);
+			// Register the channel with the system; you can't change the importance
+			// or other notification behaviors after this
+			NotificationManager notificationManager = getSystemService(NotificationManager.class);
+			notificationManager.createNotificationChannel(channel);
+		}
+
+
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(context, notificationChannelID)
+				.setSmallIcon(icon)
+				.setContentTitle(title)
+				.setContentText(text)
+				.setPriority(NotificationCompat.PRIORITY_DEFAULT)
+				.setAutoCancel(true)
+				.setContentIntent(pendingIntent);
+
+		NotificationManagerCompat managerCompat = NotificationManagerCompat.from(context);
+		managerCompat.notify(icon, builder.build());
+	}
+
+
 	// return vehicle according to imei
 	private Vehicle getVehicle4Imei(String imei) {
 		Vehicle veh = null;
@@ -2092,7 +2197,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 						setVehicleStatus(Integer.parseInt(params[1]), Integer.parseInt(params[2]), Integer.parseInt(params[3]), Integer.parseInt(params[4]));
 					} catch (Exception ex) {
-						SM.Exception("Paramas -> setVehicleStatus", "EXCeption ex " + ex.toString());
+						SM.Exception("Paramas -> setVehicleStatus", "EXCeption ex " + ex);
 					}
 					break;
 
@@ -2123,21 +2228,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 		new ConnectTask().execute(params);
 	}
 
-	public class ConnectParserTask extends AsyncTask<String, Void, TCPhandler> {
-		@Override
-		protected TCPhandler doInBackground(String... params) {
-			if (myService != null)
-				tcpParser = myService.getTCPmsgParser();
-
-			// add TCPParserListener
-			if (tcpParser != null) {
-				SM.Debug("## tcpParser != null ", "#### call tcpParserListener(");
-				tcpParserListener();
-			}
-			return null;
-		}
-	}
-
 	/* Display Toast messages*/
 	@Override
 	public void displayToast(final String msg) {
@@ -2247,10 +2337,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
 		SM.Debug("onRequestPermissionsResult", "[requestCode] " + requestCode);
-		String permission = "";
 		switch (requestCode) {
 			case PermissionModule.RECORD_AUDIO_PERMISSION_REQUEST_CODE:
-				permission = Manifest.permission.RECORD_AUDIO;
 				break;
 			default:
 				throw new IllegalStateException("Unexpected value: " + requestCode);
@@ -2301,10 +2389,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 
 	private void waitForUserInput(Boolean result) {
 		if (result) {
-			final int requestCode = 1202;
 			//navigate to application's settings
 			String action = ProviderSettingsHelper.getAction(ProviderSettingsStatus.APPLICATION_DETAILS);
-			if (action == null || action == "")
+			if (action == null || action.equals(""))
 				return;
 
 			boolean isActionApplicationDetailsSettings = action.equals(ProviderSettingsHelper.ACTION_APPLICATION_DETAILS_SETTINGS);
@@ -2324,4 +2411,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			this.startActivity(intent);
 		}
 	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		this.unregisterReceiver(mReceiver);
+	}
 }

safeDispatch/src/main/res/layout-large/tabpanel.xml

@@ -89,6 +89,8 @@
 			</LinearLayout>
 	</LinearLayout>
 
+
+
 	<RelativeLayout
 	    android:id="@+id/layoutNewMessage"
 	    android:layout_width="350dp"

safeDispatch/src/main/res/layout-large/tabtext.xml

@@ -166,7 +166,7 @@
 		<GridView
 			android:id="@+id/gridView1"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
+			android:layout_height="match_parent"
 			android:background="#999999"
 			android:drawSelectorOnTop="false"
 			android:horizontalSpacing="0dp"
@@ -214,20 +214,6 @@
 				android:autofillHints="">
 			</EditText>
 		</LinearLayout>
-		<LinearLayout
-			android:layout_weight="0"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:paddingTop="4dp">
-			<ImageView
-				android:id="@+id/imageBarcode"
-				android:layout_width="wrap_content"
-				android:layout_height="35dp"
-				android:src="@drawable/barcode"
-				android:paddingTop="2dp"
-				android:layout_margin="3dp" />
-		</LinearLayout>
 		<Button
 			android:id="@+id/imageButtonSend"
 			android:layout_width="wrap_content"

safeDispatch/src/main/res/layout/tabtext.xml

@@ -164,7 +164,7 @@
 		<GridView
 			android:id="@+id/gridView1"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
+			android:layout_height="match_parent"
 			android:background="#999999"
 			android:drawSelectorOnTop="false"
 			android:horizontalSpacing="0dp"
@@ -213,19 +213,6 @@
 				android:autofillHints="">
 			</EditText>
 		</LinearLayout>
-		<LinearLayout
-			android:layout_weight="0"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:paddingTop="4dp">
-			<ImageView
-				android:id="@+id/imageBarcode"
-				android:layout_width="wrap_content"
-				android:layout_height="35dp"
-				android:src="@drawable/barcode"
-				android:layout_margin="3dp" />
-		</LinearLayout>
 		<Button
 			android:id="@+id/imageButtonSend"
 			android:layout_width="wrap_content"

safeDispatch/src/main/res/values/strings.xml

@@ -263,5 +263,7 @@
     <string name="permissionBlocked">%1$s permission was not accepted. To be able to use the %2$s, please open application settings and grant the %3$s permission</string>
     <string name="microphone">Microphone</string>
     <string name="radio_tab">Radio Tab</string>
+    <string name="too_many_positions">You have selected %1$s positions.\nPlease select a smalled interval.</string>
+    <string name="no_data_for_interval">No data for this interval</string>
 
 </resources>