merge with develop

Reviewed-on: #5

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

@@ -155,12 +155,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 	}
 	
 	
-	public boolean sendAlarmAcknowledge(int alarm_id, int type)
+	public boolean sendAlarmAcknowledge(int alarm_id, int type, String unitName)
 	{
 		if(tcp == null) 
 			return false;
 		
-		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#");
+		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#" + AppParams.USERID + "#" + unitName + "#");
 		if(res)
 			SM.Debug("Message [sendAlarmAcknowledge] sent to app server alarm_id:" + alarm_id + " type:" + type);
 		else
@@ -198,12 +198,11 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 		return res;
 	}
 	
-	public boolean getHistoryPositions(int sc_id, long timeGMTStart, long timeGMTStop)
+	public boolean getHistoryPositions(int sc_id, long timeGMTStart, long timeGMTStop) {
-    {    	
 		if(tcp == null) 
 			return false;
 		
-		String histSeqID = "1."+Integer.toString((int) (System.currentTimeMillis() / 1000L));
+		String histSeqID = "1."+ (int) (System.currentTimeMillis() / 1000L);
 		boolean res = tcp.Write(histSeqID,"#26#"+sc_id+"#"+timeGMTStart+"#"+timeGMTStop+"#");
 		if(res)
 			SM.Debug("Message [getHistoryPositions] sent to app server");
@@ -213,8 +212,7 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 		return res;
     }
 	
-	public boolean getRadiosList()
+	public boolean getRadiosList() {
-    {    	
 		if(tcp == null) 
 			return false;
 		

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

@@ -6,7 +6,6 @@ import java.util.Calendar;
 import java.util.Hashtable;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,23 +18,21 @@ import com.safemobile.lib.Msg;
 import com.safemobile.lib.R;
 import com.safemobile.lib.SM;
 
-public class ConversationGridViewAdapter extends BaseAdapter
+public class ConversationGridViewAdapter extends BaseAdapter {
-{
+	private final ArrayList<Msg> listMessages;
-	private ArrayList<Msg> listMessages;
+	private final Activity activity;
-	private Activity activity;
+	private final ArrayList<Boolean> dispatcherPositions;
-	//public String time;
+	private final ArrayList<Boolean> ackPositions;
-	private ArrayList<Boolean> dispatcher_positions = new ArrayList<Boolean>();
+	private final Hashtable<Integer, View> hash = new Hashtable<>();
-	private ArrayList<Boolean> ackPositions = new ArrayList<Boolean>();
+
-	private Hashtable<Integer, View> hash = new Hashtable<Integer, View>(); 
+
-	
+	public ConversationGridViewAdapter(Activity activity, ArrayList<Msg> listMessages, ArrayList<Boolean> dispatcherPositions, ArrayList<Boolean> ackPositions) {
-	
-	public ConversationGridViewAdapter(Activity activity, ArrayList<Msg> listMessages, Context context, long sc_id, int unit_type, ArrayList<Boolean> dispatcher_positions, ArrayList<Boolean> ackPositions) {
 		this.activity = activity;
 		this.listMessages = listMessages;
-		this.dispatcher_positions = dispatcher_positions;
+		this.dispatcherPositions = dispatcherPositions;
-		this.ackPositions = ackPositions; 
+		this.ackPositions = ackPositions;
 	}
-	
+
 	@Override
 	public int getCount() {
 		return listMessages.size();
@@ -51,149 +48,230 @@ public class ConversationGridViewAdapter extends BaseAdapter
 		return 0;
 	}
 
-	public static class ViewHolder
+	public static class ViewHolder {
-	{
+		private ImageView imgViewContact;
-		public ImageView imgViewContact;
+		private TextView txtViewMsg;
-		public TextView txtViewMsg;
+		private TextView txtViewDateTime;
-		public TextView txtViewDateTime;
+		private ImageView imgViewReceivedContact;
-		public ImageView imgViewReceivedContact;
+		private TextView txtViewReceivedMsg;
-		public TextView txtViewReceivedMsg;
+		private TextView txtViewReceivedDateTime;
-		public TextView txtViewReceivedDateTime;
+		private ImageView imageAck;
-		public ImageView imageAck;
+		private TextView textViewNotACK;
-		public TextView textViewNotACK;
+		private LinearLayout layoutSend;
-		public LinearLayout layoutSend;
+		private LinearLayout layoutReceived;
-		public LinearLayout layoutReceived;
+
+		public ImageView getImgViewContact() {
+			return imgViewContact;
+		}
+
+		public void setImgViewContact(ImageView imgViewContact) {
+			this.imgViewContact = imgViewContact;
+		}
+
+		public TextView getTxtViewMsg() {
+			return txtViewMsg;
+		}
+
+		public void setTxtViewMsg(TextView txtViewMsg) {
+			this.txtViewMsg = txtViewMsg;
+		}
+
+		public TextView getTxtViewDateTime() {
+			return txtViewDateTime;
+		}
+
+		public void setTxtViewDateTime(TextView txtViewDateTime) {
+			this.txtViewDateTime = txtViewDateTime;
+		}
+
+		public ImageView getImgViewReceivedContact() {
+			return imgViewReceivedContact;
+		}
+
+		public void setImgViewReceivedContact(ImageView imgViewReceivedContact) {
+			this.imgViewReceivedContact = imgViewReceivedContact;
+		}
+
+		public TextView getTxtViewReceivedMsg() {
+			return txtViewReceivedMsg;
+		}
+
+		public void setTxtViewReceivedMsg(TextView txtViewReceivedMsg) {
+			this.txtViewReceivedMsg = txtViewReceivedMsg;
+		}
+
+		public TextView getTxtViewReceivedDateTime() {
+			return txtViewReceivedDateTime;
+		}
+
+		public void setTxtViewReceivedDateTime(TextView txtViewReceivedDateTime) {
+			this.txtViewReceivedDateTime = txtViewReceivedDateTime;
+		}
+
+		public ImageView getImageAck() {
+			return imageAck;
+		}
+
+		public void setImageAck(ImageView imageAck) {
+			this.imageAck = imageAck;
+		}
+
+		public TextView getTextViewNotACK() {
+			return textViewNotACK;
+		}
+
+		public void setTextViewNotACK(TextView textViewNotACK) {
+			this.textViewNotACK = textViewNotACK;
+		}
+
+		public LinearLayout getLayoutSend() {
+			return layoutSend;
+		}
+
+		public void setLayoutSend(LinearLayout layoutSend) {
+			this.layoutSend = layoutSend;
+		}
+
+		public LinearLayout getLayoutReceived() {
+			return layoutReceived;
+		}
+
+		public void setLayoutReceived(LinearLayout layoutReceived) {
+			this.layoutReceived = layoutReceived;
+		}
 	}
-	
+
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		ViewHolder view;
-		LayoutInflater inflator = activity.getLayoutInflater();
+		LayoutInflater inflater = activity.getLayoutInflater();
-		
+
-		if(convertView==null)
+		if (convertView == null) {
-		{
 			view = new ViewHolder();
-			convertView = inflator.inflate(R.layout.row_conversation, null);
+			convertView = inflater.inflate(R.layout.row_conversation, null);
-			
+
-			view.imgViewContact = (ImageView) convertView.findViewById(R.id.imageViewSenderIco);
+			view.setImgViewContact(convertView.findViewById(R.id.imageViewSenderIco));
-			view.txtViewMsg = (TextView) convertView.findViewById(R.id.textViewSendMsg);
+			view.setTxtViewMsg(convertView.findViewById(R.id.textViewSendMsg));
-			view.txtViewDateTime = (TextView) convertView.findViewById(R.id.textViewSendDate);
+			view.setTxtViewDateTime(convertView.findViewById(R.id.textViewSendDate));
-			view.imgViewReceivedContact = (ImageView) convertView.findViewById(R.id.imageViewReceivedIco);
+			view.setImgViewReceivedContact(convertView.findViewById(R.id.imageViewReceivedIco));
-			view.txtViewReceivedMsg = (TextView) convertView.findViewById(R.id.textViewReceivedMsg);
+			view.setTxtViewReceivedMsg(convertView.findViewById(R.id.textViewReceivedMsg));
-			view.txtViewReceivedDateTime = (TextView) convertView.findViewById(R.id.textViewReceivedDate);
+			view.setTxtViewReceivedDateTime(convertView.findViewById(R.id.textViewReceivedDate));
-			view.layoutSend = (LinearLayout) convertView.findViewById(R.id.layoutSend);
+			view.setLayoutSend(convertView.findViewById(R.id.layoutSend));
-			view.layoutReceived = (LinearLayout) convertView.findViewById(R.id.layoutReceived);
+			view.setLayoutReceived(convertView.findViewById(R.id.layoutReceived));
-			view.textViewNotACK = (TextView) convertView.findViewById(R.id.textViewNotACKSendMsg);
+			view.setTextViewNotACK(convertView.findViewById(R.id.textViewNotACK));
-			view.imageAck = (ImageView) convertView.findViewById(R.id.imageAck);
+			view.setImageAck(convertView.findViewById(R.id.imageAck));
-			
+
 			convertView.setTag(view);
-		}
+		} else {
-		else
-		{
 			view = (ViewHolder) convertView.getTag();
 		}
-		try
+		try {
-		{
 			hash.put(position, convertView);
-			
+
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm MMM-dd");
 			Calendar calendar = Calendar.getInstance();
-			calendar.set(Calendar.HOUR_OF_DAY,0);
+			calendar.set(Calendar.HOUR_OF_DAY, 0);
 			calendar.set(Calendar.MINUTE, 0);
 			calendar.set(Calendar.SECOND, 0);
 			calendar.set(Calendar.MILLISECOND, 0);
-			if(listMessages.get(position).received.after(calendar.getTime()))
+			if (listMessages.get(position).received.after(calendar.getTime()))
 				sdf = new SimpleDateFormat("HH:mm:ss");
 			else
 				sdf = new SimpleDateFormat("HH:mm MMM-dd");
-		
+
-		
+
-			//view.imgViewContact.setImageResource(getIcon(listMessages.get(position).from.user_type));
+			view.getImgViewContact().setImageResource(R.drawable.peoplegreen_large);
-			view.imgViewContact.setImageResource(R.drawable.peoplegreen_large);
+			view.getTxtViewMsg().setText(listMessages.get(position).message);
-			view.txtViewMsg.setText(listMessages.get(position).message);
+			view.getTxtViewDateTime().setText(sdf.format(listMessages.get(position).received));
-			view.txtViewDateTime.setText(sdf.format(listMessages.get(position).received));
+			view.getImgViewReceivedContact().setImageResource(listMessages.get(position).from.getLargeIcon());
-			//view.imgViewReceivedContact.setImageResource(getIcon(listMessages.get(position).from.user_type));
+			view.getTxtViewReceivedMsg().setText(listMessages.get(position).message);
-			view.imgViewReceivedContact.setImageResource(listMessages.get(position).from.getLargeIcon());
+			view.getTxtViewReceivedDateTime().setText(sdf.format(listMessages.get(position).received));
-			view.txtViewReceivedMsg.setText(listMessages.get(position).message);
+
-			view.txtViewReceivedDateTime.setText(sdf.format(listMessages.get(position).received));
+			if (!ackPositions.isEmpty())
-			
+				switch (Boolean.TRUE.equals(ackPositions.get(position)) ? 1 : 0) {
-			if(ackPositions.size() > 0)
+					case 0:
-				switch(ackPositions.get(position) ? 1: 0) {
+						// show not ack
-				case 0:
+						view.getTextViewNotACK().setVisibility(View.VISIBLE);
-					// show not ack
+						view.getImageAck().setVisibility(View.VISIBLE);
-					view.textViewNotACK.setVisibility(View.VISIBLE);
+						break;
-					view.imageAck.setVisibility(View.VISIBLE);
+					case 1:
-					break;
+						// show not ack
-				case 1:
+						view.getTextViewNotACK().setVisibility(View.INVISIBLE);
-					// show not ack
+						view.getImageAck().setVisibility(View.INVISIBLE);
-					view.textViewNotACK.setVisibility(View.INVISIBLE);
+						break;
-					view.imageAck.setVisibility(View.INVISIBLE);
+					default:
+						throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(ackPositions.get(position)) ? 1 : 0));
 				}
-			
+
-			switch(dispatcher_positions.get(position) ? 1 : 0) {
+			switch (Boolean.TRUE.equals(dispatcherPositions.get(position)) ? 1 : 0) {
-		    case 1:
+				case 1:
-		    	view.layoutReceived.setVisibility(View.GONE);
+					view.getLayoutReceived().setVisibility(View.GONE);
-		    	view.layoutSend.setVisibility(View.VISIBLE);
+					view.getLayoutSend().setVisibility(View.VISIBLE);
-		        break;
+					break;
-		    case 0:
+				case 0:
-		    	view.layoutReceived.setVisibility(View.VISIBLE);
+					view.getLayoutReceived().setVisibility(View.VISIBLE);
-		    	view.layoutSend.setVisibility(View.GONE);
+					view.getLayoutSend().setVisibility(View.GONE);
-		        break;
+					break;
-		    }
+				default:
-		}
+					throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(dispatcherPositions.get(position)) ? 1 : 0));
-		catch(Exception ex)
+			}
-		{
+		} catch (Exception ex) {
 			SM.Exception(ex.toString());
 		}
 		return convertView;
 	}
-	
+
-	public void setACK(String seqID)
+	public void setACK(String seqID) {
-	{
+		int position = -1;
-		int position = -1, i=0;
+		int i = 0;
-		
+
-		for(Msg msg: listMessages)
+		for (Msg msg : listMessages) {
-		{
+			if (msg.seqID.equals(seqID))
-			if(msg.seqID.equals(seqID))
 				position = i;
-			
+
 			i++;
 		}
-			
+
-		if(position > -1 && position < ackPositions.size()) {
+		if (position > -1 && position < ackPositions.size()) {
 			ackPositions.remove(position);
 			ackPositions.add(position, true);
 		}
 	}
-	
+
-	public void changeView(String seqID)
+	public void changeView(String seqID) {
-	{
+		int position = -1;
-		int position = -1, i=0;
+		int i = 0;
-		
+
-		for(Msg msg: listMessages)
+		for (Msg msg : listMessages) {
-		{
+			if (msg.seqID.equals(seqID))
-			if(msg.seqID.equals(seqID))
 				position = i;
-			
+
 			i++;
 		}
-			
+
-		if(position != -1 && hash.size() > position)
+		if (position != -1 && hash.size() > position) {
-		{
 			SM.Debug("POSITON : " + position);
 			View con = hash.get(position);
-			ViewHolder view = (ViewHolder) con.getTag();
+			ViewHolder view = null;
-			
+			if (con != null) {
-			switch(ackPositions.get(position) ? 1 : 0)
+				view = (ViewHolder) con.getTag();
-			{
+			}
+
+			switch (Boolean.TRUE.equals(ackPositions.get(position)) ? 1 : 0) {
 				case 1:
-					view.imageAck.setVisibility(View.INVISIBLE);
+					if (view != null) {
-					view.textViewNotACK.setVisibility(View.INVISIBLE);
+						view.getImageAck().setVisibility(View.INVISIBLE);
+						view.getTextViewNotACK().setVisibility(View.INVISIBLE);
+					}
 					break;
 				case 0:
-					view.imageAck.setVisibility(View.VISIBLE);
+					if (view != null) {
-					view.textViewNotACK.setVisibility(View.VISIBLE);
+						view.getImageAck().setVisibility(View.VISIBLE);
+						view.getTextViewNotACK().setVisibility(View.VISIBLE);
+					}
 					break;
+				default:
+					throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(ackPositions.get(position)) ? 1 : 0));
 			}
 		}
 	}

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

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,20 +17,16 @@ import com.safemobile.lib.Msg;
 import com.safemobile.lib.R;
 import com.safemobile.lib.SM;
 
-public class MessagesGridViewAdapter extends BaseAdapter
+public class MessagesGridViewAdapter extends BaseAdapter {
-{
+	private final ArrayList<Msg> listMessages;
-	private ArrayList<Msg> listMessages;
+	private final Activity activity;
-	private Activity activity;
+
-	//public String time;
+	public MessagesGridViewAdapter(Activity activity, ArrayList<Msg> listMessages) {
-	//private int[] colors = new int[] { Color.parseColor("#FFFFFF"), Color.parseColor("#D2E4FC") };  
-	
-	
-	public MessagesGridViewAdapter(Activity activity, ArrayList<Msg> listMessages, Context context) {
 		super();
 		this.activity = activity;
 		this.listMessages = listMessages;
 	}
-	
+
 	@Override
 	public int getCount() {
 		return listMessages.size();
@@ -47,86 +42,58 @@ public class MessagesGridViewAdapter extends BaseAdapter
 		return 0;
 	}
 
-	public static class ViewHolder
+	public static class ViewHolder {
-	{
 		public ImageView imgViewContact;
 		public TextView txtViewContact;
 		public TextView txtViewDateTime;
 		public TextView txtViewLastMsg;
 		public LinearLayout layoutMessage;
 	}
-	
+
-	
+
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		ViewHolder view;
 		LayoutInflater inflator = activity.getLayoutInflater();
-		
+
-		if(convertView==null)
+		if (convertView == null) {
-		{
 			view = new ViewHolder();
 			convertView = inflator.inflate(R.layout.row_message, null);
-			
+
-			view.imgViewContact = (ImageView) convertView.findViewById(R.id.imageViewContact);
+			view.imgViewContact = convertView.findViewById(R.id.imageViewContact);
-			view.txtViewContact = (TextView) convertView.findViewById(R.id.textViewContact);
+			view.txtViewContact = convertView.findViewById(R.id.textViewContact);
-			view.txtViewDateTime = (TextView) convertView.findViewById(R.id.textViewLastDate);
+			view.txtViewDateTime = convertView.findViewById(R.id.textViewLastDate);
-			view.txtViewLastMsg = (TextView) convertView.findViewById(R.id.textViewLastMsg);
+			view.txtViewLastMsg = convertView.findViewById(R.id.textViewLastMsg);
-			view.layoutMessage = (LinearLayout) convertView.findViewById(R.id.layoutMessage);
+			view.layoutMessage = convertView.findViewById(R.id.layoutMessage);
-			
+
 			convertView.setTag(view);
-		}
+		} else {
-		else
-		{
 			view = (ViewHolder) convertView.getTag();
 		}
-		
+
-		try
+		try {
-		{
 			view.imgViewContact.setImageResource(listMessages.get(position).from.getLargeIcon());
-			//view.imgViewContact.setImageResource(R.drawable.peopleblue);
+			view.txtViewContact.setText(String.format("%s :", listMessages.get(position).from.name));
-			view.txtViewContact.setText(listMessages.get(position).from.name+ " :");
+			if (listMessages.get(position).message.length() > 25)
-			if(listMessages.get(position).message.length() > 25)
+				view.txtViewLastMsg.setText(String.format("%s...", listMessages.get(position).message.substring(0, 25)));
-				view.txtViewLastMsg.setText(listMessages.get(position).message.substring(0, 25) + "...");
 			else
 				view.txtViewLastMsg.setText(listMessages.get(position).message);
-			
+
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
 			Calendar calendar = Calendar.getInstance();
-			calendar.set(Calendar.HOUR_OF_DAY,0);
+			calendar.set(Calendar.HOUR_OF_DAY, 0);
 			calendar.set(Calendar.MINUTE, 0);
 			calendar.set(Calendar.SECOND, 0);
 			calendar.set(Calendar.MILLISECOND, 0);
-			if(listMessages.get(position).received.after(calendar.getTime()))
+			if (listMessages.get(position).received.after(calendar.getTime()))
 				sdf = new SimpleDateFormat("HH:mm:ss");
 			else
 				sdf = new SimpleDateFormat("MMM-dd HH:mm");
-			
+
 			view.txtViewDateTime.setText(sdf.format(listMessages.get(position).received));
-		}
+		} catch (Exception ex) {
-		catch(Exception ex)
-		{
 			SM.Exception(ex.toString());
 		}
 		return convertView;
 	}
-	
-	public int getIcon(int user_type, String username)
-	{
-		// if request was send by MessagesActivity -> Spinner
-		if(user_type == -1)
-		{
-			// get unit_type for selected username
-			for (Msg mes: listMessages)
-			{
-				// if user is selected
-				if(mes.from.name.equals(username))
-				{
-					user_type = (int) mes.from.driver_id;	// save user_type
-					
-					return mes.from.getLargeIcon();
-				}
-			}
-		}		
-		return 0;
-	}
 }

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

@@ -1,215 +0,0 @@
-package com.safemobile.adapters;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Locale;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.safemobile.lib.R;
-import com.safemobile.lib.SM;
-import com.safemobile.libpad.PadTextMessage;
-
-public class PadConversationGridViewAdapter extends BaseAdapter
-{
-	private ArrayList<PadTextMessage> listMessages;
-	private Activity activity;
-	//public String time;
-	private ArrayList<Boolean> outgoingPositions = new ArrayList<Boolean>();
-	private ArrayList<Boolean> ackPositions = new ArrayList<Boolean>();
-	private Hashtable<Integer, View> hash = new Hashtable<Integer, View>(); 
-	
-	
-	public PadConversationGridViewAdapter(Activity activity, ArrayList<PadTextMessage> listMessages, Context context, ArrayList<Boolean> outgoingPositions, ArrayList<Boolean> ackPositions) {
-		this.activity = activity;
-		this.listMessages = listMessages;
-		this.outgoingPositions = outgoingPositions;
-		this.ackPositions = ackPositions; 
-	}
-	
-	@Override
-	public int getCount() {
-		return listMessages.size();
-	}
-
-	@Override
-	public PadTextMessage getItem(int position) {
-		return listMessages.get(position);
-	}
-
-	@Override
-	public long getItemId(int position) {
-		return 0;
-	}
-
-	/** return the list of messages in the adapter 
-	 * @return an ArrayList of PadTextMessages
-	 */
-	public ArrayList<PadTextMessage> getMessages() {
-		return listMessages;
-	}
-	
-	public static class ViewHolder
-	{
-		public ImageView imgViewContact;
-		public TextView txtViewMsg;
-		public TextView txtViewDateTime;
-		public ImageView imgViewReceivedContact;
-		public TextView txtViewReceivedMsg;
-		public TextView txtViewReceivedDateTime;
-		public ImageView imageAck;
-		public TextView textViewNotACK;
-		public LinearLayout layoutSend;
-		public LinearLayout layoutReceived;
-	}
-	
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		ViewHolder view;
-		LayoutInflater inflator = activity.getLayoutInflater();
-		
-		if(convertView==null)
-		{
-			view = new ViewHolder();
-			convertView = inflator.inflate(R.layout.row_conversation, null);
-			
-			view.imgViewContact = (ImageView) convertView.findViewById(R.id.imageViewSenderIco);
-			view.txtViewMsg = (TextView) convertView.findViewById(R.id.textViewSendMsg);
-			view.txtViewDateTime = (TextView) convertView.findViewById(R.id.textViewSendDate);
-			view.imgViewReceivedContact = (ImageView) convertView.findViewById(R.id.imageViewReceivedIco);
-			view.txtViewReceivedMsg = (TextView) convertView.findViewById(R.id.textViewReceivedMsg);
-			view.txtViewReceivedDateTime = (TextView) convertView.findViewById(R.id.textViewReceivedDate);
-			view.layoutSend = (LinearLayout) convertView.findViewById(R.id.layoutSend);
-			view.layoutReceived = (LinearLayout) convertView.findViewById(R.id.layoutReceived);
-			view.textViewNotACK = (TextView) convertView.findViewById(R.id.textViewNotACKSendMsg);
-			view.imageAck = (ImageView) convertView.findViewById(R.id.imageAck);
-			
-			convertView.setTag(view);
-		}
-		else
-		{
-			view = (ViewHolder) convertView.getTag();
-		}
-		try
-		{
-			hash.put(position, convertView);
-			
-			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm MMM-dd", Locale.getDefault());
-			Calendar calendar = Calendar.getInstance();
-			calendar.set(Calendar.HOUR_OF_DAY,0);
-			calendar.set(Calendar.MINUTE, 0);
-			calendar.set(Calendar.SECOND, 0);
-			calendar.set(Calendar.MILLISECOND, 0);
-			
-			Date date = new Date(listMessages.get(position).timeGMT * 1000);
-			
-			if(date.after(calendar.getTime()))
-				sdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
-			else
-				sdf = new SimpleDateFormat("HH:mm MMM-dd", Locale.getDefault());
-		
-			// set gmt time
-			//sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-			
-			//view.imgViewContact.setImageResource(getIcon(listMessages.get(position).from.user_type));
-			view.imgViewContact.setImageResource(R.drawable.peoplegreen_large);
-			view.txtViewMsg.setText(listMessages.get(position).message);
-			view.txtViewDateTime.setText(sdf.format(date));
-			//view.imgViewReceivedContact.setImageResource(getIcon(listMessages.get(position).from.user_type));
-			view.imgViewReceivedContact.setImageResource(R.drawable.peopleblue_large);
-			view.txtViewReceivedMsg.setText(listMessages.get(position).message);
-			
-			view.txtViewReceivedDateTime.setText(sdf.format(date));
-			
-			if(ackPositions.size() > 0)
-				switch(ackPositions.get(position) ? 1: 0) {
-				case 0:
-					// show not ack
-					view.textViewNotACK.setVisibility(View.VISIBLE);
-					view.imageAck.setVisibility(View.VISIBLE);
-					break;
-				case 1:
-					// show not ack
-					view.textViewNotACK.setVisibility(View.INVISIBLE);
-					view.imageAck.setVisibility(View.INVISIBLE);
-				}
-			
-			switch(outgoingPositions.get(position) ? 1 : 0) {
-		    case 1:
-		    	view.layoutReceived.setVisibility(View.GONE);
-		    	view.layoutSend.setVisibility(View.VISIBLE);
-		        break;
-		    case 0:
-		    	view.layoutReceived.setVisibility(View.VISIBLE);
-		    	view.layoutSend.setVisibility(View.GONE);
-		        break;
-		    }
-		}
-		catch(Exception ex)
-		{
-			SM.Exception(ex.toString());
-		}
-		return convertView;
-	}
-	
-	/*
-	public void setACK(String seqID)
-	{
-		int position = -1, i=0;
-		
-		for(Msg msg: listMessages)
-		{
-			if(msg.seqID.equals(seqID))
-				position = i;
-			
-			i++;
-		}
-			
-		ackPositions.remove(position);
-		ackPositions.add(position, true);
-	}
-	
-	public void changeView(String seqID)
-	{
-		int position = -1, i=0;
-		
-		for(Msg msg: listMessages)
-		{
-			if(msg.seqID.equals(seqID))
-				position = i;
-			
-			i++;
-		}
-			
-		if(position != -1 && hash.size() > position)
-		{
-			SM.Debug("POSITON : " + position);
-			View con = hash.get(position);
-			ViewHolder view = (ViewHolder) con.getTag();
-			
-			switch(ackPositions.get(position) ? 1 : 0)
-			{
-				case 1:
-					view.imageAck.setVisibility(View.INVISIBLE);
-					view.textViewNotACK.setVisibility(View.INVISIBLE);
-					break;
-				case 0:
-					view.imageAck.setVisibility(View.VISIBLE);
-					view.textViewNotACK.setVisibility(View.VISIBLE);
-					break;
-			}
-		}
-	}
-	*/
-}

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

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="fill_parent"
+	android:layout_width="fill_parent"
-    android:orientation="vertical"
+	android:layout_height="fill_parent"
-    android:background="#ffffff"
+	android:orientation="vertical"
-    android:paddingTop="5dp"
+	android:background="#ffffff"
-    android:paddingBottom="5dp">
+	android:paddingTop="5dp"
-    <LinearLayout
+	android:paddingBottom="5dp">
-        android:id="@+id/layoutSend"
+	<LinearLayout
+		android:id="@+id/layoutSend"
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
 		android:paddingRight="13dp"
@@ -19,147 +20,151 @@
 			android:background="#ffffff"
 			android:layout_marginLeft="5dp"
 			android:layout_weight="0">
-		    <ImageView
+			<ImageView
-		        android:id="@+id/imageViewSenderIco"
+				android:id="@+id/imageViewSenderIco"
-		        android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-		        android:src="@drawable/ambulance_large"
+				android:src="@drawable/ambulance_large"
-		        android:adjustViewBounds="true"
+				android:adjustViewBounds="true"
-		        android:scaleType="center"
+				android:scaleType="center"
-		        android:background="#ffffff"
+				android:background="#ffffff"
-		        android:layout_margin="3dp"
+				android:layout_margin="3dp"
-		        android:layout_gravity="top"
+				android:layout_gravity="top"
-		        android:layout_weight="0" />
+				android:layout_weight="0" />
 		</LinearLayout>
-    <LinearLayout 
+		<LinearLayout
-    	    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-    	    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    	    android:layout_marginLeft="10dp"
+			android:layout_marginLeft="10dp"
-		    android:layout_marginRight="10dp"
+			android:layout_marginRight="10dp"
-		    android:padding="5dp"
+			android:padding="5dp"
-		    android:layout_gravity="center_vertical"
+			android:layout_gravity="center_vertical"
-		    android:background="@layout/row_conversation_style_send"
+			android:background="@layout/row_conversation_style_send"
-		    android:orientation="vertical"
+			android:orientation="vertical"
-		    android:layout_weight="1" >
+			android:layout_weight="1" >
 
-   	        <TextView
+			<TextView
-   	            android:id="@+id/textViewSendMsg"
+				android:id="@+id/textViewSendMsg"
-   	            android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-   	            android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-   	            android:text="Medium Text"
+				android:text="Medium Text"
-   	            android:textColor="#000000"
+				android:textColor="#000000"
-   	            android:textSize="16dp" />
+				android:textSize="16dp" />
-    	 <RelativeLayout 
+			<RelativeLayout
-    	      android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	      android:layout_height="wrap_content">
+				android:layout_height="wrap_content">
-    	      <ImageView
+				<ImageView
-			        android:id="@+id/imageAckSendMsg"
+					android:id="@+id/imageAck"
-			        android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			        android:adjustViewBounds="true"
+					android:adjustViewBounds="true"
-			        android:scaleType="center"
+					android:scaleType="center"
-			        android:paddingTop="2dp"
+					android:paddingTop="2dp"
-			        android:src="@drawable/exclamation_small"
+					android:src="@drawable/exclamation_small"
-			        android:layout_weight="0"
+					android:layout_weight="0"
-			        android:visibility="invisible"/>
+					android:visibility="invisible"
-    	      <TextView
+					tools:ignore="DuplicateIds" />
-   	            android:id="@+id/textViewNotACKSendMsg"
+				<TextView
-   	            android:layout_width="fill_parent"
+					android:id="@+id/textViewNotACK"
-   	            android:layout_height="wrap_content"
+					android:layout_width="fill_parent"
-   	            android:text="@string/notAck"
+					android:layout_height="wrap_content"
-   	            android:textColor="#000000"
+					android:text="@string/notAck"
-   	           android:textSize="13dp"
+					android:textColor="#000000"
-   	            android:layout_toRightOf="@+id/imageAck"
+					android:textSize="13dp"
-   	            android:visibility="invisible" />
+					android:layout_toRightOf="@+id/imageAck"
-    	    <TextView
+					android:visibility="invisible"
-    	        android:id="@+id/textViewSendDate"
+					tools:ignore="DuplicateIds" />
-    	        android:layout_width="wrap_content"
+				<TextView
-    	        android:layout_height="wrap_content"
+					android:id="@+id/textViewSendDate"
-    	        android:layout_gravity="right"
+					android:layout_width="wrap_content"
-    	        android:text="Small Text"
+					android:layout_height="wrap_content"
-    	        android:textColor="#4c4c4c"
+					android:layout_gravity="right"
-    	        android:textSize="13dp"
+					android:text="Small Text"
-    	        android:layout_alignParentRight="true"/>
+					android:textColor="#4c4c4c"
-    	    </RelativeLayout>
+					android:textSize="13dp"
-    	</LinearLayout>
+					android:layout_alignParentRight="true"/>
+			</RelativeLayout>
+		</LinearLayout>
 	</LinearLayout>
-    
+
-    <LinearLayout
+	<LinearLayout
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
 		android:paddingLeft="13dp"
 		android:layout_weight="0"
 		android:orientation="horizontal"
 		android:id="@+id/layoutReceived">
-    <LinearLayout 
+		<LinearLayout
-    	    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-    	    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    	    android:layout_marginLeft="10dp"
+			android:layout_marginLeft="10dp"
-		    android:layout_marginRight="10dp"
+			android:layout_marginRight="10dp"
-		    android:padding="5dp"
+			android:padding="5dp"
-		    android:layout_gravity="center_vertical"
+			android:layout_gravity="center_vertical"
-		    android:background="@layout/row_conversation_style_rec"
+			android:background="@layout/row_conversation_style_rec"
-		    android:orientation="vertical"
+			android:orientation="vertical"
-		    android:layout_weight="1" >
+			android:layout_weight="1" >
 
-    	   <TextView
+			<TextView
-   	            android:id="@+id/textViewReceivedMsg"
+				android:id="@+id/textViewReceivedMsg"
-   	            android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-   	            android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-   	            android:text="Medium Text"
+				android:text="Medium Text"
-   	            android:textColor="#000000"
+				android:textColor="#000000"
-   	            android:textSize="16dp" />
+				android:textSize="16dp" />
-    	  <RelativeLayout 
+			<RelativeLayout
-    	      android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	      android:layout_height="wrap_content">
+				android:layout_height="wrap_content">
-    	      <ImageView
+				<ImageView
-			        android:id="@+id/imageAckReceiveMsg"
+					android:id="@+id/imageAck"
-			        android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			        android:adjustViewBounds="true"
+					android:adjustViewBounds="true"
-			        android:scaleType="center"
+					android:scaleType="center"
-			        android:paddingTop="2dp"
+					android:paddingTop="2dp"
-			        android:src="@drawable/exclamation_small"
+					android:src="@drawable/exclamation_small"
-			        android:layout_weight="0"
+					android:layout_weight="0"
-			        android:visibility="invisible"/>
+					android:visibility="invisible"
-    	      <TextView
+					tools:ignore="DuplicateIds" />
-   	            android:id="@+id/textViewNotACKReceiveMsg"
+				<TextView
-   	            android:layout_width="fill_parent"
+					android:id="@+id/textViewNotACK"
-   	            android:layout_height="wrap_content"
+					android:layout_width="fill_parent"
-   	            android:text="@string/notAck"
+					android:layout_height="wrap_content"
-   	            android:textColor="#000000"
+					android:text="@string/notAck"
-   	            android:textSize="13dp"
+					android:textColor="#000000"
-   	            android:layout_toRightOf="@+id/imageAck" 
+					android:textSize="13dp"
-   	            android:visibility="invisible"/>
+					android:layout_toRightOf="@+id/imageAck"
-    	    <TextView
+					android:visibility="invisible"
-    	        android:id="@+id/textViewReceivedDate"
+					tools:ignore="DuplicateIds" />
-    	        android:layout_width="wrap_content"
+				<TextView
-    	        android:layout_height="wrap_content"
+					android:id="@+id/textViewReceivedDate"
-    	        android:layout_gravity="right"
+					android:layout_width="wrap_content"
-    	        android:text="Small Text"
+					android:layout_height="wrap_content"
-    	        android:textColor="#4c4c4c"
+					android:layout_gravity="right"
-    	        android:textSize="13dp"
+					android:text="Small Text"
-    	        android:layout_alignParentRight="true"/>
+					android:textColor="#4c4c4c"
-    	    </RelativeLayout>
+					android:textSize="13dp"
-    	</LinearLayout>
+					android:layout_alignParentRight="true"/>
-    	<LinearLayout
+			</RelativeLayout>
+		</LinearLayout>
+		<LinearLayout
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
 			android:background="#ffffff"
 			android:layout_marginRight="5dp"
 			android:layout_weight="0">
-	    	<ImageView
+			<ImageView
-			        android:id="@+id/imageViewReceivedIco"
+				android:id="@+id/imageViewReceivedIco"
-			        android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-			        android:adjustViewBounds="true"
+				android:adjustViewBounds="true"
-			        android:scaleType="center"
+				android:scaleType="center"
-			        android:src="@drawable/error"
+				android:src="@drawable/error"
-			        android:background="#ffffff"
+				android:background="#ffffff"
-			        android:layout_margin="3dp"
+				android:layout_margin="3dp"
-			        android:layout_weight="0"
+				android:layout_weight="0"
-			        android:layout_gravity="top" 
+				android:layout_gravity="top"
-			        />
+				/>
-    	</LinearLayout>
+		</LinearLayout>
 	</LinearLayout>
 </LinearLayout>

safeDispatch/build.gradle

@@ -1,5 +1,24 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
+apply plugin: "com.gladed.androidgitversion"
+
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        mavenCentral()
+    }
+    dependencies {
+        classpath "gradle.plugin.com.gladed.gradle.androidgitversion:gradle-android-git-version:0.4.3"
+    }
+}
+
+androidGitVersion {
+    codeFormat 'MNNBBBB'
+    format '%tag%%.count%'
+    hideBranches = ['develop']
+}
 
 android {
     compileSdkVersion 31
@@ -9,6 +28,9 @@ android {
         applicationId "com.safemobile.dispatch"
         minSdkVersion 21
         targetSdkVersion 31
+        versionName androidGitVersion.name()
+        versionCode androidGitVersion.code()
+        archivesBaseName = "SafeDispatchMobile_v.$versionName"
     }
 
     buildTypes {

safeDispatch/src/main/AndroidManifest.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.safemobile.dispatch"
+    package="com.safemobile.dispatch">
-    android:versionCode="9"
-    android:versionName="1.0.9">
 
     <!-- require OpenGL ES version 2 for Google Maps -->
     <uses-feature

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

@@ -3,7 +3,6 @@ package com.safemobile.dispatch;
 import java.util.ArrayList;
 import java.util.Locale;
 
-/** fix import*/
 import com.safemobile.adapters.AlertGridViewAdapter;
 import com.safemobile.adapters.AlertGridViewAdapter.ViewHolder;
 
@@ -15,11 +14,11 @@ import com.safemobile.lib.SM;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.TextView;
@@ -28,232 +27,213 @@ import android.widget.GridView;
 
 public class AlarmActivity extends Activity {
 	private Context context;
-	public TabLayoutActivity parentTab;
+	private TabLayoutActivity parentTab;
-	public ArrayList<Alarm> allAlarms = new ArrayList<Alarm>();
+	private ArrayList<Alarm> allAlarms = new ArrayList<>();
-	private ArrayList<Boolean> acknowledged = new ArrayList<Boolean>();
+	private ArrayList<Boolean> acknowledged = new ArrayList<>();
 	private AlertGridViewAdapter adapter;
-	
+
 	/* Visual resources */
 	private GridView gridView;
-	public View convertViewAlarm;
+	private View convertViewAlarm;
-	
-	private int ack_position;
-	
-	public Bundle savedInstanceState;
-	
-	// Need handler for callbacks to the UI thread
-    private final Handler myHandler = new Handler();
-	
-	 /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        this.savedInstanceState = savedInstanceState;
-        // get parentTab
-    	parentTab = (TabLayoutActivity)getParent();
-    	
-    	Locale locale = new Locale(AppParams.LANGUAGETMP);
-        Locale.setDefault(locale);
-        Configuration config = new Configuration();
-        config.locale = locale;
-        getBaseContext().getResources().updateConfiguration(config,
-        getBaseContext().getResources().getDisplayMetrics());
-        
-    	
-    	context = this;
-        setContentView(R.layout.tabalarm);
 
-        gridView = (GridView) findViewById(R.id.gridViewAlarms);
+	private int ackPosition;
-        adapter = new AlertGridViewAdapter(this, allAlarms, context, acknowledged);
+	private Bundle savedInstanceState;
-        gridView.setAdapter(adapter);
+
-      
+	// Need handler for callbacks to the UI thread
-        gridView.setOnItemClickListener(onItemClickListener);
+	private final Handler myHandler = new Handler(Looper.getMainLooper());
-        
+
-     // change tab header fontface
+	private static final String ALARM = "alarm";
-        TextView textView1 = (TextView) findViewById(R.id.textView1);
+
-        textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
+	/**
-        textView1.setTextSize(24);
+	 * Called when the activity is first created.
-        
+	 */
-        parentTab.alarmActivity = this;
+	@Override
-    }
+	public void onCreate(Bundle savedInstanceState) {
-    
+		super.onCreate(savedInstanceState);
-    @Override
+
-    public void onBackPressed()
+		this.setSavedInstanceState(savedInstanceState);
-    {
+		// get parentTab
-    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		setParentTab((TabLayoutActivity) getParent());
-    	builder.setMessage(getString(R.string.exit))
+
-    	       .setCancelable(false)
+		Locale locale = new Locale(AppParams.LANGUAGETMP);
-    	       .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
+		Locale.setDefault(locale);
-    	           public void onClick(DialogInterface dialog, int id) {
+		Configuration config = new Configuration();
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.logout);
+		config.locale = locale;
-    	           }
+		getBaseContext().getResources().updateConfiguration(config,
-    	       })
+				getBaseContext().getResources().getDisplayMetrics());
-    	       .setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() {
+
-    	           public void onClick(DialogInterface dialog, int id) {
+		context = this;
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.exit);
+		setContentView(R.layout.tabalarm);
-    	           }
+
-    	       })
+		gridView = findViewById(R.id.gridViewAlarms);
-    	       .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+		adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
-    	           public void onClick(DialogInterface dialog, int id) {
+		gridView.setAdapter(adapter);
-    	                dialog.cancel();
+
-    	           }
+		gridView.setOnItemClickListener(onItemClickListener);
-    	       });
+
-    	AlertDialog alert = builder.create();
+		// change tab header fontFace
-    	alert.show();
+		TextView textView1 = findViewById(R.id.textView1);
-    }
+		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
-    
+		textView1.setTextSize(24);
-    @Override
+
-    public void onPause()
+		getParentTab().alarmActivity = this;
-    {
+	}
-    	super.onPause();
+
-    	SM.Debug("onPause");
+	@Override
-    }
+	public void onBackPressed() {
-    
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    @Override
+		builder.setMessage(getString(R.string.exit))
-    public void onResume()
+				.setCancelable(false)
-    {
+				.setNeutralButton(getString(R.string.logout), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.logout))
-    	super.onResume();
+				.setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit))
-    	if(!AppParams.DEMO)
+				.setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
-    		GetAlarms();
+		AlertDialog alert = builder.create();
-    	else if (AppParams.DEMO)
+		alert.show();
-    	{
+	}
-    		for(int i=allAlarms.size()-1; i>=0; i--)
+
-    		{
+	@Override
-    			Alarm alarm = allAlarms.get(i);
+	public void onPause() {
-    			if(alarm.ack==1)
+		super.onPause();
-    				allAlarms.remove(i);
+		SM.Debug("onPause");
-    		}
+	}
-    		
+
-    		acknowledged = new ArrayList<Boolean>();
+	@Override
-    		
+	public void onResume() {
-    		for(int i=0;i<allAlarms.size();i++)
+		super.onResume();
-    			acknowledged.add(false);
+		if (!AppParams.DEMO)
-    		updateResultsInUi("alarm");
+			getAlarms();
-    	}
+		else {
-    	SM.Debug("onResume");
+			for (int i = getAllAlarms().size() - 1; i >= 0; i--) {
-    }
+				Alarm alarm = getAllAlarms().get(i);
-    
+				if (alarm.ack == 1)
-    
+					getAllAlarms().remove(i);
-    private OnItemClickListener onItemClickListener = new OnItemClickListener() {
+			}
+
+			acknowledged = new ArrayList<>();
+
+			for (int i = 0; i < getAllAlarms().size(); i++)
+				acknowledged.add(false);
+			updateResultsInUi(ALARM);
+		}
+		SM.Debug("onResume");
+	}
+
+
+	private final OnItemClickListener onItemClickListener = new OnItemClickListener() {
 
 		@Override
 		public void onItemClick(AdapterView<?> arg0, View arg1, int position,
-				long arg3) {
+								long arg3) {
 			SM.Debug(" ### CLICK Alarm : " + position);
-			convertViewAlarm = arg1;
+			setConvertViewAlarm(arg1);
 			// save position 
-			ack_position = position;
+			ackPosition = position;
-			//Toast.makeText(context, "SETACK " + idx, 1000).show();
+			if (!AppParams.DEMO)
-			if(!AppParams.DEMO)
+				setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName);
-				setACK(allAlarms.get(position).idx,allAlarms.get(position).type);
+			else {
-			else
+				getAllAlarms().get(position).ack = 1;
-			{
-				allAlarms.get(position).ack = 1;
 				updateResultsInUi("else");
 			}
 		}
+
+		// send ACK to AppServer
+		private void setACK(int idx, int type, String unitName) {
+			getParentTab().executeNetworkStuff(new String[]{OperationCodes.SendAlarmAcknoledge + "", idx + "", type + "", unitName});
+		}
 	};
-    
+
-    // Update Alarms received from AppServer 
+	// Update Alarms received from AppServer
-    public void UpdateAlarms(ArrayList<Alarm> list)
+	public void updateAlarms(ArrayList<Alarm> list) {
-    {
+		SM.Debug("## updateAlarms: " + list.size());
-    	SM.Debug("## UpdateAlarms: " + list.size());
+		setAllAlarms(list);
-		allAlarms = list;
+		acknowledged = new ArrayList<>();
-		acknowledged = new ArrayList<Boolean>();
 		// set acknowledged based on alarm.ack value
-		
-		for(Alarm alarm: allAlarms)
-		{
-			acknowledged.add((alarm.ack == 1)? true: false);
-			SM.Debug("ALARM", "SC_ID> " + alarm.sc_id +  "   |  " 
-					+ (parentTab.getVehHashByScId().get(alarm.sc_id) == null ? "null" : parentTab.getVehHashByScId().get(alarm.sc_id).name ));
-			
-			
-			if (parentTab.getVehHashByScId().get(alarm.sc_id)!=null)
-				alarm.unitName = parentTab.getVehHashByScId().get(alarm.sc_id).name;
-			
-			
-			
-	        /*Enumeration<Long> keylist = parentTab.SuperVehHash.keys();
-	        while(keylist.hasMoreElements())
-	        {
-	        	SuperVehicle tmp = (SuperVehicle)((parentTab.SuperVehHash.get((long)keylist.nextElement())));
-	        	if (tmp.sc_id==alarm.sc_id)
-	        	{
-	        		alarm.unitName = tmp.name;
-	        		break;
-	        	}
-	        }*/	     
-		}
-			
-		myHandler.post(UpdateResultsRUN);
-		
-    }
-    
-    // Create runnable for posting
-    final Runnable UpdateResultsRUN = new Runnable() {
-        public void run() {
-            updateResultsInUi("alarm");
-        }
-    };
 
-	private void updateResultsInUi(String param)
+		for (Alarm alarm : getAllAlarms()) {
-	{
+			acknowledged.add(alarm.ack == 1);
-		if(param.equals("alarm"))
+			SM.Debug("ALARM", "SC_ID> " + alarm.sc_id + "   |  "
-		{
+					+ (getParentTab().getVehHashByScId().get(alarm.sc_id) == null ? "null" : getParentTab().getVehHashByScId().get(alarm.sc_id).name));
-			 // set adapter
-			 adapter = new AlertGridViewAdapter(this, allAlarms, context, acknowledged);
-		     gridView.setAdapter(adapter);
-		}
-		else
-		{
-			adapter.changeACK(ack_position);
-			SM.Debug("Set ACK: " + ack_position + "  | " + (acknowledged.get(ack_position) ? "true": "false"));
 
-			ViewHolder viewAlarm = new ViewHolder();
+
-		    viewAlarm = (ViewHolder) convertViewAlarm.getTag();
+			if (getParentTab().getVehHashByScId().get(alarm.sc_id) != null)
-		    
+				alarm.unitName = getParentTab().getVehHashByScId().get(alarm.sc_id).name;
-			switch(acknowledged.get(ack_position) ? 1 : 0)
+		}
-			{
+		myHandler.post(updateResultsRUN);
+	}
+
+	// Create runnable for posting
+	final Runnable updateResultsRUN = () -> updateResultsInUi(ALARM);
+
+	private void updateResultsInUi(String param) {
+		if (param.equals(ALARM)) {
+			// set adapter
+			adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+			gridView.setAdapter(adapter);
+		} else {
+			adapter.changeACK(ackPosition);
+			SM.Debug("Set ACK: " + ackPosition + "  | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false"));
+
+			ViewHolder viewAlarm;
+			viewAlarm = (ViewHolder) getConvertViewAlarm().getTag();
+
+			switch (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? 1 : 0) {
 				case 1:
 					viewAlarm.imageViewAlert.setImageResource(R.drawable.alert_off);
-					//view.imgViewIcon.setImageDrawable(adapter.convertToGrayscale(activity.getResources().getDrawable(liveVehicle.get(position).getSmallIcon())));
 					break;
 				case 0:
-					//view.imgViewAlarm.setImageResource(R.drawable.siren);
+					viewAlarm.imageViewAlert.setImageResource(R.drawable.siren);
-					//view.imgViewIcon.setImageResource(liveVehicle.get(position).getSmallIcon());
 					break;
+				default:
+					throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? 1 : 0));
 			}
 		}
 	}
-    
+
 	// update ACK received from AppServer
-	public void UpdateACK()
+	public void updateACK() {
-	{		
+		myHandler.post(updateAckRUN);
-		myHandler.post(UpdateAckRUN);
 	}
-	
+
-	 // Create runnable for posting
+	// Create runnable for posting
-    final Runnable UpdateAckRUN = new Runnable() {
+	final Runnable updateAckRUN = () -> {
-        public void run() {
+		SM.Debug(" updateACK: ");
-        	SM.Debug(" UpdateACK: ");
+		updateResultsInUi("adapter");
-            updateResultsInUi("adapter");
+	};
-        }
+
-    };
+	// send to AppServer
-	
+	private void getAlarms() {
-	
+		getParentTab().executeNetworkStuff(new String[]{OperationCodes.GetAlarms + "", AppParams.USERID + ""});
-    // send to AppServer
+	}
-    private void GetAlarms()
+
-	{
+	public TabLayoutActivity getParentTab() {
-    	parentTab.executeNetworkStuff(new String[]{OperationCodes.GetAlarms +"", AppParams.USERID + ""});
+		return parentTab;
-		//parentTab.getAlarms(AppParams.USERID);
+	}
+
+	public void setParentTab(TabLayoutActivity parentTab) {
+		this.parentTab = parentTab;
+	}
+
+	public ArrayList<Alarm> getAllAlarms() {
+		return allAlarms;
+	}
+
+	public void setAllAlarms(ArrayList<Alarm> allAlarms) {
+		this.allAlarms = allAlarms;
+	}
+
+	public View getConvertViewAlarm() {
+		return convertViewAlarm;
+	}
+
+	public void setConvertViewAlarm(View convertViewAlarm) {
+		this.convertViewAlarm = convertViewAlarm;
+	}
+
+	public Bundle getSavedInstanceState() {
+		return savedInstanceState;
+	}
+
+	public void setSavedInstanceState(Bundle savedInstanceState) {
+		this.savedInstanceState = savedInstanceState;
 	}
-    
-    // send ACK to AppServer
-    private void setACK(int idx, int type)
-    {
-    	parentTab.executeNetworkStuff(new String[]{OperationCodes.SendAlarmAcknoledge +"", idx + "", type + ""});
-    	//parentTab.sendAlarmAcknowledge(idx, type);
-    }
 }

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

@@ -12,10 +12,12 @@ import androidx.annotation.NonNull;
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.Marker;
+import com.safemobile.lib.HistPos;
 import com.safemobile.lib.SuperVehicle;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Locale;
@@ -25,8 +27,10 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
     private final String TAG = GoogleMapsInfoBubble.class.getName();
 
     private final View mWindow;
-    private final Hashtable<Long, SuperVehicle> superVehHash;
+    private Hashtable<Long, SuperVehicle> superVehHash;
     private final Context context;
+    private ArrayList<HistPos> histPosList;
+    private boolean isLiveTab = true;
 
 
     public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context, Hashtable<Long, SuperVehicle> vehicles) {
@@ -35,6 +39,17 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
     }
 
+    public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
+        isLiveTab = false;
+        this.context = context;
+//        this.superVehHash = vehicles;
+        mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
+    }
+
+    public void setHistoryPositions(ArrayList<HistPos> positions) {
+        this.histPosList = positions;
+    }
+
     @Override
     public View getInfoWindow(@NonNull Marker marker) {
         render(marker, mWindow);
@@ -49,13 +64,21 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
 
     private void render(Marker marker, View view) {
         long key = 0;
-
+        int position = 0;
-        try {
+        if (isLiveTab) {
-            key = Long.parseLong(marker.getTitle());
+            try {
-        } catch (Exception ex) {
+                key = Long.parseLong(marker.getTitle());
-            Log.v(TAG, "Unable to parse Google Maps Info Bubble title");
+            } catch (Exception ex) {
+                Log.v(TAG, "Unable to parse Google Maps Info Bubble title");
+            }
+        } else {
+            try {
+                position = Integer.getInteger(marker.getTitle());
+            } catch (Exception e) {
+                Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
+            }
         }
-        SuperVehicle vehicle = superVehHash.get(key);
+
 
         RelativeLayout rlMapInfoBubbleInfo = view.findViewById(R.id.rlMapInfoBubbleInfo);
         TextView tvUnitName = view.findViewById(R.id.tvUnitName);
@@ -67,27 +90,39 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         rlMapInfoBubbleInfo.setVisibility(View.VISIBLE);
 
         boolean isMilitaryTime = false;
-        Date positionTime = new Date(vehicle.timeGMT);
+        Date positionTime;
-
+        String speed, address, gpsLocation, name = "";
+        if (isLiveTab) {
+            SuperVehicle vehicle = superVehHash.get(key);
+            positionTime = new Date(vehicle.timeGMT);
+            address = vehicle.Address != null ? vehicle.Address : "";
+            name = vehicle.name;
+            speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
+            gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
+        } else {
+            HistPos histPos = histPosList.get(position);
+            positionTime = new Date(histPos.timeGMT);
+            address = histPos.Address != null ? histPos.Address : "";
+            speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
+            gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
+        }
 
         String timeFormat = isMilitaryTime
                 ? "HH:mm:ss dd.MMM.yyyy"
                 : "hh:mm:ss a dd.MMM.yyy";
 
         DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
-
         tvTimeAgo.setText(format.format(positionTime));
-
-        tvSpeed.setText(String.format(context.getResources().getString(R.string.speedMph), vehicle.speed));
-
-        String address = vehicle.Address != null ? vehicle.Address : "";
-
         tvStreetView.setText(address);
         streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
         tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
-        tvUnitName.setText(vehicle.name);
+        if (!isLiveTab)
-        tvGPSLocation.setText("[" + String.format("%.4f", vehicle.lat)
+            tvUnitName.setVisibility(View.GONE);
-                + "," + String.format("%.4f",vehicle.lng) + "]");
+        else
+            tvUnitName.setText(name);
+
+        tvSpeed.setText(speed);
+        tvGPSLocation.setText(gpsLocation);
     }
 }
 

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

@@ -1,17 +1,33 @@
 package com.safemobile.dispatch;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.DatePickerDialog;
+import android.app.Dialog;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+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;
+import com.google.android.gms.maps.model.BitmapDescriptor;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.PolylineOptions;
 import com.safemobile.lib.AppParams;
+import com.safemobile.lib.HistPos;
+import com.safemobile.lib.OperationCodes;
 import com.safemobile.lib.SM;
 import com.safemobile.lib.Vehicle;
 
@@ -21,19 +37,21 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-public class HistoryActivity extends AppCompatActivity {
+public class HistoryActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     public Bundle savedInstanceState;
     private TabLayoutActivity parentTab;
     private GoogleMap googleMap;
     private Spinner spinnerVehicle;
-    private ImageView changeMapType, checkTraffic, slideLayoutImage;
+    private Button displayButton;
-    private LinearLayout layoutTraffic, slidelayout, layoutVehicles;
+    private Date startDate, endDate;
+    private final Handler myHandler = new Handler();
+    private GoogleMapsInfoBubble infoBubble;
+
+    private final ArrayList<Vehicle> allVehicle = new ArrayList<>();
+    private final ArrayList<String> allVehicleNames = new ArrayList<>();
+    private final SimpleDateFormat sdf = new SimpleDateFormat("MMMM dd yyyy");
 
-    private ArrayList<Vehicle> allVehicle = new ArrayList<>();
-    private ArrayList<String> allVehicleNames = new ArrayList<>();
-    private ArrayAdapter<String> adapter;
-    private boolean showVehicle = true;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,14 +65,15 @@ public class HistoryActivity extends AppCompatActivity {
         Locale locale = new Locale(AppParams.LANGUAGETMP);
         Locale.setDefault(locale);
 
-        googleMap = parentTab.liveActivity.getMap();
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
+        if (mapFragment != null)
+            mapFragment.getMapAsync(this);
 
         spinnerVehicle = findViewById(R.id.spinnerVehicle);
         getVehicles();
 
-        adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, allVehicleNames);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, allVehicleNames);
         adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line);
         spinnerVehicle.setAdapter(adapter);
         spinnerVehicle.setSelection(0);
@@ -62,49 +81,87 @@ public class HistoryActivity extends AppCompatActivity {
         changeMapType();
         changeTraffic();
 
-        slidelayout = findViewById(R.id.slidelayout);
+        displayButton = findViewById(R.id.buttonDisplay);
-        slideLayoutImage = findViewById(R.id.slideLayoutImage);
+        displayButton.setOnClickListener(view -> {
-        layoutVehicles = findViewById(R.id.layoutBig);
+            googleMap.clear();
-//        slidelayout.setOnTouchListener((v, event) -> {
+            if (!AppParams.DEMO) {
-//            if (showVehicle) {
+                parentTab.dropAllData =false;
-//                layoutVehicles.setVisibility(View.GONE);
+                parentTab.firstHistData = true;
-//                slideLayoutImage.setImageResource(R.drawable.arrow_right);
+                parentTab.HistMsgList.clear();
-//                showVehicle = false;
+                parentTab.HistPosList.clear();
-//            } else {
+
-//                layoutVehicles.setVisibility(View.VISIBLE);
+//                request history
-//                slideLayoutImage.setImageResource(R.drawable.arrow_left);
+                parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
-//                showVehicle = true;
+                        (startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
-//            }
+            } else {
-//            return false;
+                parentTab.demoPositionsList();
-//        });
+                displayHistory(parentTab.demoPositions);
+            }
+        });
 
         setDate();
     }
 
+    private void displayHistory(ArrayList<HistPos> positions) {
+        LatLng latLng = null;
+        PolylineOptions polylineOptions = new PolylineOptions();
+        BitmapDescriptor markerIcon = BitmapDescriptorFactory.fromResource(R.drawable.history_pin);
+        for (int i = 0; i < positions.size(); i++) {
+            HistPos pos = positions.get(i);
+            if (pos.speed > 0) {
+                latLng = new LatLng(pos.lat, pos.lng);
+                polylineOptions.add(latLng);
+
+                googleMap.addMarker(new MarkerOptions()
+                        .position(latLng)
+                        .icon(markerIcon)
+                        .title(String.valueOf(i)));
+            }
+        }
+
+        googleMap.addPolyline(polylineOptions);
+        if (latLng != null)
+            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
+    }
+
     private void setDate() {
         Calendar calendar = Calendar.getInstance();
-        Date endDate = calendar.getTime();
+        endDate = calendar.getTime();
         calendar.add(Calendar.DATE, -1);
-        Date startDate = calendar.getTime();
+        startDate = calendar.getTime();
 
-        LinearLayout layoutStartPicker = findViewById(R.id.layoutStartPicker);
+        TextView textViewStartDate = findViewById(R.id.textViewStartDate);
-        TextView textViewDate = findViewById(R.id.textViewStartDate);
+        TextView textViewEndDate = findViewById(R.id.textViewEndDate);
 
-        textViewDate.setText(new SimpleDateFormat("HH:mm, dd.MM.yyyy").format(startDate));
+        textViewStartDate.setText(sdf.format(startDate));
-//        layoutStartPicker.setOnTouchListener((v, event) -> {
+        textViewEndDate.setText(sdf.format(endDate));
-//            showDialog(layoutStartPicker);
-//            return false;
-//        });
 
-//        layoutEndPicker.setOnTouchListener(new OnTouchListener() {
+        textViewStartDate.setOnClickListener(view -> openDialog(textViewStartDate, true));
-//            @Override
+        textViewEndDate.setOnClickListener(view -> openDialog(textViewEndDate, false));
-//            public boolean onTouch(View v, MotionEvent event) {
+    }
-//                showDialog(layoutEndPicker);
-//                return false;
-//            }
-//        });
 
+    private void openDialog(TextView textView, Boolean isStartDate) {
+        Date date = startDate;
+        if (!isStartDate)
+            date = endDate;
 
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        DatePickerDialog.OnDateSetListener setListener = (datePicker, y, m, d) -> {
+            calendar.set(y, m, d);
+            String dateString = sdf.format(calendar.getTime());
+            textView.setText(dateString);
+            if (isStartDate)
+                startDate = calendar.getTime();
+            else
+                endDate = calendar.getTime();
+        };
+
+        Dialog dialog = new DatePickerDialog(this,  android.R.style.Theme_Holo_Light_Dialog_MinWidth, setListener,
+                calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        dialog.show();
     }
 
     private void changeTraffic() {
@@ -121,14 +178,13 @@ public class HistoryActivity extends AppCompatActivity {
     }
 
     private void changeMapType() {
-        changeMapType = findViewById(R.id.changeMapType);
+        ImageView changeMapType = findViewById(R.id.changeMapType);
-        ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
         changeMapType.setOnClickListener(view -> {
             if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
-                changeMapTypeImageView.setImageResource(R.drawable.satellite);
+                changeMapType.setImageResource(R.drawable.satellite);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
             } else {
-                changeMapTypeImageView.setImageResource(R.drawable.map);
+                changeMapType.setImageResource(R.drawable.map);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
             }
         });
@@ -136,15 +192,27 @@ public class HistoryActivity extends AppCompatActivity {
 
     public void getVehicles() {
         try {
+            allVehicle.clear();
+            allVehicleNames.clear();
             for (Vehicle vehicle : parentTab.getAllVehicle()) {
                 allVehicleNames.add(vehicle.name);
                 allVehicle.add(vehicle);
             }
-        } catch (Exception ex) { }
+        } catch (Exception ignored) { }
 
     }
 
+    final Runnable UpdateMapResults = new Runnable() {
+        public void run() {
+            Log.v("updateMap", parentTab.HistPosList.toString());
+            SM.Debug("Do the Display");
+            infoBubble.setHistoryPositions(parentTab.HistPosList);
+            displayHistory(parentTab.HistPosList);
+        }
+    };
+
     public void UpdateMap() {
+        myHandler.post(UpdateMapResults);
         SM.Debug("Do the updateMAP post");
     }
 
@@ -159,4 +227,15 @@ public class HistoryActivity extends AppCompatActivity {
     public void UpdateNrPos(int size) {
         SM.Debug("Do Cancelwindow");
     }
+
+    @Override
+    public void onMapReady(@NonNull GoogleMap googleMap) {
+        this.googleMap = googleMap;
+
+        infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this);
+        this.googleMap.setInfoWindowAdapter(infoBubble);
+
+        parentTab.demoPositionsList();
+        displayButton.performClick();
+    }
 }

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

@@ -1,243 +1,244 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+	android:orientation="vertical"
-    android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
-    android:layout_height="fill_parent" android:weightSum="1"
+	android:layout_height="fill_parent" android:weightSum="1"
-    android:id="@+id/layoutMain"
+	android:id="@+id/layoutMain"
-    style="?bg">
+	style="?bg">
-                
-    		<LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeader">
 
-    		    <ImageView
+	<LinearLayout
-			        android:id="@+id/imageViewMsg"
+		android:layout_width="fill_parent"
-			        android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
-			        android:layout_height="fill_parent"
+		android:gravity="left"
-			        android:src="@drawable/message"
+		android:layout_weight="0"
-			        android:paddingLeft="0dp"
+		android:orientation="horizontal"
-			        android:layout_margin="3dp"
+		style="?header"
-			        android:layout_weight="0" />
+		android:id="@+id/layoutHeader">
-    			<TextView
-    			    android:id="@+id/textView1"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="@string/textMessaging"
-    			    android:layout_marginLeft="5dp"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"/>
 
-    			 <ImageView
+		<ImageView
-			        android:id="@+id/imageViewSeparator"
+			android:id="@+id/imageViewMsg"
-			        android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
+			android:layout_height="fill_parent"
-			        android:layout_gravity="center_vertical"
+			android:src="@drawable/message"
-			        android:src="@drawable/separator_white"
+			android:paddingLeft="0dp"
-			        android:layout_margin="2dp"
+			android:layout_margin="3dp"
-			        android:layout_weight="0"
+			android:layout_weight="0" />
-			        android:visibility="invisible"
+		<TextView
-			        android:focusable="false" />
+			android:id="@+id/textView1"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="@string/textMessaging"
+			android:layout_marginLeft="5dp"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"/>
 
+		<ImageView
+			android:id="@+id/imageViewSeparator"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/separator_white"
+			android:layout_margin="2dp"
+			android:layout_weight="0"
+			android:visibility="invisible"
+			android:focusable="false" />
+
+		<ImageView
+			android:id="@+id/imageViewDown"
+			android:layout_width="20dp"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="2dp"
+			android:layout_marginTop="2dp"
+			android:focusable="false"
+			android:visibility="invisible"
+			android:src="@drawable/arrow_menu_down" />
+
+		<ImageButton
+			android:id="@+id/imageButtonAdd2"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
+
+		<TextView
+			android:id="@+id/textViewNew"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="New"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"
+			android:paddingRight="5dp"
+			android:visibility="gone"/>
+
+		<ImageButton
+			android:id="@+id/imageButtonAdd"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:background="@drawable/addmessage_selector"/>
+
+		<!--  android:background="@drawable/addmessage_selector"  -->
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="left"
+		android:layout_weight="0"
+		android:orientation="horizontal"
+		style="?header"
+		android:id="@+id/layoutHeaderConversation">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical">
+			<ImageButton
+				android:id="@+id/imageButtonBack"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginRight="5dp"
+				android:paddingLeft="2dp"
+				android:background="@drawable/messageback_selector"/>
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_horizontal"
+			android:layout_weight="1"
+			android:gravity="right|center_vertical"
+			android:orientation="horizontal"
+			android:paddingBottom="2dp"
+			android:paddingRight="15dp"
+			android:paddingTop="3dp" >
+
+			<LinearLayout
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="0">
 				<ImageView
-				    android:id="@+id/imageViewDown"
+					android:id="@+id/imageViewSelectedContact"
-				    android:layout_width="20dp"
+					android:layout_width="wrap_content"
-				    android:layout_height="fill_parent"
+					android:layout_height="wrap_content"
-				    android:layout_gravity="center_vertical"
+					android:src="@drawable/ambulance_large"
-				    android:layout_marginBottom="2dp"
+					android:layout_margin="3dp" />
-				    android:layout_marginTop="2dp"
+			</LinearLayout>
-				    android:focusable="false"
+			<TextView
-				    android:visibility="invisible"
+				android:id="@+id/textViewSelectedContact"
-				    android:src="@drawable/arrow_menu_down" />
+				android:layout_width="wrap_content"
-    			
+				android:layout_height="fill_parent"
-				<ImageButton
+				android:text="Large Text"
-    			    android:id="@+id/imageButtonAdd2"
+				android:gravity="center_vertical"
-    			    android:layout_width="fill_parent"
+				android:paddingLeft="3dp"
-    			    android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
-    			    android:layout_weight="1"
+				android:layout_weight="0"/>
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
-				
-				<TextView
-    			    android:id="@+id/textViewNew"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="New"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"
-    			    android:paddingRight="5dp"
-    			    android:visibility="gone"/>
-				
-    			<ImageButton
-    			    android:id="@+id/imageButtonAdd"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:background="@drawable/addmessage_selector"/>
-    			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>
-	        
-    		<LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeaderConversation">
-				
-    		    <LinearLayout 
-    		        	android:layout_width="wrap_content"
-		    			android:layout_height="fill_parent"
-		    			android:layout_gravity="center_vertical">
-		    			<ImageButton
-		    			    android:id="@+id/imageButtonBack"
-		    			    android:layout_width="wrap_content"
-		    			    android:layout_height="wrap_content"
-		    			    android:layout_gravity="center_vertical"
-		    			    android:layout_marginRight="5dp"
-		    			    android:paddingLeft="2dp"
-		    			    android:background="@drawable/messageback_selector"/>
-				</LinearLayout>
-    			<LinearLayout
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="fill_parent"
-    			    android:layout_gravity="center_horizontal"
-    			    android:layout_weight="1"
-    			    android:gravity="right|center_vertical"
-    			    android:orientation="horizontal"
-    			    android:paddingBottom="2dp"
-    			    android:paddingRight="15dp"
-    			    android:paddingTop="3dp" >
-				
-				    <LinearLayout
-						android:layout_height="wrap_content"
-						android:layout_width="wrap_content"
-						android:layout_gravity="center_vertical"
-						android:layout_weight="0">
-						    <ImageView
-						        android:id="@+id/imageViewSelectedContact"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:src="@drawable/ambulance_large"
-						        android:layout_margin="3dp" />
-					</LinearLayout>
-				    <TextView
-				        android:id="@+id/textViewSelectedContact"
-				        android:layout_width="wrap_content"
-				        android:layout_height="fill_parent"
-				        android:text="Large Text"
-				        android:gravity="center_vertical"
-				        android:paddingLeft="3dp"
-				        android:textAppearance="?android:attr/textAppearanceMedium"
-						android:layout_weight="0"/>
-				
-				</LinearLayout>
-    			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>
-    		
-	        <LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:id="@+id/layoutConversations" 
-	        android:layout_weight="1"
-	        android:orientation="vertical">
 
-	             <GridView
+		</LinearLayout>
-	                 android:id="@+id/gridView1"
+
-	                 android:layout_width="fill_parent"
+		<!--  android:background="@drawable/addmessage_selector"  -->
-	                 android:layout_height="wrap_content"
+	</LinearLayout>
-	                 android:background="#999999"
+
-	                 android:drawSelectorOnTop="false"
+	<LinearLayout
-	                 android:horizontalSpacing="0dp"
+		android:layout_width="fill_parent"
-	                 android:numColumns="1"
+		android:layout_height="wrap_content"
-	                 android:verticalSpacing="1dp" >
+		android:id="@+id/layoutConversations"
-	    		</GridView>
+		android:layout_weight="1"
-	       </LinearLayout>
+		android:orientation="vertical">
-	        
+
-	       <LinearLayout 
+		<GridView
-		        android:id="@+id/layoutSendMsg"
+			android:id="@+id/gridView1"
-		        android:layout_width="fill_parent" 
+			android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-		        android:gravity="left"
+			android:background="#999999"
-		        android:layout_weight="0"
+			android:drawSelectorOnTop="false"
-		        android:orientation="horizontal"
+			android:horizontalSpacing="0dp"
-		        style="?header">
+			android:numColumns="1"
-				<LinearLayout 
+			android:verticalSpacing="1dp" >
-				    	android:layout_weight="0"
+		</GridView>
-				    	android:layout_width="wrap_content"
+	</LinearLayout>
-				    	android:layout_height="fill_parent">
+
-		    			<TextView
+	<LinearLayout
-		    			    android:id="@+id/textViewSendMsg"
+		android:id="@+id/layoutSendMsg"
-		    			    android:layout_width="wrap_content"
+		android:layout_width="fill_parent"
-		    			    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-		    			    android:layout_gravity="center_vertical"
+		android:gravity="left"
-		    			    android:text="@string/message"
+		android:layout_weight="0"
-		    			    android:layout_marginLeft="5dp"
+		android:orientation="horizontal"
-		    			    android:layout_marginRight="5dp"
+		style="?header">
-		    			    android:textAppearance="?android:attr/textAppearanceLarge" 
+		<LinearLayout
-		    			    />
+			android:layout_weight="0"
-    			</LinearLayout>
+			android:layout_width="wrap_content"
-				<LinearLayout 
+			android:layout_height="fill_parent">
-				    	android:layout_weight="1"
+			<TextView
-				    	android:layout_width="fill_parent"
+				android:id="@+id/textView1"
-				    	android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
-				    	android:gravity="center_vertical"
+				android:layout_height="wrap_content"
-				    	android:paddingTop="4dp">
+				android:layout_gravity="center_vertical"
-		    			<EditText
+				android:text="@string/message"
-		    			    android:id="@+id/editTextMsg"
+				android:layout_marginLeft="5dp"
-		    			    android:layout_width="fill_parent"
+				android:layout_marginRight="5dp"
-		    			    android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceLarge"
-		    			    android:layout_gravity="center_vertical"
+				/>
-		    			    android:gravity="center_vertical"
+		</LinearLayout>
-		    			    android:inputType="text" >
+		<LinearLayout
-		    			</EditText>
+			android:layout_weight="1"
-    			</LinearLayout>
+			android:layout_width="fill_parent"
-    			<LinearLayout 
+			android:layout_height="wrap_content"
-				    	android:layout_weight="0"
+			android:gravity="center_vertical"
-				    	android:layout_width="wrap_content"
+			android:paddingTop="4dp">
-				    	android:layout_height="wrap_content"
+			<EditText
-				    	android:gravity="center_vertical"
+				android:id="@+id/editTextMsg"
-				    	android:paddingTop="4dp">
+				android:layout_width="fill_parent"
-		    			<ImageView
+				android:layout_height="wrap_content"
-						        android:id="@+id/imageBarcode"
+				android:layout_gravity="center_vertical"
-						        android:layout_width="wrap_content"
+				android:gravity="center_vertical"
-						        android:layout_height="35dp"
+				android:inputType="text"
-						        android:src="@drawable/barcode"
+				android:autofillHints="">
-						        android:paddingTop="2dp"
+			</EditText>
-						        android:layout_margin="3dp" />
+		</LinearLayout>
-    			</LinearLayout>
+		<LinearLayout
-    			<Button
+			android:layout_weight="0"
-    			    android:id="@+id/imageButtonSend"
+			android:layout_width="wrap_content"
-    			    android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
-    			    android:layout_height="wrap_content"
+			android:gravity="center_vertical"
-    			    android:layout_weight="0"
+			android:paddingTop="4dp">
-    			    android:text="@string/send"
+			<ImageView
-    			    android:layout_marginRight="5dp"
+				android:id="@+id/imageBarcode"
-    			    android:layout_gravity="center"
+				android:layout_width="wrap_content"
-    			    android:paddingLeft="6dp"
+				android:layout_height="35dp"
-    			    android:textColor="#000000"
+				android:src="@drawable/barcode"
-    			    style="?login"
+				android:paddingTop="2dp"
-    			    />
+				android:layout_margin="3dp" />
-	        </LinearLayout>
+		</LinearLayout>
+		<Button
+			android:id="@+id/imageButtonSend"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:text="@string/send"
+			android:layout_marginRight="5dp"
+			android:layout_gravity="center"
+			android:paddingLeft="6dp"
+			android:textColor="#000000"
+			style="?login"
+			/>
+	</LinearLayout>
 </LinearLayout>

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

@@ -162,10 +162,11 @@
 							android:text="@string/startDate"
 							android:textSize="22dp"
 							android:paddingLeft="5dp"
+							android:layout_marginTop="15sp"
 							android:textColor="#000000"
 							android:gravity="left"
 							android:id="@+id/labelStartDate"
-							android:visibility="gone"/>
+							/>
 						<LinearLayout
 							android:id="@+id/layoutStartPicker"
 							android:layout_height="wrap_content"
@@ -202,7 +203,7 @@
 							android:textColor="#000000"
 							android:gravity="left"
 							android:id="@+id/labelEndDate"
-							android:visibility="gone"/>
+							/>
 						<LinearLayout
 							android:id="@+id/layoutEndPicker"
 							android:layout_height="wrap_content"
@@ -284,14 +285,15 @@
     		</LinearLayout>
 
 			<fragment
+				xmlns:tools="http://schemas.android.com/tools"
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:id="@+id/map"
 				android:layout_toRightOf="@id/slidelayout"
 				android:layout_weight="1"
+				tools:context=".HistoryActivity"
 				android:name="com.google.android.gms.maps.SupportMapFragment" />
 
-
 		</LinearLayout>
 		 <ImageView
 			android:id="@+id/changeMapType"

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

@@ -1,240 +1,241 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+	android:orientation="vertical"
-    android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
-    android:layout_height="fill_parent" android:weightSum="1"
+	android:layout_height="fill_parent" android:weightSum="1"
-    android:id="@+id/layoutMain"
+	android:id="@+id/layoutMain"
-    style="?bg">
+	style="?bg">
-                
-    		<LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeader">
 
-    		    <ImageView
+	<LinearLayout
-			        android:id="@+id/imageViewMsg"
+		android:layout_width="fill_parent"
-			        android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
-			        android:layout_height="fill_parent"
+		android:gravity="left"
-			        android:src="@drawable/message"
+		android:layout_weight="0"
-			        android:paddingLeft="5dp"
+		android:orientation="horizontal"
-			        android:layout_margin="3dp"
+		style="?header"
-			        android:layout_weight="0" />
+		android:id="@+id/layoutHeader">
-    			<TextView
-    			    android:id="@+id/textView1"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="@string/textMessaging"
-    			    android:layout_marginLeft="5dp"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"/>
 
-    			 <ImageView
+		<ImageView
-			        android:id="@+id/imageViewSeparator"
+			android:id="@+id/imageViewMsg"
-			        android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
+			android:layout_height="fill_parent"
-			        android:layout_gravity="center_vertical"
+			android:src="@drawable/message"
-			        android:src="@drawable/separator_white"
+			android:paddingLeft="5dp"
-			        android:layout_margin="2dp"
+			android:layout_margin="3dp"
-			        android:layout_weight="0"
+			android:layout_weight="0" />
-			        android:visibility="invisible"
+		<TextView
-			        android:focusable="false" />
+			android:id="@+id/textView1"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="@string/textMessaging"
+			android:layout_marginLeft="5dp"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"/>
 
+		<ImageView
+			android:id="@+id/imageViewSeparator"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/separator_white"
+			android:layout_margin="2dp"
+			android:layout_weight="0"
+			android:visibility="invisible"
+			android:focusable="false" />
+
+		<ImageView
+			android:id="@+id/imageViewDown"
+			android:layout_width="20dp"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="2dp"
+			android:layout_marginTop="2dp"
+			android:focusable="false"
+			android:visibility="invisible"
+			android:src="@drawable/arrow_menu_down" />
+
+		<ImageButton
+			android:id="@+id/imageButtonAdd2"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
+
+		<ImageButton
+			android:id="@+id/imageButtonAdd"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:background="@drawable/addmessage_selector"/>
+		<TextView
+			android:id="@+id/textViewNew"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="New"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"
+			android:paddingRight="5dp"
+			android:visibility="gone"/>
+		<!--  android:background="@drawable/addmessage_selector"  -->
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="left"
+		android:layout_weight="0"
+		android:orientation="horizontal"
+		style="?header"
+		android:id="@+id/layoutHeaderConversation">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical">
+			<ImageButton
+				android:id="@+id/imageButtonBack"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_marginRight="5dp"
+				android:paddingLeft="2dp"
+				android:background="@drawable/messageback_selector"/>
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_horizontal"
+			android:layout_weight="1"
+			android:gravity="right|center_vertical"
+			android:orientation="horizontal"
+			android:paddingBottom="0dp"
+			android:paddingRight="15dp"
+			android:paddingTop="0dp" >
+
+			<LinearLayout
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_gravity="center_vertical"
+				android:layout_weight="0">
 				<ImageView
-				    android:id="@+id/imageViewDown"
+					android:id="@+id/imageViewSelectedContact"
-				    android:layout_width="20dp"
+					android:layout_width="wrap_content"
-				    android:layout_height="fill_parent"
+					android:layout_height="35dp"
-				    android:layout_gravity="center_vertical"
+					android:src="@drawable/ambulance_large"
-				    android:layout_marginBottom="2dp"
+					android:layout_margin="3dp" />
-				    android:layout_marginTop="2dp"
+			</LinearLayout>
-				    android:focusable="false"
+			<TextView
-				    android:visibility="invisible"
+				android:id="@+id/textViewSelectedContact"
-				    android:src="@drawable/arrow_menu_down" />
+				android:layout_width="wrap_content"
-    			
+				android:layout_height="fill_parent"
-				<ImageButton
+				android:text="Large Text"
-    			    android:id="@+id/imageButtonAdd2"
+				android:gravity="center_vertical"
-    			    android:layout_width="fill_parent"
+				android:paddingLeft="3dp"
-    			    android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
-    			    android:layout_weight="1"
+				android:layout_weight="0"/>
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
-				
-    			<ImageButton
-    			    android:id="@+id/imageButtonAdd"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:background="@drawable/addmessage_selector"/>
-    			<TextView
-    			    android:id="@+id/textViewNew"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="New"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"
-    			    android:paddingRight="5dp"
-    			    android:visibility="gone"/>
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>
-	        
-    		<LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeaderConversation">
-				
-    		    <LinearLayout 
-    		        	android:layout_width="wrap_content"
-		    			android:layout_height="fill_parent"
-		    			android:layout_gravity="center_vertical">
-		    			<ImageButton
-		    			    android:id="@+id/imageButtonBack"
-		    			    android:layout_width="wrap_content"
-		    			    android:layout_height="wrap_content"
-		    			    android:layout_gravity="center_vertical"
-		    			    android:layout_marginRight="5dp"
-		    			    android:paddingLeft="2dp"
-		    			    android:background="@drawable/messageback_selector"/>
-				</LinearLayout>
-    			<LinearLayout
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="fill_parent"
-    			    android:layout_gravity="center_horizontal"
-    			    android:layout_weight="1"
-    			    android:gravity="right|center_vertical"
-    			    android:orientation="horizontal"
-    			    android:paddingBottom="0dp"
-    			    android:paddingRight="15dp"
-    			    android:paddingTop="0dp" >
-				
-				    <LinearLayout
-						android:layout_height="wrap_content"
-						android:layout_width="wrap_content"
-						android:layout_gravity="center_vertical"
-						android:layout_weight="0">
-						    <ImageView
-						        android:id="@+id/imageViewSelectedContact"
-						        android:layout_width="wrap_content"
-						        android:layout_height="35dp"
-						        android:src="@drawable/ambulance_large"
-						        android:layout_margin="3dp" />
-					</LinearLayout>
-				    <TextView
-				        android:id="@+id/textViewSelectedContact"
-				        android:layout_width="wrap_content"
-				        android:layout_height="fill_parent"
-				        android:text="Large Text"
-				        android:gravity="center_vertical"
-				        android:paddingLeft="3dp"
-				        android:textAppearance="?android:attr/textAppearanceMedium"
-						android:layout_weight="0"/>
-				
-				</LinearLayout>
-    			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>
-    		
-	        <LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:id="@+id/layoutConversations" 
-	        android:layout_weight="1"
-	        android:orientation="vertical">
 
-	             <GridView
+		</LinearLayout>
-	                 android:id="@+id/gridView1"
+
-	                 android:layout_width="fill_parent"
+		<!--  android:background="@drawable/addmessage_selector"  -->
-	                 android:layout_height="wrap_content"
+	</LinearLayout>
-	                 android:background="#999999"
+
-	                 android:drawSelectorOnTop="false"
+	<LinearLayout
-	                 android:horizontalSpacing="0dp"
+		android:layout_width="fill_parent"
-	                 android:numColumns="1"
+		android:layout_height="wrap_content"
-	                 android:verticalSpacing="1dp" >
+		android:id="@+id/layoutConversations"
-	    		</GridView>
+		android:layout_weight="1"
-	       </LinearLayout>
+		android:orientation="vertical">
-	        
+
-	       <LinearLayout 
+		<GridView
-		        android:id="@+id/layoutSendMsg"
+			android:id="@+id/gridView1"
-		        android:layout_width="fill_parent" 
+			android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-		        android:gravity="left"
+			android:background="#999999"
-		        android:layout_weight="0"
+			android:drawSelectorOnTop="false"
-		        android:orientation="horizontal"
+			android:horizontalSpacing="0dp"
-		        style="?header">
+			android:numColumns="1"
-				<LinearLayout 
+			android:verticalSpacing="1dp" >
-				    	android:layout_weight="0"
+		</GridView>
-				    	android:layout_width="wrap_content"
+	</LinearLayout>
-				    	android:layout_height="fill_parent">
+
-		    			<TextView
+	<LinearLayout
-		    			    android:id="@+id/textViewSendMsg"
+		android:id="@+id/layoutSendMsg"
-		    			    android:layout_width="wrap_content"
+		android:layout_width="fill_parent"
-		    			    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-		    			    android:layout_gravity="center_vertical"
+		android:gravity="left"
-		    			    android:text="@string/message"
+		android:layout_weight="0"
-		    			    android:layout_marginLeft="5dp"
+		android:orientation="horizontal"
-		    			    android:layout_marginRight="5dp"
+		style="?header">
-		    			    android:textSize="18dp" 
+		<LinearLayout
-		    			    />
+			android:layout_weight="0"
-    			</LinearLayout>
+			android:layout_width="wrap_content"
-				<LinearLayout 
+			android:layout_height="fill_parent">
-				    	android:layout_weight="1"
+			<TextView
-				    	android:layout_width="fill_parent"
+				android:id="@+id/textView1"
-				    	android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
-				    	android:gravity="center_vertical"
+				android:layout_height="wrap_content"
-				    	android:paddingTop="4dp">
+				android:layout_gravity="center_vertical"
-		    			<EditText
+				android:text="@string/message"
-		    			    android:id="@+id/editTextMsg"
+				android:layout_marginLeft="5dp"
-		    			    android:layout_width="fill_parent"
+				android:layout_marginRight="5dp"
-		    			    android:layout_height="wrap_content"
+				android:textSize="18dp"
-		    			    android:layout_gravity="center_vertical"
+				/>
-		    			    android:gravity="center_vertical"
+		</LinearLayout>
-		    			    android:inputType="text"
+		<LinearLayout
-		    			    android:maxLength="255" >
+			android:layout_weight="1"
-		    			</EditText>
+			android:layout_width="fill_parent"
-    			</LinearLayout>
+			android:layout_height="wrap_content"
-    			<LinearLayout 
+			android:gravity="center_vertical"
-				    	android:layout_weight="0"
+			android:paddingTop="4dp">
-				    	android:layout_width="wrap_content"
+			<EditText
-				    	android:layout_height="wrap_content"
+				android:id="@+id/editTextMsg"
-				    	android:gravity="center_vertical"
+				android:layout_width="fill_parent"
-				    	android:paddingTop="4dp">
+				android:layout_height="wrap_content"
-		    			<ImageView
+				android:layout_gravity="center_vertical"
-						        android:id="@+id/imageBarcode"
+				android:gravity="center_vertical"
-						        android:layout_width="wrap_content"
+				android:inputType="text"
-						        android:layout_height="35dp"
+				android:maxLength="255"
-						        android:src="@drawable/barcode"
+				android:autofillHints="">
-						        android:layout_margin="3dp" />
+			</EditText>
-    			</LinearLayout>
+		</LinearLayout>
-    			<Button
+		<LinearLayout
-    			    android:id="@+id/imageButtonSend"
+			android:layout_weight="0"
-    			    android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-    			    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    			    android:layout_weight="0"
+			android:gravity="center_vertical"
-    			    android:text="@string/send"
+			android:paddingTop="4dp">
-    			    android:layout_marginRight="5dp"
+			<ImageView
-    			    android:layout_gravity="center"
+				android:id="@+id/imageBarcode"
-    			    android:paddingLeft="6dp"
+				android:layout_width="wrap_content"
-    			    android:textColor="#000000"
+				android:layout_height="35dp"
-    			    style="?login"/>
+				android:src="@drawable/barcode"
-	        </LinearLayout>
+				android:layout_margin="3dp" />
+		</LinearLayout>
+		<Button
+			android:id="@+id/imageButtonSend"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:text="@string/send"
+			android:layout_marginRight="5dp"
+			android:layout_gravity="center"
+			android:paddingLeft="6dp"
+			android:textColor="#000000"
+			style="?login"/>
+	</LinearLayout>
 </LinearLayout>