make messages view match parent

Reviewed-on: #18

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

@@ -36,8 +36,6 @@ public class RadioMSG extends TCPmsg {
 	public ArrayList<Contact> contacts;
 	
 	
-
-
 	public RadioMSG(TCPmsg tcp) {
 		super(tcp);
 		String date4parsing = super.data;
@@ -49,34 +47,148 @@ public class RadioMSG extends TCPmsg {
 		
 		switch(rOpcode)
 		{
-			case 200 /* gw list */:
+			case 200:
-				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("&");
 					
-				zac = parse_CHANNEL_BRDCST(payload);
+					String[] gwID_and_rgwID = tempArr[0].split("/");
+					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("&");
 					
-				rStatus = parse_RADIO_STATUS_REP(payload);
+					if(tempArr.length == 4 || tempArr.length == 5) {
+						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("&");
 					
-			case OperationCodes.UNIT_STATUS_UPDATE :
+					suStatus.imei = Integer.parseInt(tempArr[0]);
-				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("&");
 					
-				incCall = parse_CALL_STATUS_BRDCST(payload);
+					String[] gwID_and_rgwID_imei = tempArr[0].split("/");
+					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:
@@ -153,9 +265,21 @@ public class RadioMSG extends TCPmsg {
 			}
 			
 			case OperationCodes.CALL_TYPE_REP:
-				incCall = 	parse_CALL_TYPE_REP(payload);
+			{
-				break;
 				
+				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:
 			{
@@ -178,10 +302,20 @@ public class RadioMSG extends TCPmsg {
 			}
 			
 			case OperationCodes.EMERGENCY_REP:
+			{
+				try {
+					emerg = new Emerg();
+					String[] tempArr = payload.split("/");
 					
-				emerg = parse_EMERGENCY_REP(payload);
+					emerg.function = Integer.parseInt(tempArr[0]);
+					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:
@@ -207,254 +341,4 @@ 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/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,91 +187,76 @@ 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)
+					switch(_msg.opCode) {
-					{
+                        case 40:{
-                        case 40:  /* login */{
                             _fireLoginEvent();
                             break;
 					    }
 
-                        case 41: /* vehicle */ {
+                        case 41:{
                             _fireVehEvent();
                             break;
                         }
 
-                        case 42: /* Text Message */{
+                        case 42:{
                             _fireSMSEvent();
                             break;
                         }
 
-                        case 43: /* Last text message */ {
+                        case 43:{
                             _fireLastSMSEvent();
                             break;
                         }
 
-                        case OperationCodes.TM_ACK:{
+                        case OperationCodes.TM_ACK:
-                            _fireSMSconfirm();
-                            break;
-                        }
-
                         case OperationCodes.TM_ACK_SD: {
                             _fireSMSconfirm();
                             break;
@@ -311,22 +267,22 @@ public class TCPmsgParser implements Runnable{
                             break;
 					    }
 
-                        case 45: /* last position */ {
+                        case 45:{
                             _fireLastPos();
                             break;
                         }
 
-                        case 131: /* gps */ {
+                        case 131:{
                             _fireGPSEvent();
                             break;
                         }
 
-                        case 231: /* pool */ {
+                        case 231:{
                             _firePOLLEvent();
                             break;
                         }
 
-                        case 50: /* radio */ {
+                        case 50:{
                             _fireRadioEvent();
                             break;
                         }
@@ -341,12 +297,12 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
-                        case 47: /* alert list */ {
+                        case 47:{
                             _fireAlarmList();
                             break;
                         }
 
-                        case 48: /* alert ack */ {
+                        case 48:{
                             _fireAlarmACK();
                             break;
                         }
@@ -404,36 +360,23 @@ 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()
@@ -441,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");
 	}
-
 }

safeDispatch/build.gradle

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

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

@@ -25,7 +25,6 @@ public class AudioHandle implements Runnable{
 	private TcpAudioClient tcp;
 	private int audioport = 50001;
 	
-	
 	public int typeUDP;
 	public AudioHandle(String IP, int _typeUDP)
 	{
@@ -144,20 +143,18 @@ public class AudioHandle implements Runnable{
 					 //SM.Debug("sending b:"+bRead); 
 					 if(typeUDP==1)
 					 { 		
-						 int size = 512; // 2048
+						 tempBuffer = new byte[512];//128];//invers3.bufferSize];
-
+						 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
 					 {
-					 	 int size = 1024; //
+						 tempBuffer = new byte[2048];//128];//invers3.bufferSize];
-						 tempBuffer = new byte[size];
+						 bRead = recDev.read(tempBuffer, 0, 2048);// 128);//invers3.bufferSize);
-						 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/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/SDMobileActivity.java

@@ -165,16 +165,37 @@ public class SDMobileActivity extends Activity {
 		ImageView imageLoading = (ImageView) findViewById(R.id.imageLoading);
 		imageLoading.setBackgroundResource(R.drawable.loading);
 
-		// language
 		imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
-		imageLanguage.setOnClickListener(LanguageListener);
-		setLanguageIcon();
 
-		// username and password
+		// 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);
+
 		etUsername = (EditText) findViewById(R.id.etUsername);
 		etPassword = (EditText) findViewById(R.id.etPassword);
 
-		// login button
 		btLogin = (Button) findViewById(R.id.btLogin);
 		btLogin.setOnClickListener(arg0 -> {
 
@@ -266,35 +287,6 @@ 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())

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"

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/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"