Merge pull request 'convert to mph' (#34) from convert_to_mph into develop

Reviewed-on: #34
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>

.gitignore

@@ -184,3 +184,6 @@ $RECYCLE.BIN/
 /.idea/misc.xml
 /.idea
 /.idea/modules.xml
+
+/safeDispatch/debug
+/safeDispatch/release

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

@@ -25,6 +25,7 @@ public abstract class AbstractLiveActivity extends AppCompatActivity {
 	public abstract void vehicleStatusReceived(long imei, int opCode, int status);	// --> UpdateOptions
 	public abstract void emergencyAlarmReceived(int position, double lat, double lng);	// --> UpdateEmergencyAlarm
 	public abstract GoogleMap getMap();	// --> UpdateEmergencyAlarm
+	public abstract void setLanguage();
 
 	/** Misc */
 	public AbstractSDParentActivity getParentTab() {

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

@@ -255,8 +255,7 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 		return res;
 	}
 
-	public boolean getAlarms(long userID)
+	public boolean getAlarms(long userID) {
-	{
 		if (tcp == null)
 			return false;
 

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

@@ -97,6 +97,10 @@ public class AlertGridViewAdapter extends BaseAdapter
 		switch(acknowledged.get(position) ? 1 : 0)
 		{
 			case 1:
+				ViewGroup.LayoutParams params = convertView.getLayoutParams();
+				if (params != null) {
+					params.height = 0;
+				}
 				view.imageViewAlert.setImageResource(R.drawable.alert_off);
 				//view.layoutAlarm.setBackgroundColor(0xffffffff);
 		        break;

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

@@ -36,6 +36,8 @@ public class RadioMSG extends TCPmsg {
 	public ArrayList<Contact> contacts;
 	
 
+
+
 	public RadioMSG(TCPmsg tcp) {
 		super(tcp);
 		String date4parsing = super.data;
@@ -47,148 +49,34 @@ public class RadioMSG extends TCPmsg {
 		
 		switch(rOpcode)
 		{
-			case 200:
+			case 200 /* gw list */:
-			{
+				RadioGWList = getRadioGWList();
-				RadioGWList = new ArrayList<RadioGW>();
-				String[] tempArr = payload.split(";");
-				
-				int count = 0;
-				for(int i =0; i<tempArr.length;i++)
-				{
-					String[] oneRadio = tempArr[i].split("&");
-					
-					if(oneRadio.length<5)
-						continue;
-					RadioGW rgw = new RadioGW();
-					
-					rgw.ID = Integer.parseInt(oneRadio[0]);
-					rgw.GW_ID = Integer.parseInt(oneRadio[1]);
-					rgw.IMEI = oneRadio[2];
-					rgw.IP = oneRadio[3];
-					
-					String zonelistStr  =oneRadio[4];
-					String[] zoneArr = zonelistStr.split("@");
-					for(int j =0; j<zoneArr.length;j++)
-					{
-						Zone zon = new Zone();
-						String[] oneZoneArr = zoneArr[j].split(":");
-						
-						//TODO check what this values are from SD
-						zon.dbID = Integer.parseInt(oneZoneArr[0]);
-						zon.id = Integer.parseInt(oneZoneArr[1]);
-						zon.ZoneName = oneZoneArr[2];
-						String channelListStr = oneZoneArr[3];
-						
-						String[] channelArr = channelListStr.split(",");
-						for(int k =0; k < channelArr.length; k++)
-						{
-							Channel chn = new Channel();
-							String[] oneChnArr = channelArr[k].split("/");
-							chn.dbID = Integer.parseInt(oneChnArr[0]);
-							chn.id = Integer.parseInt(oneChnArr[1]);
-							chn.chName = oneChnArr[2];
-							
-							//add channel to zone 
-							zon.channelList.add(chn);
-						}
-						
-						//add zone to radio GW
-						rgw.zoneList.add(zon);
-					}
-					
-					RadioGWList.add(rgw);
-					count++;
-				}
-				count +=this.RadioGWList.size();
-				SM.Debug("radio","RadioGWList size:" +this.RadioGWList.size() + " total:" +count);
 				break;
-			}
+
+
 			case OperationCodes.CHANNEL_BRDCST:
-			{
-				try {
-					zac = new Zone_and_channel();
-					String[] tempArr = payload.split("&");
 
-					String[] gwID_and_rgwID = tempArr[0].split("/");
+				zac = parse_CHANNEL_BRDCST(payload);
-					zac.gwID = Integer.parseInt(gwID_and_rgwID[0]);
-					zac.rgwID = Integer.parseInt(gwID_and_rgwID[1]);
-					
-					String[] zoneNr_and_channelNr = tempArr[1].split("/");
-					zac.zoneNr = Integer.parseInt(zoneNr_and_channelNr[0]);
-					zac.channelNr = Integer.parseInt(zoneNr_and_channelNr[1]);
-				} catch (Exception e) {
-					SM.Debug("Cmd 204 error:"+e.toString());					
-				}
 				break;
-			}
+
 			
 			case OperationCodes.RADIO_STATUS_REP:
-			{
-				try {
-					rStatus = new RadioStatus();
-					String[] tempArr = payload.split("&");
 
-					if(tempArr.length == 4 || tempArr.length == 5) {
+				rStatus = parse_RADIO_STATUS_REP(payload);
-						rStatus.status = 1;
-						rStatus.incCall.callStatus = Integer.parseInt(tempArr[0]);
-						rStatus.incCall.callType = Integer.parseInt(tempArr[1]);
-						rStatus.incCall.Imei = Integer.parseInt(tempArr[2]);
-						rStatus.incCall.callerID = Integer.parseInt(tempArr[2]);
-						rStatus.incCall.groupId = Integer.parseInt(tempArr[3]);
-						rStatus.incCall.callDestID = Integer.parseInt(tempArr[3]);
-
-						if(tempArr.length == 5)
-							rStatus.incCall.userID = Integer.parseInt(tempArr[4]);
-					}
-					else {
-						String[] gwID_and_rgwID = tempArr[0].split("/");
-						rStatus.gwID = Integer.parseInt(gwID_and_rgwID[0]);
-						rStatus.rgwID = Integer.parseInt(gwID_and_rgwID[1]);					
-						rStatus.status = Integer.parseInt(tempArr[1]);
-					}
-				} catch (Exception e) {
-					SM.Debug("Cmd 199 error:"+e.toString());					
-				}
 				break;
-			}
 
-			case 250:
-			{
-				try {
-					suStatus = new SUstatus();
-					String[] tempArr = payload.split("&");
 			
-					suStatus.imei = Integer.parseInt(tempArr[0]);
+			case OperationCodes.UNIT_STATUS_UPDATE :
-					
+				suStatus = parse_UNIT_STATUS_UPDATE(payload);
-					suStatus.status = Integer.parseInt(tempArr[1]);
-				} catch (Exception e) {
-					SM.Debug("Cmd 250 error:"+e.toString());					
-				}
 				break;
-			}
+
 			
 			case 125:
 			case OperationCodes.CALL_STATUS_BRDCST:
-			{
-				try {
-					incCall = new IncCall();
-					incCall.opCode = rOpcode;
-					String[] tempArr = payload.split("&");
 
-					String[] gwID_and_rgwID_imei = tempArr[0].split("/");
+				incCall = parse_CALL_STATUS_BRDCST(payload);
-					incCall.gwID = Integer.parseInt(gwID_and_rgwID_imei[0]);
-					incCall.rgwID = Integer.parseInt(gwID_and_rgwID_imei[1]);
-					incCall.Imei = Long.parseLong(gwID_and_rgwID_imei[2]);
-					
-					incCall.callStatus = Integer.parseInt(tempArr[1]);
-					incCall.callType = Integer.parseInt(tempArr[2]);
-					incCall.groupId = Integer.parseInt(tempArr[3]);
-					incCall.userID = Integer.parseInt(tempArr[4]);
-				} catch (Exception e) {
-					SM.Debug("Cmd 125, 126 error:"+e.toString());					
-				}
 				break;
-			}
+
 			
 			case 121:
 			case 122:
@@ -265,21 +153,9 @@ public class RadioMSG extends TCPmsg {
 			}
 			
 			case OperationCodes.CALL_TYPE_REP:
-			{
+				incCall = 	parse_CALL_TYPE_REP(payload);
-				
-				try {
-					incCall = new IncCall();
-					incCall.opCode = rOpcode;
-					String[] tempArr = payload.split("/");
-					incCall.callType = Integer.parseInt(tempArr[0]);
-					incCall.callStatus = Integer.parseInt(tempArr[1]);
-					
-					SM.Debug("GOT CHANGE CALL TYPE MSG", incCall.opCode + " # " + incCall.callType + " # " + incCall.callStatus);
-				} catch (Exception e) {
-					SM.Debug("Cmd 115,116,117 error:"+e.toString());					
-				}
 				break;
-			}
+
 			
 			case 172:
 			{
@@ -302,20 +178,10 @@ public class RadioMSG extends TCPmsg {
 			}
 			
 			case OperationCodes.EMERGENCY_REP:
-			{
-				try {
-					emerg = new Emerg();
-					String[] tempArr = payload.split("/");
 
-					emerg.function = Integer.parseInt(tempArr[0]);
+				emerg = parse_EMERGENCY_REP(payload);
-					emerg.status = Integer.parseInt(tempArr[1]);
-
-					// emerg.userID = Integer.parseInt(tempArr[2]);
-				} catch (Exception e) {
-					SM.Debug("Cmd 230 error:"+e.toString());					
-				}
 				break;
-			}
+
 			
 			/*
 			case OperationCodes.CONTACTS_REP:
@@ -341,4 +207,254 @@ public class RadioMSG extends TCPmsg {
 		
 	}
 
+	private RadioGW parseRadioGW(String buffer)
+	{
+		RadioGW rgw = new RadioGW();
+		String[] radioFields = buffer.split("&");
+
+		if( radioFields.length > 3 ) {
+
+			rgw.ID 		= Integer.parseInt(radioFields[0].trim());
+			rgw.GW_ID 	= Integer.parseInt(radioFields[1].trim());
+			rgw.IMEI 	= radioFields[2];
+			rgw.IP 		= radioFields[3];
+		}
+
+		return rgw;
+	}
+
+	private Zone parseZone(String buffer)
+	{
+		Zone zone = new Zone();
+		String[] zoneFields = buffer.split(":");
+
+		if( zoneFields.length > 2 ) {
+
+			zone.dbID 		= Integer.parseInt(zoneFields[0].trim());
+			zone.id 		= Integer.parseInt(zoneFields[1].trim());
+			zone.ZoneName 	= zoneFields[2];
+		}
+
+		return zone;
+	}
+
+	private Channel parseChannel(String buffer)
+	{
+		Channel channel = new Channel();
+		String[] channelFields = buffer.split("/");
+
+		if( channelFields.length > 2 ) {
+
+			channel.dbID 	= Integer.parseInt(channelFields[0].trim());
+			channel.id 		= Integer.parseInt(channelFields[1].trim());
+			channel.chName 	= channelFields[2].trim();
+		}
+
+		return channel;
+	}
+
+	private String[] getChannelList(String zone)
+	{
+		String[] zoneArr = zone.split(":");
+		if ( zoneArr.length > 3)
+			return zoneArr[3].split(",");
+
+		return null;
+	}
+
+
+	private String[] getZoneList(String gw)
+	{
+		String[] zoneArr = gw.split("&");
+		if ( zoneArr.length > 4)
+			return zoneArr[4].split("@");
+
+		return null;
+	}
+
+	private ArrayList<RadioGW> getRadioGWList()
+	{
+		ArrayList<RadioGW> radioGWList = new ArrayList<RadioGW>();
+		String[] radioGWArr = payload.split(";");
+
+		for(int i=0; i < radioGWArr.length; i++)
+		{
+			RadioGW rgw = parseRadioGW(radioGWArr[i]);
+			String[] zoneArr  = getZoneList(radioGWArr[i]);
+			if( zoneArr == null)
+				continue;
+
+			for(int j=0; j < zoneArr.length; j++)
+			{
+
+				Zone zone = parseZone(zoneArr[j]);
+				String[] channelArr =  getChannelList(zoneArr[j]);
+				if( channelArr == null)
+					continue;
+
+				for(int k =0; k < channelArr.length; k++)
+				{
+					Channel channel = parseChannel(channelArr[k]);
+
+					//add channel to zone
+					zone.channelList.add(channel);
+				}
+
+				//add zone to radio GW
+				rgw.zoneList.add(zone);
+			}
+
+			radioGWList.add(rgw);
+
+		}
+
+		return radioGWList;
+	}
+
+	private Zone_and_channel parse_CHANNEL_BRDCST(String payload) {
+		Zone_and_channel zacObj = new Zone_and_channel();
+
+		try {
+
+			String[] tempArr = payload.split("&");
+
+			String[] gwID_and_rgwID = tempArr[0].split("/");
+			zacObj.gwID = Integer.parseInt(gwID_and_rgwID[0].trim());
+			zacObj.rgwID = Integer.parseInt(gwID_and_rgwID[1].trim());
+
+			String[] zoneNr_and_channelNr = tempArr[1].split("/");
+			zacObj.zoneNr = Integer.parseInt(zoneNr_and_channelNr[0].trim());
+			zacObj.channelNr = Integer.parseInt(zoneNr_and_channelNr[1].trim());
+
+		} catch (Exception e) {
+			SM.Debug("Cmd 204 error:"+e.toString());
+
+		}
+
+		return zacObj;
+
+	}
+
+	private IncCall parse_CALL_STATUS_BRDCST(String payload)
+	{
+		IncCall incCallObj = new IncCall();
+
+		try {
+
+			incCallObj.opCode = rOpcode;
+			String[] tempArr = payload.split("&");
+
+			String[] gwID_and_rgwID_imei = tempArr[0].split("/");
+			incCallObj.gwID = Integer.parseInt(gwID_and_rgwID_imei[0]);
+			incCallObj.rgwID = Integer.parseInt(gwID_and_rgwID_imei[1]);
+			incCallObj.Imei = Long.parseLong(gwID_and_rgwID_imei[2]);
+
+			incCallObj.callStatus = Integer.parseInt(tempArr[1]);
+			incCallObj.callType = Integer.parseInt(tempArr[2]);
+			incCallObj.groupId = Integer.parseInt(tempArr[3]);
+			if (tempArr.length > 4 )
+				incCallObj.userID = Integer.parseInt(tempArr[4]);
+
+
+		} catch (Exception e) {
+			SM.Debug("Cmd 125, 126 error:"+e.toString());
+		}
+
+		return incCallObj;
+	}
+
+	private RadioStatus parse_RADIO_STATUS_REP(String payload)
+	{
+		RadioStatus radioStatus = new RadioStatus();
+
+		try
+		{
+			String[] tempArr = payload.split("&");
+
+			if(tempArr.length == 4 || tempArr.length == 5) {
+
+				radioStatus.status = 1;
+				radioStatus.incCall.callStatus = Integer.parseInt(tempArr[0]);
+				radioStatus.incCall.callType = Integer.parseInt(tempArr[1]);
+				radioStatus.incCall.Imei = Integer.parseInt(tempArr[2]);
+				radioStatus.incCall.callerID = Integer.parseInt(tempArr[2]);
+				radioStatus.incCall.groupId = Integer.parseInt(tempArr[3]);
+				radioStatus.incCall.callDestID = Integer.parseInt(tempArr[3]);
+
+				if(tempArr.length == 5)
+					radioStatus.incCall.userID = Integer.parseInt(tempArr[4]);
+			}
+			else {
+				String[] gwID_and_rgwID = tempArr[0].split("/");
+				radioStatus.gwID = Integer.parseInt(gwID_and_rgwID[0]);
+				radioStatus.rgwID = Integer.parseInt(gwID_and_rgwID[1]);
+				radioStatus.status = Integer.parseInt(tempArr[1]);
+			}
+		}
+		catch (Exception e) {
+			SM.Debug("Cmd 199 error:"+e.toString());
+		}
+
+		return radioStatus;
+
+	}
+
+	private Emerg parse_EMERGENCY_REP(String payload)
+	{
+		Emerg emergObj = new Emerg();
+
+		try {
+
+			String[] tempArr = payload.split("/");
+
+			emergObj.function = Integer.parseInt(tempArr[0]);
+			emergObj.status = Integer.parseInt(tempArr[1]);
+
+			// emerg.userID = Integer.parseInt(tempArr[2]);
+
+		} catch (Exception e) {
+			SM.Debug("Cmd 230 error:"+e.toString());
+		}
+
+		return emergObj;
+	}
+
+	private SUstatus parse_UNIT_STATUS_UPDATE(String payload)
+	{
+		SUstatus suStatusObj = new SUstatus();
+
+		try {
+
+			String[] tempArr = payload.split("&");
+
+			suStatusObj.imei = Integer.parseInt(tempArr[0]);
+			suStatusObj.status = Integer.parseInt(tempArr[1]);
+
+		} catch (Exception e) {
+			SM.Debug("Cmd 250 error:"+e.toString());
+		}
+
+		return suStatusObj;
+
+	}
+
+	private IncCall parse_CALL_TYPE_REP(String payload)
+	{
+		IncCall incCallObj = new IncCall();
+
+		try {
+
+			incCallObj.opCode = rOpcode;
+			String[] tempArr = payload.split("/");
+			incCallObj.callType = Integer.parseInt(tempArr[0]);
+			incCallObj.callStatus = Integer.parseInt(tempArr[1]);
+
+			SM.Debug("GOT CHANGE CALL TYPE MSG", incCallObj.opCode + " # " + incCallObj.callType + " # " + incCallObj.callStatus);
+		} catch (Exception e) {
+			SM.Debug("Cmd 115,116,117 error:"+e.toString());
+		}
+
+		return incCallObj;
+	}
+
 }

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

@@ -102,10 +102,8 @@ public class TCPService extends Service {
     
     
     /** Stop TCP Connection */
-    public void stopTCPConnection()
+    public void stopTCPConnection() {
-    {
+    	if(tcp != null) {
-    	if(tcp != null)
-    	{
     		tcp.Stop();
     		tcp = null;
     	}
@@ -114,27 +112,7 @@ public class TCPService extends Service {
     /** restart the TCP Connection after the connection parameters had been changed */
     public void recreateTCPConnection()
     {
-    	/*
+        recreateTCPConnection(AppParams.IP, AppParams.PORT);
-    	Thread t = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					Thread.sleep(1000*2);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				*/
-				// create a tcp connection
-		    	int port = 13589;
-		    	try {
-		    		port = Integer.parseInt(AppParams.PORT);
-		    	}
-		    	catch(Exception ex) { }
-		    	tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);		
-	/*		}
-		});
-    	t.start();
-    	*/
     }
     
     public void recreateTCPConnection(String _ip, String _port)

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import com.safemobile.lib.AppParams;
 import com.safemobile.lib.SM;
@@ -24,6 +25,7 @@ import java.util.TimerTask;
 
 
 public class TCPhandler implements Runnable {
+	private final String TAG = "TCPhandler";
 	private boolean alive = true;
 
 	public String serverHostname;
@@ -56,6 +58,7 @@ public class TCPhandler implements Runnable {
 
 		// create timer to check socket status
 		Timer timer = new Timer();
+		try {
 			timer.scheduleAtFixedRate(new TimerTask() {
 				@Override
 				public void run() {
@@ -68,6 +71,9 @@ public class TCPhandler implements Runnable {
 					}
 				}
 			}, 0, 3000);
+		} catch(Exception e) {
+			Log.v("Exception", e.getMessage());
+		}
 		
 		// get WiFi state
 		isWiFiOn = isNetworkConnected();
@@ -104,6 +110,8 @@ public class TCPhandler implements Runnable {
 			SM.Debug("IllegalArgumentException", "TCPhandler break:"+ e);
 		} catch (IOException e) {
 			SM.Debug("IOException", "TCPhandler break:"+ e);
+		} catch (Exception e) {
+			Log.v("Exception", e.getMessage());
 		}
 
 		while (alive) {
@@ -111,6 +119,8 @@ public class TCPhandler implements Runnable {
 				Thread.sleep(3000);
 			} catch (InterruptedException e) {
 				SM.Debug("TCPhandler Crash1 on sleep:"+ e);
+			} catch (Exception e) {
+				Log.v("Exception", e.getMessage());
 			}
 
 			while (Boolean.TRUE.equals(isConnectionUP)) {
@@ -242,6 +252,8 @@ public class TCPhandler implements Runnable {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
 				SM.Debug("TCPhandler Crash2 on sleep:"+ e);
+			} catch (Exception e) {
+				Log.v("Exception", e.getMessage());
 			}
 			//try to restart connection
 			if (alive && isWiFiOn)
@@ -350,6 +362,7 @@ public class TCPhandler implements Runnable {
 			if (soc != null)
 				soc.close();
 		} catch (IOException e1) {
+			Log.v("IOException", e1.getMessage());
 			e1.printStackTrace();
 		}
 
@@ -371,14 +384,15 @@ public class TCPhandler implements Runnable {
 
 	private void restartTCP() {
 		try {
+			Log.v(TAG, "restartTCP");
 			isConnectionUP = false;
 			previousConnectionWasUP = false;
 
 			SM.Debug("Restarting TCP...ip:" + serverHostname + ":" + port);
 			soc = new Socket();
-			soc.connect(new InetSocketAddress(serverHostname, port), 5000);
+			soc.connect(new InetSocketAddress(serverHostname, port), 50000);
-
 			input = new DataInputStream(soc.getInputStream());
+
 			//output stream
 			output = new DataOutputStream(soc.getOutputStream());
 
@@ -386,17 +400,11 @@ public class TCPhandler implements Runnable {
 				isConnectionUP = true;
 			}
 
-		} catch (UnknownHostException e) {
+		} catch (NullPointerException | IOException e) {
-			SM.Exception("restartTCP break:" + e.toString());
+			SM.Exception("restartTCP break:" + e);
 			isConnectionUP = false;
 		} catch (IllegalArgumentException e) {
-			SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
+			SM.Debug("IllegalArgumentException", "restartTCP break:" + e);
-		} catch (IOException e) {
-			SM.Exception("restartTCP break:" + e.toString());
-			isConnectionUP = false;
-		} catch (NullPointerException e) {
-			SM.Exception("restartTCP break:" + e.toString());
-			isConnectionUP = false;
 		}
 		triggerTCPConnectionStateEvent();
 	}
@@ -410,6 +418,7 @@ public class TCPhandler implements Runnable {
 				soc.close();
 			soc = null;
 		} catch (IOException e) {
+			Log.v("IOException", e.getMessage());
 			e.printStackTrace();
 		}
 	}

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;
 
@@ -14,14 +13,12 @@ import com.safemobile.lib.TCPmsg;
 
 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,90 +187,82 @@ 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)
 				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)
 					{
-					case 40:{
+                        case 40:  /* login */{
                             _fireLoginEvent();
                             break;
                         }
 
-					case 41:{
+                        case 41: /* vehicle */ {
                             _fireVehEvent();
                             break;
                         }
 
-					case 42:{
+
+                        case 42: /* Text Message */{
                             _fireSMSEvent();
                             break;
                         }
 
-					case 43:{
+
+                        case 43: /* Last text message */ {
                             _fireLastSMSEvent();
                             break;
                         }
 
-					case OperationCodes.TM_ACK:{
+
-						_fireSMSconfirm();
+                        case OperationCodes.TM_ACK:
-						break;
-					}
                         case OperationCodes.TM_ACK_SD: {
                             _fireSMSconfirm();
                             break;
@@ -310,22 +273,23 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
-					case 45:{
+                        case 45: /* last position */ {
                             _fireLastPos();
                             break;
                         }
 
-					case 131:{
+                        case 131: /* gps */ {
                             _fireGPSEvent();
                             break;
                         }
 
-					case 231:{
+                        case 231: /* pool */ {
                             _firePOLLEvent();
                             break;
                         }
 
-					case 50:{
+
+                        case 50: /* radio */ {
                             _fireRadioEvent();
                             break;
                         }
@@ -340,12 +304,14 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
-					case 47:{
+
+                        case 47: /* alert list */ {
                             _fireAlarmList();
                             break;
                         }
 
-					case 48:{
+
+                        case 48: /* alert ack */ {
                             _fireAlarmACK();
                             break;
                         }
@@ -402,39 +368,27 @@ public class TCPmsgParser implements Runnable{
 
                         default:
                             break;
+
                     }
                 }
-				catch(Exception ex)
+                catch(Exception ex) {
-				{
                     try {
                         if(TCPhandler.msgList.size() > 0)
                             _msg = TCPhandler.msgList.remove(0);
-					}
+                    } catch(NoSuchElementException exe) {
-					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 +396,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/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.safemobile.safedispatch",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 8000035,
-      "versionName": "8.0.35",
-      "outputFile": "SafeDispatchMobile_v.8.0.35-release.apk"
-    }
-  ],
-  "elementType": "File"
-}

safeDispatch/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         android:glEsVersion="0x00020000"
         android:required="true" />
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" android:required="false"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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

@@ -25,6 +25,7 @@ public class AudioHandle implements Runnable{
 	private TcpAudioClient tcp;
 	private int audioport = 50001;
 
+	
 	public int typeUDP;
 	public AudioHandle(String IP, int _typeUDP)
 	{
@@ -143,18 +144,20 @@ public class AudioHandle implements Runnable{
 					 //SM.Debug("sending b:"+bRead); 
 					 if(typeUDP == 1)
 					 {
-						 tempBuffer = new byte[512];//128];//invers3.bufferSize];
+						 int size = 512; // 2048
-						 bRead = recDev.read(tempBuffer, 0, 512);// 128);//invers3.bufferSize);
+
+						 tempBuffer = new byte[size];
+						 bRead = recDev.read(tempBuffer, 0, size);
+
 						 udp.Send(tempBuffer,bRead);
 						 SM.Debug("UDP sending b:"+bRead); 
 					 }
 					 else
 					 {
-						 tempBuffer = new byte[2048];//128];//invers3.bufferSize];
+					 	 int size = 1024; //
-						 bRead = recDev.read(tempBuffer, 0, 2048);// 128);//invers3.bufferSize);
+						 tempBuffer = new byte[size];
-						 /*
+						 bRead = recDev.read(tempBuffer, 0, size);
-						 tempBuffer = new byte[16384];//128];//invers3.bufferSize];
+
-						 bRead = recDev.read(tempBuffer, 0,16384);// 128);//invers3.bufferSize);*/
 						 tcp.send(tempBuffer,bRead);
 						 SM.Debug("TCP sending b:"+bRead);
 					 }

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

@@ -107,7 +107,6 @@ public class TcpAudioClient implements Runnable {
 			recv = soc.getInputStream();
 			writer = soc.getOutputStream();
 			setConnOK(true);
-
 		} catch (IOException e) {
 			SM.Debug("break:" + e);
 		}

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

@@ -66,6 +66,7 @@ public class AlarmActivity extends Activity {
 		setContentView(R.layout.tabalarm);
 
 		gridView = findViewById(R.id.gridViewAlarms);
+		gridView.setNestedScrollingEnabled(true);
 		adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
 		gridView.setAdapter(adapter);
 
@@ -128,9 +129,12 @@ public class AlarmActivity extends Activity {
 			setConvertViewAlarm(arg1);
 			// save position 
 			ackPosition = position;
-			if (!AppParams.DEMO)
+			if (!AppParams.DEMO) {
+				getParentTab().getAlarms(AppParams.USERID);
 				setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName);
-			else {
+				acknowledged.set(position, true);
+				updateResultsInUi(ALARM);
+			} else {
 				getAllAlarms().get(position).ack = 1;
 				updateResultsInUi("else");
 			}
@@ -168,7 +172,10 @@ public class AlarmActivity extends Activity {
 		if (param.equals(ALARM)) {
 			// set adapter
 			adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+			int position = gridView.getFirstVisiblePosition();
+
 			gridView.setAdapter(adapter);
+			gridView.setSelection(position);
 		} else {
 			adapter.changeACK(ackPosition);
 			SM.Debug("Set ACK: " + ackPosition + "  | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false"));

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

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 
 public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
@@ -42,7 +43,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 +73,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");
             }
@@ -91,28 +91,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
 
         boolean isMilitaryTime = false;
         Date positionTime;
+        long timeGMT = 0;
         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);
+
+            timeGMT = vehicle.timeGMT;
             address = vehicle.Address != null ? vehicle.Address : "";
             name = vehicle.name;
-            speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * 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);
+            timeGMT = histPos.timeGMT;
             address = histPos.Address != null ? histPos.Address : "";
-            speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph),  (int)(0.621371192 * histPos.speed));
             gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
         }
 
-        String timeFormat = isMilitaryTime
+        //String timeFormat = isMilitaryTime
-                ? "HH:mm:ss dd.MMM.yyyy"
+        //        ? "HH:mm:ss dd.MMM.yyyy"
-                : "hh:mm:ss a dd.MMM.yyy";
+        //       : "hh:mm:ss a dd.MMM.yyy";
+
+        //DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
+        //tvTimeAgo.setText(format.format(positionTime));
+
+        DateFormat format = new SimpleDateFormat("hh:mm:ss", Locale.ENGLISH);
+        tvTimeAgo.setText( getDateTimeAgo(timeGMT * 1000)  +  "  [" +  format.format(new Date(timeGMT*1000) ) + "]");
 
-        DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
-        tvTimeAgo.setText(format.format(positionTime));
         tvStreetView.setText(address);
         streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
         tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
@@ -124,5 +134,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         tvSpeed.setText(speed);
         tvGPSLocation.setText(gpsLocation);
     }
+
+    /// <summary>
+    /// Get a text representation for the date time representing
+    /// the difference in minutes/hours/days from now
+    /// </summary>
+    /// <param name="utcTime">DateTime value which needs to be converted</param>
+    /// <returns>String 'Ago' representation fot he date</returns>
+    public static String getDateTimeAgo(long time)
+    {
+        String timeValue = "";
+
+        long diffInMs = (new Date().getTime() - time);
+
+        long secondsDifference = TimeUnit.MILLISECONDS.toSeconds(diffInMs);;
+
+        if (secondsDifference < 60)
+            timeValue = "less than 1 minute";
+        else if (secondsDifference < 3600)
+            timeValue = (secondsDifference / 60) + " minute" + ((secondsDifference / 60) > 1 ? "s" : "") + " ago";
+        else if (secondsDifference < 7200)
+            timeValue = "1 hour ago";
+        else if (secondsDifference < 86400)
+        {
+            timeValue = (secondsDifference / 3600) + " hours ago";
+        }
+        else
+        {
+            timeValue = (secondsDifference / 86400) + " days ago";
+        }
+
+        return timeValue;
+    }
+
 }
 

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,9 +103,46 @@ 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();
     }
 
+    public void setLanguage() {
+        TextView labelVehicle = findViewById(R.id.labelVehicle);
+        TextView labelStartDate = findViewById(R.id.labelStartDate);
+        TextView labelEndDate = findViewById(R.id.labelEndDate);
+
+        labelVehicle.setText(R.string.vehicle);
+        labelStartDate.setText(R.string.startDate);
+        labelEndDate.setText(R.string.endDate);
+        displayButton.setText(R.string.display);
+    }
+
     private void displayHistory(ArrayList<HistPos> positions) {
         LatLng latLng = null;
         PolylineOptions polylineOptions = new PolylineOptions();
@@ -124,10 +165,23 @@ 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();
+        calendar.add(Calendar.DATE, 1);
         endDate = calendar.getTime();
-        calendar.add(Calendar.DATE, -1);
+        calendar.add(Calendar.DATE, -2);
         startDate = calendar.getTime();
 
         TextView textViewStartDate = findViewById(R.id.textViewStartDate);
@@ -234,8 +288,8 @@ 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,16 +286,21 @@ 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();
     }
 
+    public void setLanguage() {
+        TextView textView = findViewById(R.id.unit_name);
+        textView.setText(R.string.unitName);
+    }
+
     /**
      * Manipulates the map once available.
      * This callback is triggered when the map is ready to be used.
@@ -309,6 +315,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 +378,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,14 +447,8 @@ 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) {
-                if (marker.isInfoWindowShown()) {
-                    openWindow = marker.getTitle();
-                }
-            }
             googleMap.clear();
 
             for (int i = 0; i < displayedVehicles.size(); i++) {
@@ -462,8 +463,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                         markerOptions.icon(markerIcon);
 
                         Marker marker = this.googleMap.addMarker(markerOptions);
-                        if (openWindow.equals(marker.getTitle()))
+
+                        if (i == lastItemClicked) {
                             marker.showInfoWindow();
+                            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
+                        }
 
                         markers.add(marker);
                     }
@@ -472,10 +476,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         }
     }
 
-    public void showOpenedBalloon(boolean demo) {
-        //TODO: add show balloon
-    }
-
     private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
         Bitmap bitmap = BitmapFactory.decodeResource(getResources(), largeIcon);
         Bitmap textBitmap = getTextAsDrawable(this, text);
@@ -650,7 +650,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 +660,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 +678,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 +688,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

@@ -10,6 +10,7 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -45,6 +46,7 @@ public class MessagesActivity extends Activity {
 	/**
 	 * Called when the activity is first created.
 	 */
+	private final String TAG = "MessagesActivity";
 
 	private MessagesGridViewAdapter mAdapter;
 	private ConversationGridViewAdapter convAdapter;
@@ -124,16 +126,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"));
@@ -148,6 +140,7 @@ public class MessagesActivity extends Activity {
 
 		// Implement On Item click listener
 		gridView.setOnItemClickListener((arg0, arg1, position, arg3) -> {
+			Log.v(TAG, "onItemClick " + LASTMESSAGES);
 			if (LASTMESSAGES) {
 				// get position
 				Msg item = mAdapter.getItem(position);
@@ -177,6 +170,8 @@ public class MessagesActivity extends Activity {
 		// button send message
 		imageButtonSend = findViewById(R.id.imageButtonSend);
 		imageButtonSend.setOnClickListener(v -> {
+			if (editTextMsg.getText().toString().isEmpty())
+				return;
 			sendSMS(getScId(), editTextMsg.getText().toString());
 			Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show();
 			// disable send button and editBox
@@ -204,6 +199,7 @@ public class MessagesActivity extends Activity {
 		imageButtonBack.setOnClickListener(v -> {
 			// set LastMessage conversation type
 			LASTMESSAGES = true;
+			Log.v(TAG, "lastmessages: true");
 			// refresh Grid
 			getLastSMS();
 			if (AppParams.DEMO)
@@ -396,6 +392,7 @@ public class MessagesActivity extends Activity {
 				listLastMessages.add(new Msg(sentVehicle, txt, Calendar.getInstance().getTime(), sendSMSSeqID));
 			}
 			SM.Debug("time: " + timeGMT + "   |   " + Calendar.getInstance().getTime());
+			Log.v(TAG, "lastmessages: false");
 			LASTMESSAGES = false;
 
 			updateResultsInUi();
@@ -635,6 +632,7 @@ public class MessagesActivity extends Activity {
 			setScId(item.sc_id);
 			SM.Debug("Selected scId: " + getScId());
 			// set Conversation type
+			Log.v(TAG, "lastmessages: false");
 			LASTMESSAGES = false;
 			// call get SMS
 			getSMS4unit(getScId());

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

@@ -21,11 +21,16 @@ public class NotificationActivity extends Activity{
 
 		 // broadcast 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

@@ -26,6 +26,7 @@ import com.safemobile.lib.AppParams;
 import com.safemobile.lib.OperationCodes;
 import com.safemobile.lib.Recording;
 import com.safemobile.lib.SM;
+import com.safemobile.lib.Vehicle;
 import com.safemobile.lib.radio.RadioGW;
 import com.safemobile.lib.sound.RecordingHandle;
 
@@ -42,6 +43,7 @@ public class RecordingsActivity extends Activity {
 	private GridView gridView;
 	private RecordingsGridViewAdapter adapter;
 	private View convertViewRecording;
+	private boolean isRecordingPlaying = false;
 
 	private int playingPosition = -1;
 
@@ -89,6 +91,7 @@ public class RecordingsActivity extends Activity {
 		gridView.setAdapter(adapter);
 
 		gridView.setOnItemClickListener(onItemClickListener);
+		gridView.setOnTouchListener((v, event) -> isRecordingPlaying);
 
 		if (recHandle == null && !AppParams.DEMO)
 			recHandle = new RecordingHandle(AppParams.IP);
@@ -171,12 +174,17 @@ public class RecordingsActivity extends Activity {
 		SM.Debug("onResume");
 	}
 
+
+
 	private final 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)
+				return;
+
+			isRecordingPlaying = true;
 			setConvertViewRecording(view);
 
 			// change background to playing
@@ -262,7 +270,7 @@ public class RecordingsActivity extends Activity {
 		adapter.changePlaying(getPlayingPosition(), false);
 
 		// enable grid
-		gridView.setEnabled(true);
+		isRecordingPlaying = false;
 
 		// set playing Recording position to -1
 		setPlayingPosition(-1);
@@ -288,9 +296,27 @@ public class RecordingsActivity extends Activity {
 	private void updateResultsInUi() {
 		// clear played items
 		playingPositions = new ArrayList<>();
+
+		ArrayList<Recording> recordings = getAllRecordings();
+		ArrayList<Recording> filteredList = new ArrayList<>();
+		ArrayList<Vehicle> vehicles = getParentTab().getAllVehicle();
+		for (Recording recording : recordings) {
+			if (recording.callType == 0 || recording.callType == 4) {
+				for (Vehicle vehicle : vehicles)
+					if (vehicle.imei.equals(String.valueOf(recording.subID))) {
+						filteredList.add(recording);
+						break;
+					}
+			} else {
+				filteredList.add(recording);
+			}
+		}
+
+		setAllRecordings(filteredList);
+
 		for (int i = 0; i < getAllRecordings().size(); i++)
 			playingPositions.add(true);
-		// set adapter - where playingPositions stores exists values
+
 		adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
 
 		// playing positions need to be false because no recording is played

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);
@@ -165,37 +182,16 @@ public class SDMobileActivity extends Activity {
 		ImageView imageLoading = (ImageView) findViewById(R.id.imageLoading);
 		imageLoading.setBackgroundResource(R.drawable.loading);
 
+		// language
 		imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
-
-		// change spinner icon and selected language according to tmpLanguage
-		switch (AppParams.LANGUAGETMP) {
-			case "en":
-				imageLanguage.setImageResource(R.drawable.en);
-				break;
-			case "de":
-				imageLanguage.setImageResource(R.drawable.de);
-				break;
-			case "tr":
-				imageLanguage.setImageResource(R.drawable.tr);
-				break;
-			case "ro":
-				imageLanguage.setImageResource(R.drawable.ro);
-				break;
-			case "es":
-				imageLanguage.setImageResource(R.drawable.es);
-				break;
-			case "ru":
-				imageLanguage.setImageResource(R.drawable.ru);
-				break;
-			default:
-				throw new IllegalStateException("Unexpected value: " + AppParams.LANGUAGETMP);
-		}
-
 		imageLanguage.setOnClickListener(LanguageListener);
+		setLanguageIcon();
 
+		// username and password
 		etUsername = (EditText) findViewById(R.id.etUsername);
 		etPassword = (EditText) findViewById(R.id.etPassword);
 
+		// login button
 		btLogin = (Button) findViewById(R.id.btLogin);
 		btLogin.setOnClickListener(arg0 -> {
 
@@ -287,6 +283,35 @@ public class SDMobileActivity extends Activity {
 		}
 	}
 
+
+	private void setLanguageIcon()
+	{
+		// change spinner icon and selected language according to tmpLanguage
+		switch (AppParams.LANGUAGETMP) {
+			case "en":
+				imageLanguage.setImageResource(R.drawable.en);
+				break;
+			case "de":
+				imageLanguage.setImageResource(R.drawable.de);
+				break;
+			case "tr":
+				imageLanguage.setImageResource(R.drawable.tr);
+				break;
+			case "ro":
+				imageLanguage.setImageResource(R.drawable.ro);
+				break;
+			case "es":
+				imageLanguage.setImageResource(R.drawable.es);
+				break;
+			case "ru":
+				imageLanguage.setImageResource(R.drawable.ru);
+				break;
+			default:
+				throw new IllegalStateException("Unexpected value: " + AppParams.LANGUAGETMP);
+		}
+
+	}
+
 	@Override
 	public void onBackPressed() {
 		if (loadingDialog.isShowing())
@@ -524,6 +549,21 @@ 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/SetupActivity.java

@@ -2,16 +2,13 @@ package com.safemobile.safedispatch;
 
 import java.util.Locale;
 
-/** fix import */
 import com.safemobile.adapters.LanguageSpinnerAdapter;
 import com.safemobile.lib.AppParams;
 import com.safemobile.lib.SM;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -73,52 +70,49 @@ public class SetupActivity extends Activity {
         setContentView(R.layout.tabsetup);
         
         
-        layoutSpinnerLanguage = (LinearLayout) findViewById(R.id.layoutSpinnerLanguage);
+        layoutSpinnerLanguage = findViewById(R.id.layoutSpinnerLanguage);
         layoutSpinnerLanguage.setOnClickListener(LanguageListener);
-        imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
+        imageLanguage = findViewById(R.id.imageLanguage);
-        textViewSpinnerLanguage = (TextView) findViewById(R.id.textViewSpinnerLanguage);
+        textViewSpinnerLanguage = findViewById(R.id.textViewSpinnerLanguage);
         
         // change spinner icon and selected language according to tmpLanguage
-        if (AppParams.LANGUAGETMP.equals("en")){ 
+		switch (AppParams.LANGUAGETMP) {
+			case "en":
 				imageLanguage.setImageResource(R.drawable.en);
 				textViewSpinnerLanguage.setText(getString(R.string.en));
-		}
+				break;
-        else if (AppParams.LANGUAGETMP.equals("de")){ 
+			case "de":
 				imageLanguage.setImageResource(R.drawable.de);
 				textViewSpinnerLanguage.setText(getString(R.string.de));
-		}
+				break;
-        else if (AppParams.LANGUAGETMP.equals("tr")){ 
+			case "tr":
 				imageLanguage.setImageResource(R.drawable.tr);
 				textViewSpinnerLanguage.setText(getString(R.string.tr));
-		}
+				break;
-        else if (AppParams.LANGUAGETMP.equals("ro")){ 
+			case "ro":
 				imageLanguage.setImageResource(R.drawable.ro);
 				textViewSpinnerLanguage.setText(getString(R.string.ro));
-		}
+				break;
-        else if(AppParams.LANGUAGETMP.equals("es")){ 
+			case "es":
 				imageLanguage.setImageResource(R.drawable.es);
 				textViewSpinnerLanguage.setText(getString(R.string.es));
-		}
+				break;
-        else if(AppParams.LANGUAGETMP.equals("ru")){ 
+			case "ru":
 				imageLanguage.setImageResource(R.drawable.ru);
 				textViewSpinnerLanguage.setText(getString(R.string.ru));
+				break;
 		}
         
         // get visual elements
-        appServerIP = (EditText) findViewById(R.id.appServerIP);
+        appServerIP = findViewById(R.id.appServerIP);
-        appServerPort = (EditText) findViewById(R.id.appServerPort);
+        appServerPort = findViewById(R.id.appServerPort);
 
         // hide path layout used only on Pad/Pod 
-        layoutPath = (LinearLayout) findViewById(R.id.layoutPath);
+        layoutPath = findViewById(R.id.layoutPath);
         layoutPath.setVisibility(View.GONE);
-        btn_save = (Button) findViewById(R.id.btn_save);
+        btn_save = findViewById(R.id.btn_save);
         
-        btn_save.setOnClickListener(new OnClickListener() {
+        btn_save.setOnClickListener(v -> saveSettings());
-			@Override
-			public void onClick(View v) {
-				saveSettings();
-			}
-		});
         
         // set values
         if(!AppParams.IP.equals("n/a"))
@@ -134,36 +128,22 @@ public class SetupActivity extends Activity {
     	AlertDialog.Builder builder = new AlertDialog.Builder(this);
     	builder.setMessage(getString(R.string.exit))
     	       .setCancelable(false)
-    	       .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
+    	       .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
-    	           public void onClick(DialogInterface dialog, int id) {
+    	       .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.logout);
+    	       .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
-    	           }
-    	       })
-    	       .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();
     }
     
     // listener when select language pressed
-    private OnClickListener LanguageListener =  new OnClickListener() {
+    private final OnClickListener LanguageListener =  new OnClickListener() {
 		
 		@Override
 		public void onClick(View v) {
 				final LanguageSpinnerAdapter adapter = new LanguageSpinnerAdapter(context, android.R.layout.simple_spinner_item, Languages, getLayoutInflater());
 				AlertDialog.Builder builder = new AlertDialog.Builder(context);
 				builder.setTitle(getString(R.string.selLanguage));
-				builder.setAdapter(adapter , new DialogInterface.OnClickListener() {
+				builder.setAdapter(adapter , (dialog, which) -> {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					textViewSpinnerLanguage.setText(adapter.getItem(which));
 					switch(which)
 					{
@@ -174,7 +154,6 @@ public class SetupActivity extends Activity {
 						case 4: imageLanguage.setImageResource(R.drawable.ru); AppParams.LANGUAGETMP = "ru"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
 						case 5: imageLanguage.setImageResource(R.drawable.es); AppParams.LANGUAGETMP = "es"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
 					}
-					}
 				});
 				
 				AlertDialog alert = builder.create();
@@ -218,7 +197,7 @@ public class SetupActivity extends Activity {
 		editor.putString("ip", appServerIP.getText().toString());
 		editor.putString("port", appServerPort.getText().toString());
 		editor.putString("language", AppParams.LANGUAGETMP);
-		Boolean result = editor.commit();
+		boolean result = editor.commit();
 		// saved completed
 		if (result)
 			Toast.makeText(context, "Settings saved successfully.", Toast.LENGTH_LONG).show();
@@ -265,31 +244,4 @@ public class SetupActivity extends Activity {
 		//showDialog(result);
 	}
 	
-	public void showDialog(Boolean result)
-	{
-		Dialog dialog = new Dialog(context);
-		if(result)
-			dialog.setTitle("Save Completed");
-		else 
-			dialog.setTitle("Save Failed");
-		dialog.setContentView(R.layout.dialog);
-		dialog.setCancelable(true);
-		dialog.setCanceledOnTouchOutside(true);
-
-		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = (ImageView) dialog.findViewById(R.id.image);
-		if(result)
-		{
-			image.setImageResource(R.drawable.error);
-			text.setText("Settings saved successfully.");
-		}
-		else
-		{
-			image.setImageResource(R.drawable.error);
-			text.setText("Settings failed to complete!");
-		}
-		
-		dialog.show();
-	}
-	
 }

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/main.xml

@@ -155,13 +155,13 @@
 							android:id="@+id/imageSettings"
 							android:layout_width="wrap_content"
 							android:layout_height="0dp"
-					             android:contentDescription="holds the icon for language"
-					             android:src="@drawable/change_ip"
-					             android:adjustViewBounds="true"
-					             android:scaleType="fitCenter"
 							android:layout_alignTop="@+id/imageLanguage"
 							android:layout_alignBottom="@+id/imageLanguage"
-					             android:layout_alignParentRight="true" />
+							android:layout_alignParentRight="true"
+							android:adjustViewBounds="true"
+							android:contentDescription="holds the icon for language"
+							android:scaleType="fitCenter"
+							android:src="@drawable/change_ip" />
 					          
 					          <Button
 					              android:id="@+id/buttonLogin"

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

@@ -10,6 +10,7 @@
 	    android:gravity="center_vertical" >
 	   
 	    <TextView
+			android:id="@+id/unit_name"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
 	        android:text="@string/unitName"

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>