resoving merge

Reviewed-on: #25

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

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

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

@@ -1,7 +1,6 @@
 package com.safemobile.services;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -12,16 +11,14 @@ import com.safemobile.lib.SM;
 import com.safemobile.lib.TCPmsg;
 
 
-public class TCPmsgParser implements Runnable{
+public class TCPmsgParser implements Runnable {
 
-	
 	public boolean run = true;
 	private TCPmsg _msg;
-	private static List<ITCPListener> _listeners = new ArrayList<ITCPListener>();
+	private static final List<ITCPListener> _listeners = new ArrayList<>();
 	private Thread TCPmsgParserThread;
 
-	public TCPmsgParser()
+	public TCPmsgParser() {
-	{
 		TCPmsgParserThread = new Thread(this, "TCPmsgParserThread"); 		
 		TCPmsgParserThread.start(); // (2) Start the thread.		
 	}
@@ -37,243 +34,209 @@ public class TCPmsgParser implements Runnable{
     public synchronized void clearITCPListeners() {
     	_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);
         }
     }
     
     
     private synchronized void _fireRecordingPlayReceivedEvent() {
         TCPEvent event = new TCPEvent( this, _msg );
-        
+
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onRecordingPlayReceived(event);
-            ( (ITCPListener) listeners.next()).onRecordingPlayReceived(event);
         }
     }
     
     
     public static synchronized void _fireTCPConnectionDownEvent(boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionDown(previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionDown(previuosWasConnectionUp);
         }
     }
     
     public static synchronized void _fireTCPConnectionUpEvent(boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionUp(previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionUp(previuosWasConnectionUp);
         }
     }
     
     
     public static synchronized void _fireonTCPConnectionStatusEvent(boolean isConnectionUp, boolean previuosWasConnectionUp) {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
-            ( (ITCPListener) listeners.next()).onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
         }
     }
     
     public static synchronized void _firePONGReceivedEvent() {
-        Iterator<ITCPListener> listeners = _listeners.iterator();
+        for (ITCPListener listener : _listeners) {
-        while( listeners.hasNext() ) {
+            listener.onPONGReceived();
-            ( (ITCPListener) listeners.next()).onPONGReceived();
         }
     }
     
     
 	@Override
-	public void run() 
+	public void run() {
-	{
+		while(run) {
-		while(run)
-		{
-			//SM.Debug("TCPmsgParser waiting for data...");
 			sleep(1);
 
-			if(TCPhandler.msgList==null)
+			if (TCPhandler.msgList == null)
 				continue;
-			if(!TCPhandler.msgList.isEmpty())
+			if(!TCPhandler.msgList.isEmpty()) {
-			{
+
-				try
+			    try {
-				{
 					_msg = TCPhandler.msgList.poll();
 					if(_msg == null)
 						continue;
-					if(_msg.OK == false)
+					if(!_msg.OK)
 						continue;
 					//parse the rest of the message;
 
+
 					switch(_msg.opCode)
 					{
                         case 40:  /* login */{
@@ -286,22 +249,21 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
+
                         case 42: /* Text Message */{
                             _fireSMSEvent();
                             break;
                         }
 
+
                         case 43: /* Last text message */ {
                             _fireLastSMSEvent();
                             break;
                         }
 
-                        case OperationCodes.TM_ACK:{
-                            _fireSMSconfirm();
-                            break;
-                        }
 
-                        case OperationCodes.TM_ACK_SD:{
+                        case OperationCodes.TM_ACK:
+                        case OperationCodes.TM_ACK_SD: {
                             _fireSMSconfirm();
                             break;
                         }
@@ -326,12 +288,13 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
+
                         case 50: /* radio */ {
                             _fireRadioEvent();
                             break;
                         }
 
-                        case 46: {
+                        case 46:{
                             _fireHistPos();
                             break;
                         }
@@ -341,11 +304,13 @@ public class TCPmsgParser implements Runnable{
                             break;
                         }
 
+
                         case 47: /* alert list */ {
                             _fireAlarmList();
                             break;
                         }
 
+
                         case 48: /* alert ack */ {
                             _fireAlarmACK();
                             break;
@@ -403,37 +368,27 @@ public class TCPmsgParser implements Runnable{
 
                         default:
                             break;
-					}
-				}
-				catch(Exception ex)
-				{
-					try {
-						if(TCPhandler.msgList.size() > 0)
-							_msg = TCPhandler.msgList.remove(0);
-					}
-					catch(NoSuchElementException exe)
-					{
-						SM.Exception("TCP msg Parser", "NoSuchElementException");
-					}
-				}
-			}
-		}
-		/*
-			catch (Exception e) 
-			{
-				SM.Debug("Error on fire Event:"+e.toString());
-				break;
-			}		
 
-		}*/
+                    }
+                }
+                catch(Exception ex) {
+                    try {
+                        if(TCPhandler.msgList.size() > 0)
+                            _msg = TCPhandler.msgList.remove(0);
+                    } catch(NoSuchElementException exe) {
+                        SM.Exception("TCP msg Parser", "NoSuchElementException");
+                    }
+                }
+            }
+		}
+
 		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 +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");
 	}
-
+}
-}

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/safedispatch/GoogleMapsInfoBubble.java

@@ -42,7 +42,6 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
     public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
         isLiveTab = false;
         this.context = context;
-//        this.superVehHash = vehicles;
         mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
     }
 
@@ -73,7 +72,7 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
             }
         } else {
             try {
-                position = Integer.getInteger(marker.getTitle());
+                position = Integer.parseInt(marker.getTitle());
             } catch (Exception e) {
                 Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
             }

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

@@ -100,6 +100,17 @@ 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);
+            }
+        });
+
         setDate();
     }
 

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

@@ -145,11 +145,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);
             }
         });
@@ -687,7 +687,7 @@ 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);
@@ -695,16 +695,16 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // check if all values are identical
         boolean identical = true;
         for (Boolean displ : displayedVehicles)
-            if (!Objects.equals(displ, displayedVehicles.get(0))) {
+            if (displ != displayedVehicles.get(0)) {
                 identical = false;
                 break;
             }
 
         // change image when all values are identical
-        if (identical && Boolean.TRUE.equals(displayedVehicles.get(0))) {
+        if (identical && displayedVehicles.get(0)) {
             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);
         }

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

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

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

@@ -88,7 +88,9 @@
 							</LinearLayout>
 			</LinearLayout>
 	</LinearLayout>
-
+
+
+
 	<RelativeLayout
 	    android:id="@+id/layoutNewMessage"
 	    android:layout_width="350dp"
@@ -113,7 +115,7 @@
 			    android:layout_width="wrap_content"
 			    android:layout_height="wrap_content"
 			    android:orientation="vertical"
-			    android:padding="3dp">
+			    android:padding="3dp">
 
 				<TextView
 					android:id="@+id/slideTabsText"

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