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

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

.gitignore

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

libSafeMobile/build.gradle

@@ -19,6 +19,13 @@ android {
     buildFeatures {
         viewBinding false
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        //abortOnError false
+    }
 }
 
 dependencies {

libSafeMobile/src/main/AndroidManifest.xml

@@ -4,9 +4,10 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
     </application>

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

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

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

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

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

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

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

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

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

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

libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationCode.java

@@ -0,0 +1,10 @@
+package com.safemobile.enums;
+
+public enum AuthorizationCode {
+    UNKNOWN,
+    RECORD_AUDIO,
+    CAMERA,
+    GEOLOCATION,
+    READ_EXTERNAL_STORAGE,
+    WRITE_EXTERNAL_STORAGE
+}

libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationStatus.java

@@ -0,0 +1,7 @@
+package com.safemobile.enums;
+
+public enum AuthorizationStatus {
+    AUTHORIZE,
+    DENIED,
+    NOT_DETERMINED
+}

libSafeMobile/src/main/java/com/safemobile/enums/ProviderSettingsStatus.java

@@ -0,0 +1,6 @@
+package com.safemobile.enums;
+
+public enum ProviderSettingsStatus {
+    APPLICATION_DETAILS,
+    SETTINGS
+}

libSafeMobile/src/main/java/com/safemobile/helpers/ProviderSettingsHelper.java

@@ -0,0 +1,37 @@
+package com.safemobile.helpers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.Settings;
+
+import com.safemobile.enums.ProviderSettingsStatus;
+
+public class ProviderSettingsHelper {
+    public static final String PACKAGE = "package";
+    public static final String ACTION_APPLICATION_DETAILS_SETTINGS = Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
+    public static final String ACTION_SETTINGS = Settings.ACTION_SETTINGS;
+
+    private ProviderSettingsHelper() {
+
+    }
+
+    public static String getAction(ProviderSettingsStatus providerSettingsStatus) {
+        switch (providerSettingsStatus) {
+            case APPLICATION_DETAILS:
+                return ACTION_APPLICATION_DETAILS_SETTINGS;
+            case SETTINGS:
+            default:
+                return ACTION_SETTINGS;
+        }
+    }
+
+    public static boolean canHandleAction(Context context, String action) {
+        Intent intent = new Intent(action);
+        Uri uri = Uri.fromParts(PACKAGE, context.getPackageName(), null);
+
+        intent.setData(uri);
+
+        return context.getPackageManager() != null && intent.resolveActivity(context.getPackageManager()) != null;
+    }
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/IDialogService.java

@@ -0,0 +1,12 @@
+package com.safemobile.interfaces;
+
+import android.app.Activity;
+
+import com.google.android.gms.tasks.Task;
+
+public interface IDialogService {
+    Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok);
+    Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel);
+
+    void showError(Activity activity, String message);
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/IPermissionModule.java

@@ -0,0 +1,11 @@
+package com.safemobile.interfaces;
+
+import android.app.Activity;
+
+import com.safemobile.enums.AuthorizationCode;
+import com.safemobile.enums.AuthorizationStatus;
+
+public interface IPermissionModule {
+  AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode);
+  void requestAuthorization(Activity activity, AuthorizationCode authorizationCode);
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/ITCPListener.java

@@ -16,7 +16,7 @@ public interface ITCPListener {
 	public void onHistoryPositionsCountReceived( TCPEvent event );
 	public void onAlarmsReceived( TCPEvent event );
 	public void onAlarmAckReceived(TCPEvent event);
-	public void alarmLiveRecv(TCPEvent event);
+	public void alarmLiveReceived(TCPEvent event);
 	
 	public void onRecordingPlayReceived(TCPEvent event);
 	public void onPollReceived(TCPEvent event);
@@ -27,7 +27,7 @@ public interface ITCPListener {
 	public void onRecordingsListReceived(TCPEvent event);
 
 	public void onPONGReceived();
-	public void onTCPConnectionDown(boolean previuosWasConnectionUp);
+	public void onTCPConnectionDown(boolean previousWasConnectionUp);
-	public void onTCPConnectionUp(boolean previuosWasConnectionUp);
+	public void onTCPConnectionUp(boolean previousWasConnectionUp);
-	public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp);
+	public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp);
 }

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

@@ -27,7 +27,7 @@ public class AppParams {
 	
 	/* SafeMobile Dispatch */
 	public static ArrayList<User> allUsers = new ArrayList<User>();
-	public static Theme theme = Theme.SAFENET;			// the Theme type
+	public static Theme theme = Theme.SAFEDISPATCH;			// the Theme type
 	
 	
 	/* ***************************************** */

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

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

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

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

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

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

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

@@ -16,9 +16,9 @@ import android.widget.Toast;
 public class TCPService extends Service {
 
 	private int[] startModes = {START_STICKY, START_NOT_STICKY, START_REDELIVER_INTENT};
-	private int mStartMode = startModes[0];       // indicates how to behave if the service is killed
+	private int mStartMode = startModes[0];         // indicates how to behave if the service is killed
     private IBinder mBinder = new TCPBinder();      // interface for clients that bind
-    private boolean mAllowRebind = true; // indicates whether onRebind should be used
+    private boolean mAllowRebind = true;            // indicates whether onRebind should be used
     private TCPhandler tcp = null;
     private TCPmsgParser tcpParser = null;
     
@@ -28,13 +28,11 @@ public class TCPService extends Service {
     	int port = 13589;
     	try {
     		port = Integer.parseInt(AppParams.PORT);
-    	}
+    	} catch(Exception ex) { }
-    	catch(Exception ex) { }
     	
     	tcpParser = new TCPmsgParser();
     	
-    	if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a"))
+    	if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) {
-    	{
     		tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
     	}
     	
@@ -104,10 +102,8 @@ public class TCPService extends Service {
     
     
     /** Stop TCP Connection */
-    public void stopTCPConnection()
+    public void stopTCPConnection() {
-    {
+    	if(tcp != null) {
-    	if(tcp != null)
-    	{
     		tcp.Stop();
     		tcp = null;
     	}
@@ -116,27 +112,7 @@ public class TCPService extends Service {
     /** restart the TCP Connection after the connection parameters had been changed */
     public void recreateTCPConnection()
     {
-    	/*
+        recreateTCPConnection(AppParams.IP, AppParams.PORT);
-    	Thread t = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					Thread.sleep(1000*2);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				*/
-				// create a tcp connection
-		    	int port = 13589;
-		    	try {
-		    		port = Integer.parseInt(AppParams.PORT);
-		    	}
-		    	catch(Exception ex) { }
-		    	tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);		
-	/*		}
-		});
-    	t.start();
-    	*/
     }
     
     public void recreateTCPConnection(String _ip, String _port)

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

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

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

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

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

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

libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

safeDispatch/build.gradle

@@ -25,7 +25,7 @@ android {
     buildToolsVersion "31.0.0"
 
     defaultConfig {
-        applicationId "com.safemobile.dispatch"
+        applicationId "com.safemobile.safedispatch"
         minSdkVersion 21
         targetSdkVersion 31
         versionName androidGitVersion.name()
@@ -42,6 +42,13 @@ android {
     buildFeatures {
         viewBinding false
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        //abortOnError false
+    }
 }
 dependencies {
     implementation project(':libSafeMobile')
@@ -71,6 +78,4 @@ dependencies {
 
     // add Gson
     implementation 'com.google.code.gson:gson:2.8.6'
-
-    //retrofit
 }

safeDispatch/src/main/AndroidManifest.xml

@@ -1,20 +1,22 @@
 <?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.safedispatch">
-    package="com.safemobile.dispatch">
 
     <!-- require OpenGL ES version 2 for Google Maps -->
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" android:required="false"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_GSERVICES" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature
@@ -26,7 +28,7 @@
 
     <application
         android:configChanges="orientation"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:screenOrientation="landscape"
         android:theme="@style/AppTheme">
@@ -41,10 +43,9 @@
         <service android:name="com.safemobile.services.TCPService" />
 
         <activity
-            android:name=".SDMobileActivity"
+            android:name="com.safemobile.safedispatch.SDMobileActivity"
             android:configChanges="orientation"
             android:exported="true"
-            android:label="@string/app_name_demo"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -53,41 +54,41 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SetupActivity"
+            android:name="com.safemobile.safedispatch.SetupActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".TabLayoutActivity"
+            android:name="com.safemobile.safedispatch.TabLayoutActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".LiveActivity"
+            android:name="com.safemobile.safedispatch.LiveActivity"
             android:exported="false"
             android:configChanges="orientation"
             android:screenOrientation="landscape"
             android:label="@string/title_activity_google_maps" />
         <activity
-            android:name=".HistoryActivity"
+            android:name="com.safemobile.safedispatch.HistoryActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".MessagesActivity"
+            android:name="com.safemobile.safedispatch.MessagesActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".AlarmActivity"
+            android:name="com.safemobile.safedispatch.AlarmActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RadioActivity"
+            android:name="com.safemobile.safedispatch.RadioActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RecordingsActivity"
+            android:name="com.safemobile.safedispatch.RecordingsActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".NotificationActivity"
+            android:name="com.safemobile.safedispatch.NotificationActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
     </application>

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

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

safeDispatch/src/main/java/com/safemobile/lib/DialogService.java

@@ -0,0 +1,50 @@
+package com.safemobile.lib;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.safemobile.safedispatch.R;
+import com.safemobile.interfaces.IDialogService;
+
+public class DialogService implements IDialogService {
+    @Override
+    public Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok) {
+        TaskCompletionSource<Boolean> taskCompletionSource = new TaskCompletionSource<>();
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setMessage(message)
+                .setCancelable(false)
+                .setNegativeButton(cancel, (dialog, which) -> {
+                    taskCompletionSource.trySetResult(false);
+                    dialog.dismiss();
+                })
+                .setPositiveButton(ok, (dialog, which) -> taskCompletionSource.trySetResult(true));
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+
+        return taskCompletionSource.getTask();
+    }
+
+    @Override
+    public Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel) {
+        return showDialog(
+                activity,
+                activity.getString(R.string.permission_denied),
+                message,
+                cancel,
+                activity.getString(R.string.go_to_settings));
+    }
+
+    @Override
+    public void showError(Activity activity, String message) {
+        showDialog(
+                activity,
+                activity.getString(R.string.DialogService_Info_ErrorMessage),
+                message,
+                null,
+                activity.getString(R.string.ok));
+    }
+}

safeDispatch/src/main/java/com/safemobile/lib/PermissionModule.java

@@ -0,0 +1,97 @@
+package com.safemobile.lib;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.safemobile.enums.AuthorizationCode;
+import com.safemobile.enums.AuthorizationStatus;
+import com.safemobile.interfaces.IPermissionModule;
+
+import java.security.InvalidParameterException;
+
+public class PermissionModule implements IPermissionModule {
+    private static final String[] AUDIO_PERMISSIONS = {Manifest.permission.RECORD_AUDIO};
+    private static final String[] LOCATION_PERMISSIONS = {
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
+    };
+    private static final String[] CAMERA_PERMISSIONS = {Manifest.permission.CAMERA};
+    private static final String[] READ_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE};
+    private static final String[] WRITE_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
+
+    public static final int RECORD_AUDIO_PERMISSION_REQUEST_CODE = 13042022;
+    public static final int LOCATION_PERMISSION_REQUEST_CODE = 12021990;
+    public static final int CAMERA_PERMISSION_REQUEST_CODE = 16031989;
+    public static final int READ_STORAGE_PERMISSION_REQUEST_CODE = 30062018;
+    public static final int WRITE_STORAGE_PERMISSION_REQUEST_CODE = 13122012;
+
+    private boolean permissionPrompShowed;
+
+
+    @Override
+    public AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode) {
+        switch (authorizationCode) {
+            case RECORD_AUDIO:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.RECORD_AUDIO);
+            case CAMERA:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.CAMERA);
+            case GEOLOCATION:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
+            case READ_EXTERNAL_STORAGE:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
+            case WRITE_EXTERNAL_STORAGE:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            case UNKNOWN:
+                throw new InvalidParameterException(authorizationCode.name());
+            default:
+                throw new IllegalArgumentException(authorizationCode.name());
+        }
+    }
+
+    @Override
+    public void requestAuthorization(Activity activity, AuthorizationCode authorizationCode) {
+        switch (authorizationCode) {
+            case RECORD_AUDIO:
+                ActivityCompat.requestPermissions(activity, AUDIO_PERMISSIONS, RECORD_AUDIO_PERMISSION_REQUEST_CODE);
+                break;
+            case CAMERA:
+                ActivityCompat.requestPermissions(activity, CAMERA_PERMISSIONS, CAMERA_PERMISSION_REQUEST_CODE);
+                break;
+            case GEOLOCATION:
+                ActivityCompat.requestPermissions(activity, LOCATION_PERMISSIONS, LOCATION_PERMISSION_REQUEST_CODE);
+                break;
+            case READ_EXTERNAL_STORAGE:
+                ActivityCompat.requestPermissions(activity, READ_EXTERNAL_STORAGE_PERMISSIONS, READ_STORAGE_PERMISSION_REQUEST_CODE);
+                break;
+            case WRITE_EXTERNAL_STORAGE:
+                ActivityCompat.requestPermissions(activity, WRITE_EXTERNAL_STORAGE_PERMISSIONS, WRITE_STORAGE_PERMISSION_REQUEST_CODE);
+                break;
+            case UNKNOWN:
+                throw new InvalidParameterException(authorizationCode.name());
+            default:
+                throw new IllegalArgumentException(authorizationCode.name());
+        }
+        permissionPrompShowed = true;
+    }
+
+    private AuthorizationStatus getPermissionAuthorizationStatus(Activity activity, String permission) {
+        int permissionState = ContextCompat.checkSelfPermission(activity.getApplicationContext(), permission);
+
+        return authorizationStatus(activity, permissionState);
+    }
+
+    private AuthorizationStatus authorizationStatus(Activity activity, int permissionState) {
+        if (permissionState == PackageManager.PERMISSION_GRANTED)
+            return AuthorizationStatus.AUTHORIZE;
+        if (!permissionPrompShowed)
+            return AuthorizationStatus.NOT_DETERMINED;
+
+        boolean shouldShowPermissionPrompt = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
+
+        return shouldShowPermissionPrompt ? AuthorizationStatus.NOT_DETERMINED : AuthorizationStatus.DENIED;
+    }
+}

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

@@ -22,8 +22,9 @@ public class AudioHandle implements Runnable{
 	private DataOutputStream outData =null;
 	private Thread t_micListner;
 	private UDPclient udp;
-	private TCPaudioClient tcp;
+	private TcpAudioClient tcp;
 	private int audioport = 50001;
+
 	
 	public int typeUDP;
 	public AudioHandle(String IP, int _typeUDP)
@@ -56,7 +57,7 @@ public class AudioHandle implements Runnable{
 		else
 		{
 			try {
-				tcp = new TCPaudioClient(IP,audioport);
+				tcp = new TcpAudioClient(IP,audioport);
 				bufferSize = AudioTrack.getMinBufferSize(SAMPLE_RATE, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
 				
 				
@@ -89,7 +90,7 @@ public class AudioHandle implements Runnable{
 		t_micListner.start();
 		
 	
-		if(typeUDP==1)
+		if(typeUDP == 1)
 		{
 			udp.addUDPListener(new IUDPListener()
 			{
@@ -99,7 +100,7 @@ public class AudioHandle implements Runnable{
 				byte[] data = event.data();
 				int len = event.len();
 				SM.Debug("recv b:"+len+" data.length:"+data.length);
-				if(data!=null)
+				if(data != null)
 					PlaySound(data, len);
 				}
 				
@@ -141,21 +142,23 @@ public class AudioHandle implements Runnable{
 				 if (soundNeeded)      
 				 {				
 					 //SM.Debug("sending b:"+bRead); 
-					 if(typeUDP==1)
+					 if(typeUDP == 1)
-					 { 		
+					 {
-						 tempBuffer = new byte[512];//128];//invers3.bufferSize];
+						 int size = 512; // 2048
-						 bRead = recDev.read(tempBuffer, 0, 512);// 128);//invers3.bufferSize);
+
+						 tempBuffer = new byte[size];
+						 bRead = recDev.read(tempBuffer, 0, size);
+
 						 udp.Send(tempBuffer,bRead);
 						 SM.Debug("UDP sending b:"+bRead); 
 					 }
 					 else
 					 {
-						 tempBuffer = new byte[2048];//128];//invers3.bufferSize];
+					 	 int size = 1024; //
-						 bRead = recDev.read(tempBuffer, 0, 2048);// 128);//invers3.bufferSize);
+						 tempBuffer = new byte[size];
-						 /*
+						 bRead = recDev.read(tempBuffer, 0, size);
-						 tempBuffer = new byte[16384];//128];//invers3.bufferSize];
+
-						 bRead = recDev.read(tempBuffer, 0,16384);// 128);//invers3.bufferSize);*/
+						 tcp.send(tempBuffer,bRead);
-						 tcp.Send(tempBuffer,bRead);
 						 SM.Debug("TCP sending b:"+bRead);
 					 }
 				 }		

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -66,6 +66,7 @@ public class AlarmActivity extends Activity {
 		setContentView(R.layout.tabalarm);
 
 		gridView = findViewById(R.id.gridViewAlarms);
+		gridView.setNestedScrollingEnabled(true);
 		adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
 		gridView.setAdapter(adapter);
 
@@ -76,7 +77,7 @@ public class AlarmActivity extends Activity {
 		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
 		textView1.setTextSize(24);
 
-		getParentTab().alarmActivity = this;
+		getParentTab().setAlarmActivity(this);
 	}
 
 	@Override
@@ -128,9 +129,12 @@ public class AlarmActivity extends Activity {
 			setConvertViewAlarm(arg1);
 			// save position 
 			ackPosition = position;
-			if (!AppParams.DEMO)
+			if (!AppParams.DEMO) {
+				getParentTab().getAlarms(AppParams.USERID);
 				setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName);
-			else {
+				acknowledged.set(position, true);
+				updateResultsInUi(ALARM);
+			} else {
 				getAllAlarms().get(position).ack = 1;
 				updateResultsInUi("else");
 			}
@@ -168,7 +172,10 @@ public class AlarmActivity extends Activity {
 		if (param.equals(ALARM)) {
 			// set adapter
 			adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+			int position = gridView.getFirstVisiblePosition();
+
 			gridView.setAdapter(adapter);
+			gridView.setSelection(position);
 		} else {
 			adapter.changeACK(ackPosition);
 			SM.Debug("Set ACK: " + ackPosition + "  | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false"));

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.content.Context;
 import android.util.Log;
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 
 
 public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
@@ -42,7 +43,6 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
     public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
         isLiveTab = false;
         this.context = context;
-//        this.superVehHash = vehicles;
         mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
     }
 
@@ -73,7 +73,7 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
             }
         } else {
             try {
-                position = Integer.getInteger(marker.getTitle());
+                position = Integer.parseInt(marker.getTitle());
             } catch (Exception e) {
                 Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
             }
@@ -91,28 +91,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
 
         boolean isMilitaryTime = false;
         Date positionTime;
+        long timeGMT = 0;
         String speed, address, gpsLocation, name = "";
         if (isLiveTab) {
             SuperVehicle vehicle = superVehHash.get(key);
-            positionTime = new Date(vehicle.timeGMT);
+
+            //positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
+
+            timeGMT = vehicle.timeGMT;
             address = vehicle.Address != null ? vehicle.Address : "";
             name = vehicle.name;
-            speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * vehicle.speed));
             gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
         } else {
             HistPos histPos = histPosList.get(position);
-            positionTime = new Date(histPos.timeGMT);
+
+            //positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
+            timeGMT = histPos.timeGMT;
             address = histPos.Address != null ? histPos.Address : "";
-            speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
+            speed = String.format(context.getResources().getString(R.string.speedMph),  (int)(0.621371192 * histPos.speed));
             gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
         }
 
-        String timeFormat = isMilitaryTime
+        //String timeFormat = isMilitaryTime
-                ? "HH:mm:ss dd.MMM.yyyy"
+        //        ? "HH:mm:ss dd.MMM.yyyy"
-                : "hh:mm:ss a dd.MMM.yyy";
+        //       : "hh:mm:ss a dd.MMM.yyy";
+
+        //DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
+        //tvTimeAgo.setText(format.format(positionTime));
+
+        DateFormat format = new SimpleDateFormat("hh:mm:ss", Locale.ENGLISH);
+        tvTimeAgo.setText( getDateTimeAgo(timeGMT * 1000)  +  "  [" +  format.format(new Date(timeGMT*1000) ) + "]");
 
-        DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
-        tvTimeAgo.setText(format.format(positionTime));
         tvStreetView.setText(address);
         streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
         tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
@@ -124,5 +134,38 @@ public class GoogleMapsInfoBubble  implements GoogleMap.InfoWindowAdapter {
         tvSpeed.setText(speed);
         tvGPSLocation.setText(gpsLocation);
     }
+
+    /// <summary>
+    /// Get a text representation for the date time representing
+    /// the difference in minutes/hours/days from now
+    /// </summary>
+    /// <param name="utcTime">DateTime value which needs to be converted</param>
+    /// <returns>String 'Ago' representation fot he date</returns>
+    public static String getDateTimeAgo(long time)
+    {
+        String timeValue = "";
+
+        long diffInMs = (new Date().getTime() - time);
+
+        long secondsDifference = TimeUnit.MILLISECONDS.toSeconds(diffInMs);;
+
+        if (secondsDifference < 60)
+            timeValue = "less than 1 minute";
+        else if (secondsDifference < 3600)
+            timeValue = (secondsDifference / 60) + " minute" + ((secondsDifference / 60) > 1 ? "s" : "") + " ago";
+        else if (secondsDifference < 7200)
+            timeValue = "1 hour ago";
+        else if (secondsDifference < 86400)
+        {
+            timeValue = (secondsDifference / 3600) + " hours ago";
+        }
+        else
+        {
+            timeValue = (secondsDifference / 86400) + " days ago";
+        }
+
+        return timeValue;
+    }
+
 }
 

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

@@ -1,8 +1,9 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.graphics.Color;
@@ -10,9 +11,11 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -51,6 +54,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
     private final ArrayList<Vehicle> allVehicle = new ArrayList<>();
     private final ArrayList<String> allVehicleNames = new ArrayList<>();
     private final SimpleDateFormat sdf = new SimpleDateFormat("MMMM dd yyyy");
+    private boolean showVehicles = true;
 
 
     @Override
@@ -60,7 +64,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         setContentView(R.layout.tabhistory);
 
         parentTab = (TabLayoutActivity) getParent();
-        parentTab.historyActivity = this;
+        parentTab.setHistoryActivity(this);
 
         Locale locale = new Locale(AppParams.LANGUAGETMP);
         Locale.setDefault(locale);
@@ -85,23 +89,60 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         displayButton.setOnClickListener(view -> {
             googleMap.clear();
             if (!AppParams.DEMO) {
-                parentTab.dropAllData =false;
+                parentTab.setDropAllData(false);
-                parentTab.firstHistData = true;
+                parentTab.setFirstHistoryData(true);
-                parentTab.HistMsgList.clear();
+                parentTab.clearHistoryMessageList();
-                parentTab.HistPosList.clear();
+                parentTab.clearHistoryPositionList();
 
 //                request history
                 parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
                         (startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
             } else {
                 parentTab.demoPositionsList();
-                displayHistory(parentTab.demoPositions);
+                displayHistory(parentTab.getDemoPositions());
+            }
+        });
+
+        ImageView mapType = findViewById(R.id.changeMapTypeHeader);
+        mapType.setOnClickListener(view -> {
+            if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
+                mapType.setImageResource(R.drawable.map);
+                googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+            } else {
+                mapType.setImageResource(R.drawable.satellite);
+                googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+            }
+        });
+
+        LinearLayout slideLayout = findViewById(R.id.slidelayout);
+        LinearLayout linearLayoutVehicles = findViewById(R.id.layoutBig);
+        ImageView slideLayoutImageView = findViewById(R.id.slideLayoutImage);
+        slideLayout.setOnClickListener(v -> {
+            if (showVehicles) {
+                linearLayoutVehicles.setVisibility(View.GONE);
+                slideLayoutImageView.setImageResource(R.drawable.arrow_right);
+                showVehicles = false;
+            } else {
+                linearLayoutVehicles.setVisibility(View.VISIBLE);
+                slideLayoutImageView.setImageResource(R.drawable.arrow_left);
+                showVehicles = true;
             }
         });
 
         setDate();
     }
 
+    public void setLanguage() {
+        TextView labelVehicle = findViewById(R.id.labelVehicle);
+        TextView labelStartDate = findViewById(R.id.labelStartDate);
+        TextView labelEndDate = findViewById(R.id.labelEndDate);
+
+        labelVehicle.setText(R.string.vehicle);
+        labelStartDate.setText(R.string.startDate);
+        labelEndDate.setText(R.string.endDate);
+        displayButton.setText(R.string.display);
+    }
+
     private void displayHistory(ArrayList<HistPos> positions) {
         LatLng latLng = null;
         PolylineOptions polylineOptions = new PolylineOptions();
@@ -124,10 +165,23 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
     }
 
+    @Override
+    public void onBackPressed() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(getString(R.string.exit))
+                .setCancelable(false)
+                .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
+                .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
+                .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+        AlertDialog alert = builder.create();
+        alert.show();
+    }
+
     private void setDate() {
         Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, 1);
         endDate = calendar.getTime();
-        calendar.add(Calendar.DATE, -1);
+        calendar.add(Calendar.DATE, -2);
         startDate = calendar.getTime();
 
         TextView textViewStartDate = findViewById(R.id.textViewStartDate);
@@ -204,10 +258,10 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 
     final Runnable UpdateMapResults = new Runnable() {
         public void run() {
-            Log.v("updateMap", parentTab.HistPosList.toString());
+            Log.v("updateMap", parentTab.getHistoryPositionList().toString());
             SM.Debug("Do the Display");
-            infoBubble.setHistoryPositions(parentTab.HistPosList);
+            infoBubble.setHistoryPositions(parentTab.getHistoryPositionList());
-            displayHistory(parentTab.HistPosList);
+            displayHistory(parentTab.getHistoryPositionList());
         }
     };
 
@@ -234,8 +288,8 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 
         infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this);
         this.googleMap.setInfoWindowAdapter(infoBubble);
+        this.googleMap.getUiSettings().setMapToolbarEnabled(false);
 
         parentTab.demoPositionsList();
-        displayButton.performClick();
     }
 }

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

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -32,6 +32,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
+import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
@@ -88,7 +89,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
     private boolean isAck = false;
     private boolean showVehicle = true;
     private int contextMenuPosition;
-    private int vehStatus;
+    private int vehStatus, lastItemClicked;
     private int position; // vehStatus = vehicle status received from apps
 
     /* Live Vehicle GridView */
@@ -112,7 +113,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // get parentTab
         setParentTab((AbstractSDParentActivity) getParent());
         try {
-            ((TabLayoutActivity) getParentTab()).liveActivity = this;
+            ((TabLayoutActivity) getParentTab()).setLiveActivity(this);
         } catch (Exception ignored) {
             // ignored
         }
@@ -145,11 +146,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // image View for changing map type satellite or map
         ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
         changeMapTypeImageView.setOnClickListener(v -> {
-            if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
+            if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
-                changeMapTypeImageView.setImageResource(R.drawable.satellite);
+                changeMapTypeImageView.setImageResource(R.drawable.map);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
             } else {
-                changeMapTypeImageView.setImageResource(R.drawable.map);
+                changeMapTypeImageView.setImageResource(R.drawable.satellite);
                 googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
             }
         });
@@ -254,7 +255,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             }
 
             // refresh UI
-            displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+            displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
         });
 
         displayButton = findViewById(R.id.buttonDisplay);
@@ -285,16 +286,21 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             }
 
             // refresh UI
-            displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+            displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
         });
 
         // display Vehicles
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
 
         // register to receive broadcasts
         registerBroadcastIntents();
     }
 
+    public void setLanguage() {
+        TextView textView = findViewById(R.id.unit_name);
+        textView.setText(R.string.unitName);
+    }
+
     /**
      * Manipulates the map once available.
      * This callback is triggered when the map is ready to be used.
@@ -309,6 +315,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         this.googleMap = googleMap;
         GoogleMapsInfoBubble infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this, getParentTab().getSuperVehHash());
         this.googleMap.setInfoWindowAdapter(infoBubble);
+        this.googleMap.getUiSettings().setMapToolbarEnabled(false);
     }
 
 
@@ -371,7 +378,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
 
         // clear previous vehicles
         SM.Debug("onResume");
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
     }
 
     final Runnable cancelLoadingDialogRUN = LiveActivity.this::cancelLoadingDialog;
@@ -440,14 +447,8 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         });
     }
 
-    public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) {
+    public void displayVehicle(double latZoom, double lngZoom) {
         if (googleMap != null) {
-            String openWindow = "";
-            for (Marker marker : markers) {
-                if (marker.isInfoWindowShown()) {
-                    openWindow = marker.getTitle();
-                }
-            }
             googleMap.clear();
 
             for (int i = 0; i < displayedVehicles.size(); i++) {
@@ -462,8 +463,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                         markerOptions.icon(markerIcon);
 
                         Marker marker = this.googleMap.addMarker(markerOptions);
-                        if (openWindow.equals(marker.getTitle()))
+
+                        if (i == lastItemClicked) {
                             marker.showInfoWindow();
+                            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
+                        }
 
                         markers.add(marker);
                     }
@@ -472,10 +476,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         }
     }
 
-    public void showOpenedBalloon(boolean demo) {
-        //TODO: add show balloon
-    }
-
     private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
         Bitmap bitmap = BitmapFactory.decodeResource(getResources(), largeIcon);
         Bitmap textBitmap = getTextAsDrawable(this, text);
@@ -650,7 +650,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
     }
 
     // Create runnable for posting
-    final Runnable updateMapResults = () -> displayVehicle(false, LAT_OUTLIMIT, LNG_OUTLIMIT);
+    final Runnable updateMapResults = () -> displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
 
     // Create runnable for posting
     final Runnable updatePollResults = () -> {
@@ -660,7 +660,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
             adapter.changeDisplayed(position, true);
         }
 
-        displayVehicle(true, latPoll, lngPoll); };
+        displayVehicle(latPoll, lngPoll); };
 
     // Create runnable for posting
     final Runnable updateOptionsRUN = this::updateOptionsUI;
@@ -678,8 +678,9 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
      * @param view     View in which will do the modifications
      */
     private void itemClick(int position, View view) {
+        lastItemClicked = position;
         // change displayed state
-        displayedVehicles.set(position, !Boolean.TRUE.equals(displayedVehicles.get(position)));
+        displayedVehicles.set(position, !displayedVehicles.get(position));
 
         // change in the adapter
         adapter.changeDisplayed(position, displayedVehicles.get(position));
@@ -687,30 +688,30 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // change check image for selected value
         VehiclesGridViewAdapter.ViewHolder viewLive = (VehiclesGridViewAdapter.ViewHolder) view.getTag();
 
-        if (Boolean.TRUE.equals(displayedVehicles.get(position)))
+        if (displayedVehicles.get(position))
             viewLive.imgViewChecked.setImageResource(R.drawable.checked);
         else
             viewLive.imgViewChecked.setImageResource(R.drawable.unchecked);
 
         // check if all values are identical
-        boolean identical = true;
+        boolean allDisplayed = true;
-        for (Boolean displ : displayedVehicles)
+        for (Boolean displayed : displayedVehicles)
-            if (!Objects.equals(displ, displayedVehicles.get(0))) {
+            if (!displayed) {
-                identical = false;
+                allDisplayed = false;
                 break;
             }
 
         // change image when all values are identical
-        if (identical && Boolean.TRUE.equals(displayedVehicles.get(0))) {
+        if (allDisplayed) {
             imageViewCheckAll.setSelected(true);
             imageViewCheckAll.setBackgroundResource(R.drawable.check_all);
-        } else if (identical && Boolean.TRUE.equals(!displayedVehicles.get(0))) {
+        } else {
             imageViewCheckAll.setSelected(false);
             imageViewCheckAll.setBackgroundResource(R.drawable.uncheck_all);
         }
 
         // display vehicle
-        displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
+        displayVehicle(LAT_OUTLIMIT, LNG_OUTLIMIT);
     }
 
     /**

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -10,6 +10,7 @@ import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -45,6 +46,7 @@ public class MessagesActivity extends Activity {
 	/**
 	 * Called when the activity is first created.
 	 */
+	private final String TAG = "MessagesActivity";
 
 	private MessagesGridViewAdapter mAdapter;
 	private ConversationGridViewAdapter convAdapter;
@@ -124,16 +126,6 @@ public class MessagesActivity extends Activity {
 		textViewSelectedContact = findViewById(R.id.textViewSelectedContact);
 		imageViewSelectedContact = findViewById(R.id.imageViewSelectedContact);
 
-		ImageView imageBarcode = findViewById(R.id.imageBarcode);
-		imageBarcode.setOnClickListener(v -> {
-			try {
-				Intent intent = new Intent("com.google.zxing.client.android.SCAN");
-				startActivityForResult(intent, 0);
-			} catch (Exception e) {
-				showErrorDialog(getResources().getString(R.string.barcodeError));
-			}
-		});
-
 		// change tab header fontFace
 		TextView textView1 = findViewById(R.id.textView1);
 		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
@@ -148,6 +140,7 @@ public class MessagesActivity extends Activity {
 
 		// Implement On Item click listener
 		gridView.setOnItemClickListener((arg0, arg1, position, arg3) -> {
+			Log.v(TAG, "onItemClick " + LASTMESSAGES);
 			if (LASTMESSAGES) {
 				// get position
 				Msg item = mAdapter.getItem(position);
@@ -177,6 +170,8 @@ public class MessagesActivity extends Activity {
 		// button send message
 		imageButtonSend = findViewById(R.id.imageButtonSend);
 		imageButtonSend.setOnClickListener(v -> {
+			if (editTextMsg.getText().toString().isEmpty())
+				return;
 			sendSMS(getScId(), editTextMsg.getText().toString());
 			Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show();
 			// disable send button and editBox
@@ -204,6 +199,7 @@ public class MessagesActivity extends Activity {
 		imageButtonBack.setOnClickListener(v -> {
 			// set LastMessage conversation type
 			LASTMESSAGES = true;
+			Log.v(TAG, "lastmessages: true");
 			// refresh Grid
 			getLastSMS();
 			if (AppParams.DEMO)
@@ -215,7 +211,7 @@ public class MessagesActivity extends Activity {
 
 		gridView.setId(1);    // id needed for IconContextMenu
 		registerForContextMenu(gridView);
-		parentTab.messageActivity = this;
+		parentTab.setMessageActivity(this);
 	}
 
 	// Create runnable for posting
@@ -396,6 +392,7 @@ public class MessagesActivity extends Activity {
 				listLastMessages.add(new Msg(sentVehicle, txt, Calendar.getInstance().getTime(), sendSMSSeqID));
 			}
 			SM.Debug("time: " + timeGMT + "   |   " + Calendar.getInstance().getTime());
+			Log.v(TAG, "lastmessages: false");
 			LASTMESSAGES = false;
 
 			updateResultsInUi();
@@ -635,6 +632,7 @@ public class MessagesActivity extends Activity {
 			setScId(item.sc_id);
 			SM.Debug("Selected scId: " + getScId());
 			// set Conversation type
+			Log.v(TAG, "lastmessages: false");
 			LASTMESSAGES = false;
 			// call get SMS
 			getSMS4unit(getScId());

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

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

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

@@ -0,0 +1,940 @@
+package com.safemobile.safedispatch;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.RadioGroup.OnCheckedChangeListener;
+import android.widget.TextView;
+
+import com.safemobile.lib.AppParams;
+import com.safemobile.lib.OperationCodes;
+import com.safemobile.lib.SM;
+import com.safemobile.lib.Vehicle;
+import com.safemobile.lib.radio.Channel;
+import com.safemobile.lib.radio.RadioGW;
+import com.safemobile.lib.radio.Zone;
+import com.safemobile.lib.radio.Zone_and_channel;
+import com.safemobile.lib.sound.AudioHandle;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+/**
+ * fix import
+ */
+
+public class RadioActivity extends Activity {
+
+	/* Visual Elements */
+	private Button buttonPTT, buttonDKey;
+	private RadioGroup radioGroupCallType;
+	private RadioButton radioAll, radioGroup, radioPrivate;
+	private LinearLayout layoutGateway, layoutSpinnerChannel, layoutSpinnerZone, layoutSpinnerCallType;
+	private TextView textViewMessageChannel, textViewMessageStatus, textViewGateway, textViewChannel, textViewZone, textViewIP, textViewCallType;
+	private ImageView imageViewStatus;
+
+	/* Misc */
+	private TabLayoutActivity parentTab;
+	private Context context;
+	private Activity activity;
+
+	private int radioID, GWID, zoneNR, chNR;
+	private int rStatus = 0;
+	private long imei = 0;
+	private int calltype = 0;
+	private int groupid = 0;
+	private int callstatus = 0;
+
+	/* Lists */
+	private ArrayList<String> allVehicleNames = new ArrayList<>();
+	public ArrayList<Vehicle> allVehicle = new ArrayList<>();
+
+	private final ArrayList<Integer> allGroupsIDs = new ArrayList<>();
+	private final ArrayList<String> allGroupsNames = new ArrayList<>();
+
+	private ArrayList<Zone> crtZones = new ArrayList<>();
+	private ArrayList<Channel> crtChannels = new ArrayList<>();
+	private final ArrayList<String> allGWsIP = new ArrayList<>();
+	private ArrayAdapter<String> adapter;
+
+	// Need handler for callbacks to the UI thread
+    private final Handler myHandler = new Handler();
+
+    public Thread audioThread;
+
+    //PTT
+    private AudioHandle audioH = null;
+    private final int ALLCall = 101, PRIVATECall = 102, GROUPCall = 103;
+	private int selectedID=0, selectedCallType = 101;
+	private Boolean pttONoff = false;
+	private final int inCall = 1, hangTime = 2, callEnd = 3;
+
+	private Bundle savedInstanceState;
+
+
+	/** Called when the activity is first created. */
+    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());
+
+	    	setContentView(R.layout.tabradio);
+			// get context
+			context = this;
+			activity = this;
+
+			allGroupsNames.add("1");
+			allGroupsNames.add("2");
+			allGroupsIDs.add(1);
+			allGroupsIDs.add(2);
+
+			//====================
+			// get visual elements
+			//====================
+
+			// get buttons
+			buttonPTT = findViewById(R.id.buttonPTT);
+			buttonDKey = findViewById(R.id.buttonDKey);
+
+			// get CallType Spinner
+			layoutSpinnerCallType = findViewById(R.id.layoutSpinnerCallType);
+			layoutSpinnerCallType.setOnClickListener(CallTypeListener);
+			textViewCallType = findViewById(R.id.textViewCallType);
+
+			// get status dot
+			imageViewStatus = findViewById(R.id.imageViewStatus);
+
+			layoutSpinnerChannel = findViewById(R.id.layoutSpinnerChannel);
+			layoutSpinnerChannel.setOnClickListener(ChannelChangeListener);
+
+			layoutSpinnerZone = findViewById(R.id.layoutSpinnerZone);
+			layoutSpinnerZone.setOnClickListener(ZoneChangeListener);
+
+			// get TextView from Spinner
+			textViewChannel = findViewById(R.id.textViewChannel);
+			textViewZone = findViewById(R.id.textViewZone);
+
+			// get IP
+			textViewIP = findViewById(R.id.textViewIP);
+			textViewIP.setText(AppParams.IP);
+
+			// get CallType
+			radioGroupCallType = findViewById(R.id.radioGroupCallType);
+			radioGroupCallType.setOnCheckedChangeListener(CallTypeChanged);
+
+			// get radio buttons
+			radioAll = findViewById(R.id.radioAll);
+			radioGroup = findViewById(R.id.radioGroup);
+			radioPrivate = findViewById(R.id.radioPrivate);
+
+			// get channel
+			textViewMessageChannel = findViewById(R.id.textViewMessageChannel);
+			// get gateway
+			textViewGateway = findViewById(R.id.textViewGateway);
+			textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
+			textViewGateway.setTextSize(24);
+
+			// get status
+			textViewMessageStatus = findViewById(R.id.textViewMessageStatus);
+			layoutGateway = findViewById(R.id.layoutGateway);
+			layoutGateway.setOnClickListener(GatwayListener);
+
+			// set button ptt listener
+			buttonPTT.setOnClickListener(PTTClickListener);
+			// set button DKey listener
+			buttonDKey.setOnClickListener(DKeyClickListener);
+
+			startAudioThread();
+
+			if(!AppParams.DEMO)
+				UpdateEnableDisableButtons("offline");
+
+
+			// send current activity to parent
+			parentTab.setRadioActivity(this);
+
+			// register to be notified when an event is triggered
+	    	registerBroadcastIntents();
+    }
+
+    public Bundle getSavedInstanceState() {
+    	return savedInstanceState;
+	}
+
+    private void startAudioThread() {
+		audioThread = new Thread(() -> {
+			//start audio
+			try {
+				if (audioH == null && !AppParams.IP.equalsIgnoreCase("n/a"))
+					audioH = new AudioHandle(AppParams.IP,0);
+			} catch(Exception ex) {
+				SM.Exception("#### audioH exception! ####");
+				SM.Exception(ex.toString());
+			}
+		});
+
+		audioThread.start();
+	}
+
+    @Override
+    public void onBackPressed() {
+    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    	builder.setMessage(getString(R.string.exit))
+    	       .setCancelable(false)
+    	       .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
+    	       .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
+    	       .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+    	AlertDialog alert = builder.create();
+    	alert.show();
+    }
+
+    @Override
+    public void onPause() {
+    	super.onPause();
+    	SM.Debug("onPause");
+    }
+
+    @Override
+    public void onResume() {
+    	super.onResume();
+    	// get all vehicles from TabLayoutActivity
+    	if (!allVehicle.equals(parentTab.getAllVehicle())) {
+    		allVehicle = parentTab.getAllVehicle();
+			UpdateVehicle();
+    	}
+
+    	if (AppParams.listRadios.size() == 0)
+    		GetGWRadios();
+    	SM.Debug("onResume");
+    }
+
+	private final OnClickListener GatwayListener = new OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			adapter = new ArrayAdapter<>(
+					context, R.layout.template_simple_list_item,
+					allGWsIP);
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(context);
+			builder.setTitle("Select RadioGW");
+			builder.setAdapter(adapter,
+					(dialog, which) -> {
+						// change gateway
+						//textViewGateway.setText(allGWsIP.get(which));
+						// change visual if selected another radioGW
+
+						radioGWChanged(allGWsIP.get(which));
+					});
+			AlertDialog alert = builder.create();
+			alert.show();
+		}
+	};
+
+    private final OnClickListener PTTClickListener = v -> {
+		if (pttONoff)
+			pttOffClick();
+		else
+			pttOnClick();
+	};
+
+	private void pttOnClick() {
+		//================
+		// get selectedID
+		//================
+		if(selectedCallType == GROUPCall)
+			selectedID = getGroupID4Name(textViewCallType.getText().toString());
+		else if (selectedCallType == PRIVATECall)
+			selectedID = getPrivateImei4Name(textViewCallType.getText().toString());
+		else
+			selectedID = -1;
+
+
+		// send start the call
+		if(parentTab.getCrtRadio() != null)
+			SendPTT(selectedCallType, selectedID, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
+
+		// flag in Call
+		parentTab.setInCall(true);
+		pttONoff= true;
+		// start sound
+		if(audioH!=null)
+			audioH.soundNeeded = true;
+
+		buttonPTT.setText(getString(R.string.PTToff));
+		buttonPTT.setBackgroundResource(R.drawable.style_buttonptt_green);
+
+		// change text in Screen according to callType
+		String chanMsg = "", statMsg = "";
+		switch(selectedCallType)
+		{
+			case PRIVATECall : chanMsg = getString(R.string.PrivateCall); statMsg = textViewCallType.getText().toString();  break;
+			case GROUPCall : chanMsg = getString(R.string.GroupCall); statMsg = textViewCallType.getText().toString();  break;
+			case ALLCall : chanMsg = getString(R.string.AllCall); statMsg = "";  break;
+		}
+		textViewMessageChannel.setText(chanMsg);
+		textViewMessageStatus.setText(statMsg);
+		// change status image
+		imageViewStatus.setImageResource(R.drawable.status_idle);
+
+		//===================
+		// disable buttons
+		//===================
+		UpdateEnableDisableButtons("disablePTT");
+		parentTab.enableMenuButtons(false);
+	}
+
+	private void pttOffClick() {
+		String chanMsg, statMsg = "";
+
+		// send stop the call
+		if(parentTab.getCrtRadio() != null)
+			SendPTT(selectedCallType + 10, selectedID, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
+
+		// stop sound
+		pttONoff = false;
+		if(audioH != null)
+			audioH.soundNeeded = false;
+
+		buttonPTT.setText(getString(R.string.PTT));
+		buttonPTT.setBackgroundResource(R.drawable.style_buttonptt);
+
+		chanMsg = textViewChannel.getText().toString();
+		textViewMessageChannel.setText(chanMsg);
+		textViewMessageStatus.setText(statMsg);
+
+		// change status image
+		imageViewStatus.setImageResource(R.drawable.status_online);
+
+		// enable buttons
+		UpdateEnableDisableButtons("enable");
+		parentTab.enableMenuButtons(true);
+	}
+
+	private final OnClickListener DKeyClickListener = v -> SendDekey();
+
+	private final OnClickListener ChannelChangeListener = new OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			if (parentTab.getCrtRadio() != null) {
+				// display dialog with adapter
+				ArrayList<String> tmp = new ArrayList<>();
+				for(Channel ch: crtChannels)
+					tmp.add(ch.chName);
+
+				ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, R.layout.template_simple_list_item, tmp);
+
+				AlertDialog.Builder builder = new AlertDialog.Builder(context);
+				builder.setTitle(getString(R.string.selChannel));
+				builder.setAdapter(adapter , (dialog, which) -> {
+					// change Channel in Display
+					//textViewMessageChannel.setText(crtChannels.get(which).chName);
+
+					// set channel name
+					//textViewChannel.setText(crtChannels.get(which).chName);
+
+					// send change to App
+					onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
+				});
+
+				AlertDialog alert = builder.create();
+				alert.show();
+			}
+		}
+	};
+
+	private final OnClickListener ZoneChangeListener =  new OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			if (parentTab.getCrtRadio() !=null) {
+				// display dialog with adapter
+				ArrayList<String> tmp = new ArrayList<>();
+				for(Zone zone: crtZones)
+					tmp.add(zone.ZoneName);
+
+				ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, R.layout.template_simple_list_item, tmp);
+
+				AlertDialog.Builder builder = new AlertDialog.Builder(context);
+				builder.setTitle(getString(R.string.selZone));
+				builder.setAdapter(adapter , (dialog, which) -> {
+					// send change to App
+					onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
+				});
+
+				AlertDialog alert = builder.create();
+				alert.show();
+			}
+		}
+	};
+
+	private final OnClickListener CallTypeListener =  new OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			if (parentTab.getCrtRadio() != null) {
+				// create spinner selected
+				AlertDialog.Builder builder = new AlertDialog.Builder(context);
+				switch(radioGroupCallType.getCheckedRadioButtonId()) {
+					case R.id.radioGroup :
+							// set adapter and title
+							adapter = new ArrayAdapter<>(activity, R.layout.template_simple_list_item, allGroupsNames);
+							builder.setTitle(getString(R.string.selectGroup));
+							break;
+					case R.id.radioPrivate :
+							// set adapter and title
+							adapter = new ArrayAdapter<>(activity, R.layout.template_simple_list_item, allVehicleNames);
+							builder.setTitle(getString(R.string.selectVehicle));
+							break;
+				}
+
+				builder.setAdapter(adapter , (dialog, which) -> {
+					switch(radioGroupCallType.getCheckedRadioButtonId()) {
+						case R.id.radioGroup :
+								// set adapter and title
+								textViewCallType.setText(allGroupsNames.get(which));
+								break;
+						case R.id.radioPrivate :
+								textViewCallType.setText(allVehicleNames.get(which));
+								break;
+					}
+				});
+
+				AlertDialog alert = builder.create();
+				alert.show();
+			}
+		}
+	};
+
+	private final OnCheckedChangeListener CallTypeChanged = new OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(RadioGroup group, int checkedId) {
+			switch(radioGroupCallType.getCheckedRadioButtonId()) {
+				case R.id.radioAll :
+						layoutSpinnerCallType.setVisibility(View.INVISIBLE);
+						selectedCallType = ALLCall;
+						break;
+				case R.id.radioGroup :
+						layoutSpinnerCallType.setVisibility(View.VISIBLE);
+						textViewCallType.setText(allGroupsNames.get(0));
+						selectedCallType = GROUPCall;
+						break;
+				case R.id.radioPrivate :
+						layoutSpinnerCallType.setVisibility(View.VISIBLE);
+						if (allVehicleNames.size() > 0)
+							textViewCallType.setText(allVehicleNames.get(0));
+						else
+							textViewCallType.setText("");
+
+						selectedCallType = PRIVATECall;
+						break;
+			}
+		}
+	};
+
+	// called from ParentTabActivity
+	public void UpdateRadios(ArrayList<RadioGW> radios) {
+		// save radios
+		AppParams.listRadios = radios;
+		if(parentTab.getCrtRadio() == null)
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
+
+		// if crtRadio not exists anymore
+		if(!AppParams.listRadios.contains(parentTab.getCrtRadio()))
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
+
+		SM.Debug(parentTab.getCrtRadio().toString());
+
+
+		// get status for selected Radio
+		ReqRadioStatus(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID);
+		// get selected Zone and CH
+		onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, 0,0);
+
+		myHandler.post(updateGatewaysRUN);
+	}
+
+
+	// Create runnable for posting
+    final Runnable updateGatewaysRUN = this::updateGateways;
+
+
+    public void updateGateways() {
+    	// get all radio IP
+		allGWsIP.clear();
+		for (RadioGW radio: AppParams.listRadios)
+			allGWsIP.add(radio.IP);
+
+		textViewGateway.setText(parentTab.getCrtRadio().IP);
+    }
+
+
+	// modify privateCall Adapter after resume if Vehicle List Modified
+	public void UpdateVehicle() {
+		allVehicleNames = new ArrayList<>();
+		if (allVehicle!=null)
+			for(Vehicle vehicle: allVehicle)
+				allVehicleNames.add(vehicle.name);
+	}
+
+	private RadioGW getRadioGW(int _radioID, int _gwID) {
+		for (RadioGW radio: AppParams.listRadios) {
+			if (radio.GW_ID == _gwID && radio.ID == _radioID)
+				return radio;
+		}
+
+		return null;
+	}
+
+	private  ArrayList<Channel> getChannels(int zoneNR) {
+		for(Zone zone : parentTab.getCrtRadio().zoneList) {
+			if (zone.id == zoneNR)
+				return zone.channelList;
+		}
+
+		return new ArrayList<>();
+	}
+
+	// called from ParentTabActivity to set radioID, GWID, zoneNR and chNR
+	public void UpdateZoneCH(int _radioID, int _gwID, int _zoneNR, int _chNR) {
+    	// save received id's zoneNr and CHNR
+    	this.radioID = _radioID;
+    	this.GWID = _gwID;
+    	this.zoneNR = _zoneNR;
+    	this.chNR = _chNR;
+
+    	SM.Debug("am primit: " + _radioID + "," + _gwID + "," + _zoneNR + "," + _chNR);
+
+    	// get RadioGw
+		RadioGW radioGW = getRadioGW(_radioID, _gwID);
+		if (radioGW == null)
+			return;
+
+		// set current radio
+		parentTab.setCrtRadio(radioGW);
+		// set current zones
+		crtZones = radioGW.zoneList;
+		// set current channels
+		crtChannels = getChannels(_zoneNR);
+
+		myHandler.post(UpdateResultsZoneChannelRUN);
+    }
+
+	// Create runnable for posting
+    final Runnable UpdateResultsZoneChannelRUN = this::updateResultsInUi;
+
+	private void updateResultsInUi() {
+		if (AppParams.listRadios.size() > 0) {
+			textViewGateway.setText(parentTab.getCrtRadio().IP);
+
+			// get all radio IP
+			allGWsIP.clear();
+			for (RadioGW radio: AppParams.listRadios)
+				allGWsIP.add(radio.IP);
+
+			// set spinners and text
+			if (parentTab.getCrtRadio() == null) {
+				parentTab.setCrtRadio(AppParams.listRadios.get(0));
+				textViewGateway.setText(allGWsIP.get(0));
+
+				// set zone
+				ArrayList<String> zones = new ArrayList<>();
+				crtZones = parentTab.getCrtRadio().zoneList;
+				for(Zone zone: crtZones)
+					zones.add(zone.ZoneName);
+
+				textViewZone.setText(zones.get(0));
+
+				// set channel
+				ArrayList<String> channel = new ArrayList<>();
+				crtChannels = parentTab.getCrtRadio().zoneList.get(0).channelList;
+				for(Channel ch: crtChannels)
+					channel.add(ch.chName);
+				textViewChannel.setText(channel.get(0));
+			} else {
+				for (RadioGW radio: AppParams.listRadios)
+					if (radio.ID == radioID && radio.GW_ID == GWID)
+						parentTab.setCrtRadio(radio);
+
+				// get zones for adapter
+				ArrayList<String> zones = new ArrayList<>();
+				crtZones = parentTab.getCrtRadio().zoneList;
+
+				int position = 0;
+				// get selected Zone
+				for (int i=0; i< crtZones.size(); i++) {
+					Zone zone = crtZones.get(i);
+					zones.add(zone.ZoneName);
+					if (zone.id == zoneNR)
+						position = i;		// save crt position in array
+				}
+
+				textViewZone.setText(zones.get(position));
+
+				// set channel
+				ArrayList<String> channel = new ArrayList<>();
+				crtChannels =  parentTab.getCrtRadio().zoneList.get(position).channelList;
+
+				// get current channel
+				position = 0;
+				for (int i=0; i< crtChannels.size(); i++) {
+					Channel ch = crtChannels.get(i);
+					channel.add(ch.chName);
+					if(ch.id == chNR)
+						position = i;
+				}
+
+				textViewChannel.setText(channel.get(position));
+				textViewMessageChannel.setText(channel.get(position));
+			}
+			UpdateEnableDisableButtons("online");
+			imageViewStatus.setImageResource(R.drawable.status_online);
+		}
+	}
+
+	// Radio Gateway changed from UI
+	private void radioGWChanged(String newIP) {
+		// get gateway id
+		for (RadioGW radio:AppParams.listRadios)
+			if (radio.IP.equals(newIP)) {
+				UpdateEnableDisableButtons("offline");
+				onZoneCHChange(radio.ID, radio.GW_ID,0,0);		// get zone and channel for crt radio
+				parentTab.setCrtRadio(radio);
+			}
+
+		textViewGateway.setText(newIP);
+		imageViewStatus.setImageResource(R.drawable.status_offline);
+
+		// clear Spinners
+		ClearSpinners();
+		// reset adapter for spinners
+		ResetAdaptersForSpinners();
+	}
+
+	private void ClearSpinners() {
+		textViewZone.setText("");
+		textViewChannel.setText("");
+		textViewMessageChannel.setText("");
+	}
+
+	private void ResetAdaptersForSpinners() {
+		crtChannels = new ArrayList<>();
+		crtZones = new ArrayList<>();
+	}
+
+	private void SetCheck(RadioButton radioButton) {
+		radioPrivate.setChecked(radioPrivate == radioButton );
+		radioGroup.setChecked(radioGroup == radioButton );
+		radioAll.setChecked(radioAll == radioButton );
+	}
+
+	// broadcastCall from ParentTabActivity to set radio status
+ 	public void UpdateBroadcastCall(long Imei,int Calltype,int GroupID,int CallStatus) {
+		// save received id's zoneNr and CHNR
+		SM.Debug("Status: Imei: " + Imei+ " Calltype: "+Calltype+ " GroupID: "+GroupID+" CallStatus:"+CallStatus);
+		this.imei = Imei;
+		this.calltype = Calltype;
+		this.groupid = GroupID;
+		this.callstatus = CallStatus;
+
+		myHandler.post(UpdateB);
+	}
+
+     final Runnable UpdateB = this::UpdateResultsBroadcastCall;
+
+     private void UpdateResultsBroadcastCall() {
+    	SM.Debug("UpdateResultsBroadcastCall with Imei: " +imei+ " CallType:"+calltype+ " GroupID:"+groupid+" CallStatus:"+callstatus);
+    	if ((callstatus == inCall) || (callstatus== hangTime)) {
+    		// modify UI only when call is received, not in hangtime
+    		if (callstatus == inCall) {
+	    		layoutGateway.setEnabled(false);
+	    		String CallType = getString(R.string.AllCall);
+	    		if (calltype == PRIVATECall) {
+	    			CallType = getString(R.string.PrivateCall);
+					SetCheck(radioPrivate);
+	    			selectedCallType = PRIVATECall;
+	    		} else if (calltype == GROUPCall) {
+	    			CallType = getString(R.string.GroupCall) + "("+groupid+")";
+					SetCheck(radioGroup);
+	    			selectedCallType = GROUPCall;
+	    			textViewCallType.setText(groupid + "");
+	    		} else {
+					SetCheck(radioAll);
+	    			selectedCallType = ALLCall;
+	    		}
+
+				layoutSpinnerCallType.setVisibility( calltype != ALLCall ? View.VISIBLE : View.INVISIBLE);
+	    		textViewMessageChannel.setText(CallType);
+
+				if (parentTab.getSuperVehHash() != null) {
+					if (parentTab.getSuperVehHash().containsKey(imei))
+						textViewMessageStatus.setText(parentTab.getSuperVehHash().get(imei).name);
+					else
+						textViewMessageStatus.setText("Imei: " + imei);
+				}
+    		}
+
+			if (callstatus == hangTime) {
+				textViewMessageStatus.setText(getString(R.string.hangTime));
+
+				buttonPTT.setEnabled(true);
+				buttonDKey.setEnabled(false);
+			}
+
+	    	if (parentTab.getCrtActivity() == parentTab.RADIO_TAB_ID && selectedCallType == calltype)
+	    		parentTab.enableMenuButtons(false);
+
+	    	if (selectedCallType == calltype)
+	    		parentTab.setInCall(true);
+    	} else if (callstatus == callEnd ) {
+    		if ((calltype == 0 && pttONoff) || selectedCallType == calltype) {
+	    		layoutGateway.setEnabled(true);
+	    		textViewMessageChannel.setText(textViewChannel.getText());
+	    		textViewMessageStatus.setText(" ");
+	    		imageViewStatus.setImageResource(R.drawable.status_online);
+
+	    		// stop sound
+	    		if (audioH!=null)
+	    			audioH.StopSound();
+
+	    			// disable buttons
+		    	  UpdateEnableDisableButtons("enable");
+
+		    	  if (pttONoff) {
+		    		pttONoff= false;
+
+		    		if (audioH!=null)
+		    			audioH.soundNeeded = false;
+
+		    		buttonPTT.setText(getString(R.string.PTT));
+					buttonPTT.setBackgroundResource(R.drawable.style_buttonptt);
+		    	  }
+		    	  parentTab.enableMenuButtons(true);
+		    	  parentTab.setInCall(false);
+    		}
+    	}
+     }
+
+	// called from ParentTabActivity to set radio status
+ 	public void UpdateRadioStatus (int status) {
+     	// save received id's zoneNr and CHNR
+     	this.rStatus = status;
+
+     	SM.Debug("rStatus: " + rStatus );
+     	myHandler.post(UpdateRadioS);
+     }
+
+     final Runnable UpdateRadioS = this::updateResultsStatus;
+
+     private void updateResultsStatus() {
+    	 SM.Debug("updateResultsStatusUI with Status: " + (rStatus == 1? "ONLINE" : "OFFLINE"));
+
+		 imageViewStatus.setImageResource( (rStatus == 1 ) ? R.drawable.status_online : R.drawable.status_offline);
+		 UpdateEnableDisableButtons( (rStatus == 1 ) ? "online" : "offline");
+     }
+
+
+	private void enableDisableRadioCallType(boolean enabled) {
+		radioGroupCallType.setEnabled(enabled);
+		radioAll.setEnabled(enabled);
+		radioGroup.setEnabled(enabled);
+		radioPrivate.setEnabled(enabled);
+	}
+
+	private void enableDisableSpinners(boolean enabled) {
+		layoutSpinnerZone.setEnabled(enabled);
+		layoutSpinnerChannel.setEnabled(enabled);
+		layoutSpinnerCallType.setEnabled(enabled);
+	}
+
+	public void UpdateEnableDisableButtons(String type) {
+		if (type.equals("disableIncCall")) {
+			enableDisableRadioCallType(false);
+			enableDisableSpinners(false);
+
+			// enable Dkey button
+			buttonDKey.setEnabled(true);
+			// disable PTT
+			buttonPTT.setEnabled(false);
+		} else if (type.equals("disablePTT")) {
+			enableDisableRadioCallType(false);
+			enableDisableSpinners(false);
+
+			// disable Dkey button
+			buttonDKey.setEnabled(false);
+		} else if (type.equals("enable")) {
+			enableDisableRadioCallType(true);
+			enableDisableSpinners(true);
+
+			// disable Dkey button and enable PTT
+			buttonDKey.setEnabled(false);
+			buttonPTT.setEnabled(true);
+		} else if(type.equals("online")) {
+			enableDisableRadioCallType(true);
+			enableDisableSpinners(true);
+
+			// disable Dkey button
+			buttonDKey.setEnabled(false);
+			buttonPTT.setEnabled(true);
+			textViewMessageStatus.setText("");
+			parentTab.enableMenuButtons(true);
+		} else if (type.equals("offline")) {
+			enableDisableRadioCallType(false);
+			enableDisableSpinners(false);
+
+			// disable Dkey button
+			buttonDKey.setEnabled(false);
+			// disable PTT button
+			buttonPTT.setEnabled(false);
+
+			// reset zone and channel text
+			textViewZone.setText("");
+			textViewChannel.setText("");
+
+			parentTab.enableMenuButtons(true);				//enable menu buttons
+
+			// reset status icon
+			imageViewStatus.setImageResource(R.drawable.status_offline);
+
+			// reset screen messages
+			textViewMessageChannel.setText("");
+			textViewMessageStatus.setText(getString(R.string.offline));
+		}
+	}
+
+    // get Group Contact ID from Name
+	private int getGroupID4Name(String name) {
+		int i = 0;
+		for (String groupName: allGroupsNames) {
+			// if searched name - return corresponding id
+			if (groupName.equals(name))
+				return allGroupsIDs.get(i);
+			i++;
+		}
+
+		return -1;
+	}
+
+	// get Private Contact ID from Name
+	private int getPrivateImei4Name(String name) {
+		for (Vehicle vehicle: allVehicle) {
+			if (vehicle.name.equals(name))
+				return Integer.parseInt(vehicle.imei);
+		}
+
+		return -1;
+	}
+
+	// get zone number from spinner zoneName
+	private int getNR4Zone(String zoneName) {
+		for (Zone zone: crtZones)
+			if (zone.ZoneName.equals(zoneName))
+				return zone.id;
+		return -1;
+	}
+
+	// get channel number from spinner chName
+	private int getNR4CH(String chName) {
+		for (Channel ch: crtChannels)
+			if (ch.chName.equals(chName))
+				return ch.id;
+		return -1;
+	}
+
+	// send GetGWRadios to AppServer
+    private void GetGWRadios() {
+        parentTab.getRadiosList();
+	}
+
+    // send Dekey to AppServer
+    private void SendDekey() {
+    	if (parentTab.getCrtRadio() != null)
+    		parentTab.sendDekey(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
+	}
+
+    // send change Channel and Zone message to AppServer
+    private void onZoneCHChange(int RadioID, int GWID, int zone, int ch) {
+    	SM.Debug("Changed Z: " + zone + " |  Channel: " + ch);
+    	parentTab.getSetZoneAndChannel(GWID,RadioID,zone,ch);
+    }
+
+ // request radio status
+    private void ReqRadioStatus(int RadioID, int GWID) {
+    	SM.Debug("Request radio status 4 radioId: " + RadioID + " | GW_ID:" + GWID);
+    	parentTab.getRadioStatus(GWID,RadioID);
+    	try {
+			Thread.sleep(500);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+
+    }
+    //sendPTT
+    //callType:
+    	//101 -allcall init
+    	//111 -allcall stop
+    	//102 -prvcall init
+    	//112 -prvcall stop
+    	//103 -grpcall init
+    	//113 -grpcall stop
+    public void SendPTT(int callType, int id,int gwid, int rgwid,long userID) {
+	  	SM.Debug("sendPTT callType:"+callType);
+	  	parentTab.sendPTT(callType, id,gwid,rgwid,userID);
+    }
+
+    /** Register for broadcasts */
+    private void registerBroadcastIntents() {
+    	IntentFilter intentFilter = new IntentFilter(OperationCodes.CHANNEL_BRDCST + "");
+		this.registerReceiver(mReceiver, intentFilter);
+
+		intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED + "");
+		this.registerReceiver(mReceiver, intentFilter);
+    }
+
+    //The BroadcastReceiver that listens for Notification broadcasts
+    public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+
+        	final String action = intent.getAction();
+
+        	// CHANNEL_BRDCST
+        	if (action.equals(OperationCodes.CHANNEL_BRDCST + "")) {
+        		Zone_and_channel zc = AppParams.crtZoneAndChannel;
+        		UpdateZoneCH(zc.rgwID, zc.gwID, zc.zoneNr, zc.channelNr);
+        	}
+
+        	// RADIOID_CHANGED
+        	if (action.equals(OperationCodes.RADIOID_CHANGED + "")) {
+        		textViewGateway.setText(parentTab.getCrtRadio().IP);
+        		textViewChannel.setText(parentTab.getCrtRadio().getChannelName());
+        		textViewZone.setText(parentTab.getCrtRadio().getZoneName());
+
+        		// update UI
+    			myHandler.post(UpdateResultsZoneChannelRUN);
+        		radioGWChanged(parentTab.getCrtRadio().IP);
+        	}
+        }
+    };
+}

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

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

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -10,13 +10,19 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.text.Editable;
 import android.text.InputType;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -114,6 +120,17 @@ public class SDMobileActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		SM.Debug("##### onCREATE ##### with LANGUAGE " + AppParams.LANGUAGETMP);
 
+		ConnectivityManager connectivityManager =
+				(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+			connectivityManager.registerDefaultNetworkCallback(networkCallback);
+		else {
+			NetworkRequest request = new NetworkRequest.Builder()
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
+			connectivityManager.registerNetworkCallback(request, networkCallback);
+		}
+
 		AppParams.theme = AppParams.Theme.SAFEDISPATCH;
 		if (AppParams.theme == AppParams.Theme.SAFENET)
 			this.setTheme(R.style.Theme_Safenet);
@@ -165,37 +182,16 @@ public class SDMobileActivity extends Activity {
 		ImageView imageLoading = (ImageView) findViewById(R.id.imageLoading);
 		imageLoading.setBackgroundResource(R.drawable.loading);
 
+		// language
 		imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
-
-		// change spinner icon and selected language according to tmpLanguage
-		switch (AppParams.LANGUAGETMP) {
-			case "en":
-				imageLanguage.setImageResource(R.drawable.en);
-				break;
-			case "de":
-				imageLanguage.setImageResource(R.drawable.de);
-				break;
-			case "tr":
-				imageLanguage.setImageResource(R.drawable.tr);
-				break;
-			case "ro":
-				imageLanguage.setImageResource(R.drawable.ro);
-				break;
-			case "es":
-				imageLanguage.setImageResource(R.drawable.es);
-				break;
-			case "ru":
-				imageLanguage.setImageResource(R.drawable.ru);
-				break;
-			default:
-				throw new IllegalStateException("Unexpected value: " + AppParams.LANGUAGETMP);
-		}
-
 		imageLanguage.setOnClickListener(LanguageListener);
+		setLanguageIcon();
 
+		// username and password
 		etUsername = (EditText) findViewById(R.id.etUsername);
 		etPassword = (EditText) findViewById(R.id.etPassword);
 
+		// login button
 		btLogin = (Button) findViewById(R.id.btLogin);
 		btLogin.setOnClickListener(arg0 -> {
 
@@ -233,10 +229,10 @@ public class SDMobileActivity extends Activity {
 			etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD);
 		}
 
-		layoutTCP = (RelativeLayout) findViewById(R.id.layoutTCP);
+		layoutTCP = findViewById(R.id.layoutTCP);
 
-		llUsername = (LinearLayout) findViewById(R.id.llUsername);
+		llUsername = findViewById(R.id.llUsername);
-		llPassword = (LinearLayout) findViewById(R.id.llPassword);
+		llPassword = findViewById(R.id.llPassword);
 
 		// enable ui after the language is changed and tcp connection is on
 		if (tcp != null && tcp.isConnectionUP) {
@@ -287,6 +283,35 @@ public class SDMobileActivity extends Activity {
 		}
 	}
 
+
+	private void setLanguageIcon()
+	{
+		// change spinner icon and selected language according to tmpLanguage
+		switch (AppParams.LANGUAGETMP) {
+			case "en":
+				imageLanguage.setImageResource(R.drawable.en);
+				break;
+			case "de":
+				imageLanguage.setImageResource(R.drawable.de);
+				break;
+			case "tr":
+				imageLanguage.setImageResource(R.drawable.tr);
+				break;
+			case "ro":
+				imageLanguage.setImageResource(R.drawable.ro);
+				break;
+			case "es":
+				imageLanguage.setImageResource(R.drawable.es);
+				break;
+			case "ru":
+				imageLanguage.setImageResource(R.drawable.ru);
+				break;
+			default:
+				throw new IllegalStateException("Unexpected value: " + AppParams.LANGUAGETMP);
+		}
+
+	}
+
 	@Override
 	public void onBackPressed() {
 		if (loadingDialog.isShowing())
@@ -524,6 +549,21 @@ public class SDMobileActivity extends Activity {
 		SM.Debug("##### onRESUME #####");
 	}
 
+	private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
+		@Override
+		public void onAvailable(Network network) {
+			// network available
+			Log.v("NetworkAvailability", "available");
+			if (tcp != null && !tcp.isConnectionUP)
+				saveIPandRestartTCP(AppParams.IP, AppParams.PORT);
+		}
+
+		@Override
+		public void onLost(Network network) {
+			// network unavailable
+			Log.v("NetworkAvailability", "unavailable");
+		}
+	};
 
 	private void startTabActivity(long userID) {
 		// good login - load activity
@@ -663,7 +703,7 @@ public class SDMobileActivity extends Activity {
 			// get default password
 			AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a");
 			// get default IP
-			AppParams.IP = AppParams.prefs.getString("ip", "192.168.2.100");
+			AppParams.IP = AppParams.prefs.getString("ip", "185.8.154.190");
 
 			// get Radio ID & IP
 			AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100);
@@ -737,10 +777,10 @@ public class SDMobileActivity extends Activity {
 		Dialog dialogInfo = new Dialog(context);
 		dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialogInfo.setContentView(R.layout.dialog_login);
-		TextView textTitle = (TextView) dialogInfo.findViewById(R.id.textTitle);
+		TextView textTitle = dialogInfo.findViewById(R.id.textTitle);
-		TextView text = (TextView) dialogInfo.findViewById(R.id.text);
+		TextView text = dialogInfo.findViewById(R.id.text);
-		TextView text2 = (TextView) dialogInfo.findViewById(R.id.text2);
+		TextView text2 = dialogInfo.findViewById(R.id.text2);
-		ImageView image = (ImageView) dialogInfo.findViewById(R.id.image);
+		ImageView image = dialogInfo.findViewById(R.id.image);
 
 		textTitle.setText(getString(R.string.connectionError));
 		image.setImageResource(R.drawable.error);
@@ -965,7 +1005,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void alarmLiveRecv(TCPEvent event) {
+					public void alarmLiveReceived(TCPEvent event) {
 					}
 
 					@Override
@@ -994,7 +1034,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionDown(boolean previuosWasConnectionUp) {
+					public void onTCPConnectionDown(boolean previousWasConnectionUp) {
 						SM.Debug("TCP connection with:" + (tcp != null ? tcp.serverHostname : AppParams.RADIOIP) + ":"
 								+ (tcp != null ? tcp.getPort() : 0) + " is DOWN!!!");
 						// update ui only when a change happens with tcp connection
@@ -1034,7 +1074,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp) {
+					public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp) {
 
 					}
 

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

@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -1403,7 +1403,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					public void onAlarmAckReceived(TCPEvent event) { }
 	
 					@Override
-					public void alarmLiveRecv(TCPEvent event) { }
+					public void alarmLiveReceived(TCPEvent event) { }
 	
 			
 					@Override
@@ -1425,7 +1425,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					public void onRecordingsListReceived(TCPEvent event) { }
 
 					@Override
-					public void onTCPConnectionDown(boolean previousConnectionWasUP) {
+					public void onTCPConnectionDown(boolean previousWasConnectionUp) {
 						
 						SM.Debug("TCP Connection Down");
 						// set connection is down
@@ -1450,7 +1450,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionUp(boolean previousConnectionWasUP) { 
+					public void onTCPConnectionUp(boolean previousWasConnectionUp) {
 						
 						SM.Debug("TCP Connection UP");
 						// set connection is up
@@ -1505,7 +1505,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previuosWasConnectionUp) {
+					public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previousWasConnectionUp) {
 						//SM.Debug("TCP STATUS", "ConnectionUP: " + isConnectionUp + " |  previous: " + previuosWasConnectionUp );
 						/*
 						if(!lastTCPstatus && isConnectionUp) {

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

@@ -1,17 +1,14 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.Locale;
 
-/** fix import */
 import com.safemobile.adapters.LanguageSpinnerAdapter;
 import com.safemobile.lib.AppParams;
 import com.safemobile.lib.SM;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -73,52 +70,49 @@ public class SetupActivity extends Activity {
         setContentView(R.layout.tabsetup);
         
         
-        layoutSpinnerLanguage = (LinearLayout) findViewById(R.id.layoutSpinnerLanguage);
+        layoutSpinnerLanguage = findViewById(R.id.layoutSpinnerLanguage);
         layoutSpinnerLanguage.setOnClickListener(LanguageListener);
-        imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
+        imageLanguage = findViewById(R.id.imageLanguage);
-        textViewSpinnerLanguage = (TextView) findViewById(R.id.textViewSpinnerLanguage);
+        textViewSpinnerLanguage = findViewById(R.id.textViewSpinnerLanguage);
         
         // change spinner icon and selected language according to tmpLanguage
-        if (AppParams.LANGUAGETMP.equals("en")){ 
+		switch (AppParams.LANGUAGETMP) {
-        	 imageLanguage.setImageResource(R.drawable.en);
+			case "en":
-        	 textViewSpinnerLanguage.setText(getString(R.string.en));
+				imageLanguage.setImageResource(R.drawable.en);
-		}
+				textViewSpinnerLanguage.setText(getString(R.string.en));
-        else if (AppParams.LANGUAGETMP.equals("de")){ 
+				break;
-	       	 imageLanguage.setImageResource(R.drawable.de);
+			case "de":
-	       	 textViewSpinnerLanguage.setText(getString(R.string.de));
+				imageLanguage.setImageResource(R.drawable.de);
-		}
+				textViewSpinnerLanguage.setText(getString(R.string.de));
-        else if (AppParams.LANGUAGETMP.equals("tr")){ 
+				break;
-	       	 imageLanguage.setImageResource(R.drawable.tr);
+			case "tr":
-	       	 textViewSpinnerLanguage.setText(getString(R.string.tr));
+				imageLanguage.setImageResource(R.drawable.tr);
-		}
+				textViewSpinnerLanguage.setText(getString(R.string.tr));
-        else if (AppParams.LANGUAGETMP.equals("ro")){ 
+				break;
-	       	 imageLanguage.setImageResource(R.drawable.ro);
+			case "ro":
-	       	 textViewSpinnerLanguage.setText(getString(R.string.ro));
+				imageLanguage.setImageResource(R.drawable.ro);
-		}
+				textViewSpinnerLanguage.setText(getString(R.string.ro));
-        else if(AppParams.LANGUAGETMP.equals("es")){ 
+				break;
-	       	 imageLanguage.setImageResource(R.drawable.es);
+			case "es":
-	       	 textViewSpinnerLanguage.setText(getString(R.string.es));
+				imageLanguage.setImageResource(R.drawable.es);
-		}
+				textViewSpinnerLanguage.setText(getString(R.string.es));
-        else if(AppParams.LANGUAGETMP.equals("ru")){ 
+				break;
-	       	 imageLanguage.setImageResource(R.drawable.ru);
+			case "ru":
-	       	 textViewSpinnerLanguage.setText(getString(R.string.ru));
+				imageLanguage.setImageResource(R.drawable.ru);
+				textViewSpinnerLanguage.setText(getString(R.string.ru));
+				break;
 		}
         
         // get visual elements
-        appServerIP = (EditText) findViewById(R.id.appServerIP);
+        appServerIP = findViewById(R.id.appServerIP);
-        appServerPort = (EditText) findViewById(R.id.appServerPort);
+        appServerPort = findViewById(R.id.appServerPort);
 
         // hide path layout used only on Pad/Pod 
-        layoutPath = (LinearLayout) findViewById(R.id.layoutPath);
+        layoutPath = findViewById(R.id.layoutPath);
         layoutPath.setVisibility(View.GONE);
-        btn_save = (Button) findViewById(R.id.btn_save);
+        btn_save = findViewById(R.id.btn_save);
         
-        btn_save.setOnClickListener(new OnClickListener() {
+        btn_save.setOnClickListener(v -> saveSettings());
-			@Override
-			public void onClick(View v) {
-				saveSettings();
-			}
-		});
         
         // set values
         if(!AppParams.IP.equals("n/a"))
@@ -134,46 +128,31 @@ public class SetupActivity extends Activity {
     	AlertDialog.Builder builder = new AlertDialog.Builder(this);
     	builder.setMessage(getString(R.string.exit))
     	       .setCancelable(false)
-    	       .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
+    	       .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
-    	           public void onClick(DialogInterface dialog, int id) {
+    	       .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.logout);
+    	       .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
-    	           }
-    	       })
-    	       .setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.exit);
-    	           }
-    	       })
-    	       .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	                dialog.cancel();
-    	           }
-    	       });
     	AlertDialog alert = builder.create();
     	alert.show();
     }
     
     // listener when select language pressed
-    private OnClickListener LanguageListener =  new OnClickListener() {
+    private final OnClickListener LanguageListener =  new OnClickListener() {
 		
 		@Override
 		public void onClick(View v) {
 				final LanguageSpinnerAdapter adapter = new LanguageSpinnerAdapter(context, android.R.layout.simple_spinner_item, Languages, getLayoutInflater());
 				AlertDialog.Builder builder = new AlertDialog.Builder(context);
 				builder.setTitle(getString(R.string.selLanguage));
-				builder.setAdapter(adapter , new DialogInterface.OnClickListener() {
+				builder.setAdapter(adapter , (dialog, which) -> {
-					@Override
+					textViewSpinnerLanguage.setText(adapter.getItem(which));
-					public void onClick(DialogInterface dialog, int which) {
+					switch(which)
-						textViewSpinnerLanguage.setText(adapter.getItem(which));
+					{
-						switch(which)
+						case 0: imageLanguage.setImageResource(R.drawable.en); AppParams.LANGUAGETMP = "en"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-						{
+						case 1: imageLanguage.setImageResource(R.drawable.de); AppParams.LANGUAGETMP = "de"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 0: imageLanguage.setImageResource(R.drawable.en); AppParams.LANGUAGETMP = "en"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
+						case 2: imageLanguage.setImageResource(R.drawable.tr); AppParams.LANGUAGETMP = "tr"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 1: imageLanguage.setImageResource(R.drawable.de); AppParams.LANGUAGETMP = "de"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
+						case 3: imageLanguage.setImageResource(R.drawable.ro); AppParams.LANGUAGETMP = "ro"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 2: imageLanguage.setImageResource(R.drawable.tr); AppParams.LANGUAGETMP = "tr"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
+						case 4: imageLanguage.setImageResource(R.drawable.ru); AppParams.LANGUAGETMP = "ru"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 3: imageLanguage.setImageResource(R.drawable.ro); AppParams.LANGUAGETMP = "ro"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
+						case 5: imageLanguage.setImageResource(R.drawable.es); AppParams.LANGUAGETMP = "es"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 4: imageLanguage.setImageResource(R.drawable.ru); AppParams.LANGUAGETMP = "ru"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-							case 5: imageLanguage.setImageResource(R.drawable.es); AppParams.LANGUAGETMP = "es"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
-						}
 					}
 				});
 				
@@ -199,7 +178,7 @@ public class SetupActivity extends Activity {
         	// get default com port
         	//COMPORT = prefs.getString("comport", "n/a");
         	// get Language
-        	AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.databaseLanguage);
+        	AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.DATABASE_LANGUAGE);
     	}
         catch(Exception ex)
         {
@@ -215,12 +194,12 @@ public class SetupActivity extends Activity {
 		String oldIP = AppParams.IP;
 		String oldPort = AppParams.PORT;
 		
-			editor.putString("ip", appServerIP.getText().toString());
+		editor.putString("ip", appServerIP.getText().toString());
-			editor.putString("port", appServerPort.getText().toString());
+		editor.putString("port", appServerPort.getText().toString());
-			editor.putString("language", AppParams.LANGUAGETMP);
+		editor.putString("language", AppParams.LANGUAGETMP);
-		Boolean result = editor.commit();
+		boolean result = editor.commit();
 		// saved completed
-		if(result)
+		if (result)
 			Toast.makeText(context, "Settings saved successfully.", Toast.LENGTH_LONG).show();
 		else
 			Toast.makeText(context, "Settings failed to complete!", Toast.LENGTH_LONG).show();
@@ -245,7 +224,7 @@ public class SetupActivity extends Activity {
 			parentTab.stopTCPParser();
 			// recreate TCP with new settings
 			parentTab.loadSettings();
-			parentTab.TCPinit();
+			parentTab.tcpInit();
 			*/
 			// start thread to add listener
 			/*
@@ -265,31 +244,4 @@ public class SetupActivity extends Activity {
 		//showDialog(result);
 	}
 	
-	public void showDialog(Boolean result)
-	{
-		Dialog dialog = new Dialog(context);
-		if(result)
-			dialog.setTitle("Save Completed");
-		else 
-			dialog.setTitle("Save Failed");
-		dialog.setContentView(R.layout.dialog);
-		dialog.setCancelable(true);
-		dialog.setCanceledOnTouchOutside(true);
-
-		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = (ImageView) dialog.findViewById(R.id.image);
-		if(result)
-		{
-			image.setImageResource(R.drawable.error);
-			text.setText("Settings saved successfully.");
-		}
-		else
-		{
-			image.setImageResource(R.drawable.error);
-			text.setText("Settings failed to complete!");
-		}
-		
-		dialog.show();
-	}
-	
 }

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

@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
+		android:id="@+id/linearLayoutChecked"
-		    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:layout_weight="0"
-		    android:background="@drawable/checked">
+		android:background="@drawable/checked"
-    </LinearLayout>
+		android:orientation="horizontal" />
 </LinearLayout>

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

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

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

@@ -32,7 +32,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverIP"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:layout_gravity="center_vertical"
 			                android:gravity="center_vertical|right"
@@ -67,7 +66,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverPort"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:gravity="center_vertical|right"
 			                android:layout_gravity="center_vertical|right"
@@ -112,7 +110,6 @@
 				                android:layout_height="wrap_content"
 				                android:text="@string/configName"
 				                android:textAppearance="?android:attr/textAppearanceMedium"
-				                android:textColor="#FFFFFF"
 				                android:textStyle="bold"
 				                android:gravity="center_vertical|right"
 				                android:layout_gravity="center_vertical"/>
@@ -181,7 +178,6 @@
 			            android:text="@string/language"
 			            android:textAppearance="?android:attr/textAppearanceMedium"
 			            android:textStyle="bold"
-			            android:textColor="#FFFFFF"
 			            android:gravity="right"
 			            android:layout_gravity="center_vertical"/>
 					<LinearLayout

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

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

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

@@ -7,9 +7,9 @@
 	android:padding="2dp"
 	android:background="@drawable/style_nameoverlay">
 
-						<TextView android:layout_height="wrap_content"
+	<TextView android:layout_height="wrap_content"
-							android:layout_width="fill_parent" 
+		android:layout_width="fill_parent"
-							android:id="@+id/balloon_vehicle_name"
+		android:id="@+id/balloon_vehicle_name"
-							android:textSize="12dip"
+		android:textSize="12dip"
-							android:textColor="#FF000000"></TextView>
+		android:textColor="#FF000000" />
 </LinearLayout>

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

@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
-              android:id="@+id/layout_root"
+	xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
+	android:id="@+id/layout_root"
-              android:layout_width="fill_parent"
+	android:orientation="horizontal"
-              android:layout_height="fill_parent"
+	android:layout_width="fill_parent"
-              android:padding="10dp"
+	android:layout_height="fill_parent"
-              >
+	android:padding="10dp" >
-    <ImageView android:id="@+id/image"
+    <ImageView
-               android:layout_width="wrap_content"
+		android:id="@+id/image"
-               android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
-               android:layout_marginRight="10dp"
+		android:layout_height="wrap_content"
-               android:layout_gravity="center_vertical"
+		android:layout_marginRight="10dp"
-               android:src="@drawable/ic_launcher"
+		android:layout_gravity="center_vertical"
-               />
+		android:src="@mipmap/ic_launcher"
-   <LinearLayout 
+		/>
-   			  android:layout_width="wrap_content"
+	<LinearLayout
-              android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
-              android:orientation="vertical"
+		android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
+		android:orientation="vertical"
-              android:gravity="center_vertical">
+		android:layout_gravity="center_vertical"
-		    <TextView android:id="@+id/text"
+		android:gravity="center_vertical">
-		              android:layout_width="wrap_content"
+		<TextView
-		              android:layout_height="wrap_content"
+			android:id="@+id/text"
-		              android:paddingTop="8dp"
+			android:layout_width="wrap_content"
-		              android:textSize="18dp"
+			android:layout_height="wrap_content"
-		              android:textColor="#FFFFFF"
+			android:paddingTop="8dp"
-		              />
+			android:textSize="18dp"
-		    <TextView android:id="@+id/text2"
+			/>
-		              android:layout_width="wrap_content"
+		<TextView
-		              android:layout_height="wrap_content"
+			android:id="@+id/text2"
-		              android:paddingTop="8dp"
+			android:layout_width="wrap_content"
-		              android:textSize="18dp"
+			android:layout_height="wrap_content"
-		              android:textColor="#FFFFFF"
+			android:paddingTop="8dp"
-		              />
+			android:textSize="18dp"
-     </LinearLayout>
+			/>
+	</LinearLayout>
 </LinearLayout>

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

@@ -11,7 +11,7 @@
          android:paddingTop="2dp"
          android:text="TITLE"
          android:textAppearance="?android:attr/textAppearanceLarge" 
-         android:textColor="#FFFFFF"
+         android:textColor="@color/black"
          />
     <LinearLayout
               android:id="@+id/layout_horizontal"
@@ -24,7 +24,7 @@
 	               android:layout_height="wrap_content"
 	               android:layout_marginRight="10dp"
 	               android:layout_gravity="center_vertical"
-	               android:src="@drawable/ic_launcher"
+	               android:src="@mipmap/ic_launcher"
 	               android:contentDescription="image for dialog"
 	               />
 	   <LinearLayout 
@@ -40,7 +40,6 @@
 			              android:paddingTop="8dp"
 			              android:text="Row1"
 			              android:textAppearance="?android:attr/textAppearanceLarge" 
-			              android:textColor="#FFFFFF"
 			              />
 			    <TextView android:id="@+id/text2"
 			              android:layout_width="wrap_content"
@@ -48,7 +47,6 @@
 			              android:paddingTop="8dp"
 			              android:textAppearance="?android:attr/textAppearanceMedium" 
 			              android:text="Row2"
-			              android:textColor="#FFFFFF"
 			              />
 	     </LinearLayout>
 	</LinearLayout>

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

@@ -61,4 +61,4 @@
 		        android:textSize="16dp" />
 		    
      </LinearLayout>
-</LinearLayout>
+</LinearLayout>

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

@@ -217,13 +217,13 @@
 	
 	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
+		android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
+		android:layout_width="64dp"
-			        android:layout_height="64dp"
+		android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
+		android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
+		android:layout_weight="0"
-			        android:visibility="gone"
+		android:visibility="gone"
-			        android:layout_alignParentTop="true"
+		android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>

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

@@ -150,18 +150,18 @@
 					             android:enabled="true"
 					             android:textColor="#000000"
 					             android:layout_marginBottom="5sp" />
-					
+
-					          <ImageView
+						<ImageView
-					             android:id="@+id/imageSettings"
+							android:id="@+id/imageSettings"
-					             android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					             android:layout_height="0dp"
+							android:layout_height="0dp"
-					             android:contentDescription="holds the icon for language"
+							android:layout_alignTop="@+id/imageLanguage"
-					             android:src="@drawable/change_ip"
+							android:layout_alignBottom="@+id/imageLanguage"
-					             android:adjustViewBounds="true"
+							android:layout_alignParentRight="true"
-					             android:scaleType="fitCenter"
+							android:adjustViewBounds="true"
-					             android:layout_alignTop="@+id/imageLanguage"
+							android:contentDescription="holds the icon for language"
-					             android:layout_alignBottom="@+id/imageLanguage"
+							android:scaleType="fitCenter"
-					             android:layout_alignParentRight="true" />
+							android:src="@drawable/change_ip" />
 					          
 					          <Button
 					              android:id="@+id/buttonLogin"

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

@@ -209,8 +209,6 @@
 			</LinearLayout>
 		</LinearLayout>
     </LinearLayout>
-    
-   
 
      <RelativeLayout
 		        android:id="@+id/frameLayoutLanguage"
@@ -221,20 +219,16 @@
 		        android:layout_alignParentBottom="true"
 		        android:layout_gravity="right" 
 		        android:paddingBottom="6dp"
-		        android:layout_toLeftOf="@+id/frameLayout13">
+		        android:layout_toLeftOf="@+id/frameLayout13" />
-	</RelativeLayout>
 
-	
-	
-	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
+		android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
+		android:layout_width="64dp"
-			        android:layout_height="64dp"
+		android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
+		android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
+		android:layout_weight="0"
-			        android:visibility="gone"
+		android:visibility="gone"
-			        android:layout_alignParentTop="true"
+		android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>

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

@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
+		android:id="@+id/linearLayoutChecked"
-		    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:layout_weight="0"
-		    android:background="@drawable/checked">
+		android:background="@drawable/checked"
-    </LinearLayout>
+		android:orientation="horizontal" />
 </LinearLayout>

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal">
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
+		android:src="@mipmap/ic_launcher"
-		<ImageView
+		android:paddingLeft="5dp"
-			android:id="@+id/icon"
+		android:paddingRight="5dp"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"/>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:orientation="horizontal"
+		android:gravity="center_vertical">
+		<TextView
+			android:id="@+id/language"
+			android:textSize="20dp"
+			android:textColor="#000000"
+			android:textStyle="bold"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@drawable/ic_launcher"
+			android:gravity="center_vertical"/>
-			android:paddingLeft="5dp"
+
-			android:paddingRight="5dp"
+	</LinearLayout>
-			android:paddingTop="5dp"
-			android:paddingBottom="5dp"/>
-		<LinearLayout 
-		    android:layout_width="wrap_content"
-			android:layout_height="fill_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical">
-				<TextView
-					android:id="@+id/language"
-					android:textSize="20dp"
-					android:textColor="#000000"
-					android:textStyle="bold"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:gravity="center_vertical"/>
-				
-		</LinearLayout>
 </LinearLayout>

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

@@ -10,14 +10,14 @@
 	    android:gravity="center_vertical" >
 	    
 	    <ImageButton
-    			    android:id="@+id/imageButtonAdd"
+			android:id="@+id/imageButtonAdd"
-    			    android:layout_width="1dp"
+			android:layout_width="1dp"
-    			    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    			    android:layout_weight="0"
+			android:layout_weight="0"
-    			    android:layout_marginRight="5dp"
+			android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
+			android:paddingLeft="2dp"
-    			    android:visibility="invisible"
+			android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+			android:background="@drawable/addmessage_selector"/>
 	    <TextView
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"

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

@@ -8,9 +8,9 @@
 	    android:layout_height="fill_parent"
 	    style="?header"
 	    android:gravity="center_vertical" >
-	    
 	   
 	    <TextView
+			android:id="@+id/unit_name"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
 	        android:text="@string/unitName"
@@ -21,13 +21,13 @@
 	        android:gravity="left|center_vertical"
 	        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-		 <ImageButton
+		<ImageButton
-    			    android:id="@+id/imageCheckAll"
+			android:id="@+id/imageCheckAll"
-    			    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:layout_weight="0"
-    			    android:layout_marginRight="1dp"
+			android:layout_marginRight="1dp"
-    			    android:paddingLeft="2dp"
+			android:paddingLeft="2dp"
-    			    android:background="@drawable/uncheck_all"/>
+			android:background="@drawable/uncheck_all"/>
 	</LinearLayout>
 </LinearLayout>

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

@@ -4,86 +4,85 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
     style="?bg">
-    <LinearLayout 
+    <LinearLayout
-	        android:layout_width="fill_parent" 
+		android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-	        android:gravity="left"
+		android:gravity="left"
-	        android:layout_weight="0"
+		android:layout_weight="0"
-	        android:orientation="horizontal"
+		android:orientation="horizontal"
-	        style="?header"
+		style="?header"
-	        android:id="@+id/layoutHeader">
+		android:id="@+id/layoutHeader">
 
-    		    <ImageView
+		<ImageView
-			        android:id="@+id/imageViewMsg"
+			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:src="@drawable/alert"
+			android:src="@drawable/alert"
-			        android:paddingLeft="0dp"
+			android:paddingLeft="0dp"
-			        android:layout_margin="3dp"
+			android:layout_margin="3dp"
-			        android:layout_weight="0" />
+			android:layout_weight="0" />
-    			<TextView
+		<TextView
-    			    android:id="@+id/textView1"
+			android:id="@+id/textView1"
-    			    android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
+			android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
+			android:gravity="center_vertical"
-    			    android:text="@string/alarms"
+			android:text="@string/alarms"
-    			    android:layout_marginLeft="5dp"
+			android:layout_marginLeft="5dp"
-    			    android:textStyle="bold"
+			android:textStyle="bold"
-    			    android:paddingTop="7dp"
+			android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
+			android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
+			android:textAppearance="?android:attr/textAppearanceMedium"
-    			    android:layout_weight="0"/>
+			android:layout_weight="0"/>
 
-    			 <ImageView
+		<ImageView
-			        android:id="@+id/imageViewSeparator"
+			android:id="@+id/imageViewSeparator"
-			        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:layout_gravity="center_vertical"
-			        android:src="@drawable/separator_white"
+			android:src="@drawable/separator_white"
-			        android:layout_margin="2dp"
+			android:layout_margin="2dp"
-			        android:layout_weight="0"
+			android:layout_weight="0"
-			        android:visibility="invisible"
+			android:visibility="invisible"
-			        android:focusable="false" />
+			android:focusable="false" />
 
-				<ImageView
+		<ImageView
-				    android:id="@+id/imageViewDown"
+			android:id="@+id/imageViewDown"
-				    android:layout_width="20dp"
+			android:layout_width="20dp"
-				    android:layout_height="fill_parent"
+			android:layout_height="fill_parent"
-				    android:layout_gravity="center_vertical"
+			android:layout_gravity="center_vertical"
-				    android:layout_marginBottom="2dp"
+			android:layout_marginBottom="2dp"
-				    android:layout_marginTop="2dp"
+			android:layout_marginTop="2dp"
-				    android:focusable="false"
+			android:focusable="false"
-				    android:visibility="invisible"
+			android:visibility="invisible"
-				    android:src="@drawable/arrow_menu_down" />
+			android:src="@drawable/arrow_menu_down" />
     			
-				<ImageButton
+		<ImageButton
-    			    android:id="@+id/imageButtonAdd2"
+			android:id="@+id/imageButtonAdd2"
-    			    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    			    android:layout_weight="1"
+			android:layout_weight="1"
-    			    android:scaleType="centerInside"
+			android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
+			android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
+			android:paddingLeft="2dp"
-    			    android:visibility="invisible"
+			android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+			android:background="@drawable/addmessage_selector"/>
 
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
+	</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_weight="1">
+		android:layout_weight="1">
-		    <GridView
+		<GridView
-		        android:id="@+id/gridViewAlarms"
+			android:id="@+id/gridViewAlarms"
-		        android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-		        android:background="#999999"
+			android:background="#999999"
-		        android:drawSelectorOnTop="false"
+			android:drawSelectorOnTop="false"
-		        android:horizontalSpacing="0dp"
+			android:horizontalSpacing="0dp"
-		        android:listSelector="@drawable/gridalarm_selector"
+			android:listSelector="@drawable/gridalarm_selector"
-		        android:numColumns="1"
+			android:numColumns="1"
-		        android:verticalSpacing="1dp"
+			android:verticalSpacing="1dp"
-		        android:padding="5dp"/>
+			android:padding="5dp"/>
 
     </LinearLayout>
 </LinearLayout>

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:layout_width="fill_parent"
-	android:id="@+id/tab1Layout" android:orientation="horizontal"
+	android:layout_height="fill_parent"
+	android:id="@+id/tab1Layout"
+	android:orientation="horizontal"
 	style="?bg">
 	
 	<RelativeLayout

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

@@ -7,356 +7,352 @@
     style="?bg">
 	    
     <LinearLayout 
-        	android:id="@+id/layoutGateway"
+		android:id="@+id/layoutGateway"
-        	    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-	    	    android:layout_width="fill_parent"
+		android:layout_width="fill_parent"
-	    	    android:weightSum="100"
+		android:weightSum="100"
-	    	    android:orientation="horizontal"
+		android:orientation="horizontal"
-	    	    style="?header">
+		style="?header">
 
-			    	    <LinearLayout
+		<LinearLayout
-			    	        android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-			    	        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-			    	        android:orientation="horizontal" >
+			android:orientation="horizontal" >
 
-			    	         <ImageView
+			<ImageView
-							        android:id="@+id/imageViewRadioStation"
+				android:id="@+id/imageViewRadioStation"
-							        android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-							        android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-							        android:src="@drawable/enable"
+				android:src="@drawable/enable"
-							        android:layout_weight="0" />
+				android:layout_weight="0" />
 			    	         		
-						  			<TextView
+			<TextView
-						  			    android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
+				android:gravity="center_vertical"
-						  			    android:id="@+id/textViewGateway"
+				android:id="@+id/textViewGateway"
-						  			    android:text="n/a"
+				android:text="n/a"
-						  			    android:layout_marginLeft="5dp"
+				android:layout_marginLeft="5dp"
-						  			    android:textStyle="bold"
+				android:textStyle="bold"
-						  			    android:paddingTop="7dp"
+				android:paddingTop="7dp"
-						  			    android:textColor="#FFFFFF"
+				android:textColor="#FFFFFF"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
+				android:textAppearance="?android:attr/textAppearanceMedium"
-						  			    android:layout_weight="1"/>
+				android:layout_weight="1"/>
 
 									
-						  			<TextView
+			<TextView
-						  			    android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
+				android:gravity="center_vertical"
-						  			    android:id="@+id/textViewIP"
+				android:id="@+id/textViewIP"
-						  			    android:text="[192.168.2.100]"
+				android:text="[192.168.2.100]"
-						  			    android:paddingLeft="4dp"
+				android:paddingLeft="4dp"
-						  			    android:paddingTop="17dp"
+				android:paddingTop="17dp"
-						  			    android:textColor="#FFFFFF"
+				android:textColor="#FFFFFF"
-						  			    android:visibility="gone"
+				android:visibility="gone"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
+				android:textAppearance="?android:attr/textAppearanceMedium"
-						  			    android:layout_weight="1"/>
+				android:layout_weight="1"/>
 						  			
-						  			<ImageView
+			<ImageView
-								        android:id="@+id/imageViewSeparator"
+				android:id="@+id/imageViewSeparator"
-								        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:layout_gravity="center_vertical"
-								        android:src="@drawable/separator_white"
+				android:src="@drawable/separator_white"
-								        android:layout_margin="2dp"
+				android:layout_margin="2dp"
-								        android:layout_weight="0"
+				android:layout_weight="0"
-								        android:visibility="invisible"
+				android:visibility="invisible"
-								        android:focusable="false" />
+				android:focusable="false" />
 					
-									<ImageView
+			<ImageView
-									    android:id="@+id/imageViewDown"
+				android:id="@+id/imageViewDown"
-									    android:layout_width="20dp"
+				android:layout_width="20dp"
-									    android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-									    android:layout_gravity="center_vertical"
+				android:layout_gravity="center_vertical"
-									    android:layout_marginBottom="2dp"
+				android:layout_marginBottom="2dp"
-									    android:layout_marginTop="2dp"
+				android:layout_marginTop="2dp"
-									    android:focusable="false"
+				android:focusable="false"
-									    android:visibility="visible"
+				android:visibility="visible"
-									    android:src="@drawable/arrow_menu_down" />
+				android:src="@drawable/arrow_menu_down" />
 									
-									<ImageView
+			<ImageView
-						  			     android:id="@+id/imageViewStatus"
+				 android:id="@+id/imageViewStatus"
-						  			     android:layout_width="wrap_content"
+				 android:layout_width="wrap_content"
-						  			     android:layout_height="fill_parent"
+				 android:layout_height="fill_parent"
-						  			     android:gravity="center_vertical"
+				 android:gravity="center_vertical"
-						  			     android:scaleType="fitCenter"
+				 android:scaleType="fitCenter"
-						  			     android:src="@drawable/status_offline" />
+				 android:src="@drawable/status_offline" />
 									
-			    	    </LinearLayout>
+		</LinearLayout>
 
-        	    		<LinearLayout
+		<LinearLayout
-        	    		    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-        	    		    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-        	    		    android:orientation="horizontal"
+			android:orientation="horizontal"
-        	    		    android:gravity="right"
+			android:gravity="right"
-        	    		    android:layout_marginRight="8dp"
+			android:layout_marginRight="8dp"
-							android:visibility="gone">
+			android:visibility="gone">
 				
 				  			
-				  			<ImageButton
+			<ImageButton
-				  			    android:id="@+id/imageButtonAdd"
+				android:id="@+id/imageButtonAdd"
-				  			    android:layout_width="1dp"
+				android:layout_width="1dp"
-				  			    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-				  			    android:layout_weight="0"
+				android:layout_weight="0"
-				  			    android:layout_marginRight="2dp"
+				android:layout_marginRight="2dp"
-				  			    android:paddingLeft="2dp"
+				android:paddingLeft="2dp"
-				  			    android:background="@drawable/addmessage_selector"
+				android:background="@drawable/addmessage_selector"
-				  			    android:visibility="invisible"/>
+				android:visibility="invisible"/>
-				  			 <ImageView
+			<ImageView
-					    		    android:id="@+id/imageViewGreen"
+				android:id="@+id/imageViewGreen"
-					    		    android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-					    		    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-					    		    android:scaleType="fitCenter"
+				android:scaleType="fitCenter"
-					    		    android:paddingTop="4dp"
+				android:paddingTop="4dp"
-					    		    android:src="@drawable/call_private_green_small"
+				android:src="@drawable/call_private_green_small"
-					    		    android:layout_gravity="center_vertical" />
+				android:layout_gravity="center_vertical" />
 				  			 
-				  			 <TextView
+			<TextView
-				        	        android:id="@+id/textViewLoggedIn"
+				android:id="@+id/textViewLoggedIn"
-				        	        android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-				        	        android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-				        	        android:gravity="center_vertical"
+				android:gravity="center_vertical"
-				        	        android:layout_gravity="center_vertical"
+				android:layout_gravity="center_vertical"
-				        	        android:text="@string/login"
+				android:text="@string/login"
-				        	        android:textColor="#FFFFFF"
+				android:textColor="#FFFFFF"
-				        	        android:textSize="16dp"
+				android:textSize="16dp"
-					  			    android:paddingTop="7dp" />
+				android:paddingTop="7dp" />
-				  			  </LinearLayout>
-				       	<!--  android:background="@drawable/addmessage_selector"  -->
-        	</LinearLayout>
-    
-    	<LinearLayout 
-    	    	android:layout_width="fill_parent"
-    	    	android:layout_height="wrap_content"
-    	    	android:background="@drawable/style_bluebutton"
-    	    	android:paddingLeft="5dp"
-    	    	android:paddingTop="2dp"
-    	    	android:paddingBottom="2dp"
-    	    	android:visibility="gone"
-    	    	android:orientation="horizontal">
-			<LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:layout_gravity="center_vertical"
-			    android:orientation="horizontal">
-	    		<TextView
-	    		    android:id="@+id/textView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/IP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <TextView
-	    		    android:id="@+id/textViewIP2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/emptyIP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:id="@+id/layoutGateway2">
-	    		<ImageView
-	    		    android:id="@+id/imageView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/enable" />
-
-	    		<LinearLayout 
-			        android:layout_width="wrap_content"
-			        android:layout_height="wrap_content">
-			    	    <TextView
-			    		    android:id="@+id/textViewGateway2"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text=""
-			    		    android:textColor="#FFFFFF"
-			    		    android:textSize="17dp"
-			    		    android:paddingRight="2dp"/>
-			    	    <ImageView
-			    		    android:id="@+id/imageViewGateway"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="fill_parent"
-			    		    android:src="@drawable/arrow_down" />
-			   	</LinearLayout>
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="fill_parent"
-			    android:layout_gravity="center_vertical"
-			    android:layout_weight="6">
-	    	    <TextView
-	    		    android:id="@+id/textView3"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/Status"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <ImageView
-	    		    android:id="@+id/imageViewStatus2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/status_offline"
-	    		     />
-    	    </LinearLayout>			
-    	</LinearLayout>
-
-		<LinearLayout 
-    	    android:layout_width="fill_parent"
-    	    android:layout_height="wrap_content"
-    	    android:orientation="vertical"
-    	    android:paddingTop="2dp">
 		</LinearLayout>
+	</LinearLayout>
+    
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/style_bluebutton"
+		android:paddingLeft="5dp"
+		android:paddingTop="2dp"
+		android:paddingBottom="2dp"
+		android:visibility="gone"
+		android:orientation="horizontal">
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_gravity="center_vertical"
+			android:orientation="horizontal">
+			<TextView
+				android:id="@+id/textView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/IP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<TextView
+				android:id="@+id/textViewIP2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/emptyIP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:id="@+id/layoutGateway2">
+			<ImageView
+				android:id="@+id/imageView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/enable" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/textViewGateway2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text=""
+					android:textColor="#FFFFFF"
+					android:textSize="17dp"
+					android:paddingRight="2dp"/>
+				<ImageView
+					android:id="@+id/imageViewGateway"
+					android:layout_width="wrap_content"
+					android:layout_height="fill_parent"
+					android:src="@drawable/arrow_down" />
+			</LinearLayout>
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="6">
+			<TextView
+				android:id="@+id/textView3"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/Status"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<ImageView
+				android:id="@+id/imageViewStatus2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/status_offline" />
+		</LinearLayout>
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingTop="2dp">
+	</LinearLayout>
 		
-		<LinearLayout 
+	<LinearLayout
-		    android:layout_width="fill_parent"
+		android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
+		android:layout_height="fill_parent"
-		    android:orientation="vertical"
+		android:orientation="vertical"
-		    android:layout_gravity="center"
+		android:layout_gravity="center"
-		    android:gravity="center">
+		android:gravity="center">
 
 		<LinearLayout 
-    			    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    	    		android:orientation="horizontal"
+			android:orientation="horizontal"
-    	    		android:paddingRight="10dp"
+			android:paddingRight="10dp"
-    	    		android:layout_gravity="center_vertical">
+			android:layout_gravity="center_vertical">
-    	    		<LinearLayout 
+			<LinearLayout
-    	    		    android:layout_weight="1"
+				android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		    android:gravity="center">
+				android:gravity="center">
-			    		<TextView
+				<TextView
-			    		    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			    		    android:text="@string/Zone"
+					android:text="@string/Zone"
-			    		    android:textStyle="bold"
+					android:textStyle="bold"
-			    		    android:textColor="#ffffffff"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
+				<LinearLayout
-			    		<LinearLayout
+					android:id="@+id/layoutSpinnerZone"
-						    android:id="@+id/layoutSpinnerZone"
+					android:layout_width="wrap_content"
-						    android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
-						    android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
-						    android:background="@drawable/style_spinner"
+					android:gravity="right"
-						    android:gravity="right"
+					android:minWidth="150dp"
-						    android:minWidth="150dp"
+					android:orientation="horizontal"
-						    android:orientation="horizontal"
+					android:paddingBottom="4dp"
-						    android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
-						    android:paddingLeft="3dp"
+					android:paddingRight="3dp"
-						    android:paddingRight="3dp"
+					android:paddingTop="4dp" >
-						    android:paddingTop="4dp" >
 
-						    <TextView
+					<TextView
-						        android:id="@+id/textViewZone"
+						android:id="@+id/textViewZone"
-				    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
+						android:layout_gravity="center_vertical"
-				    		    android:text=""
+						android:text=""
-				    		    android:textColor="#000000"
+						android:textColor="#000000"
-				    		    android:textStyle="bold"
+						android:textStyle="bold"
-				    		    android:textSize="20dp"/>
+						android:textSize="20dp"/>
-						    <ImageView 
+					<ImageView
-						        android:src="@drawable/arrow_spinner"
+						android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
+						android:layout_gravity="center_vertical" />
-						</LinearLayout>
+				</LinearLayout>
-			    	</LinearLayout>
+			</LinearLayout>
-    	    		<LinearLayout 
+			<LinearLayout
-    	    		    android:layout_weight="1"
+				android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		    android:gravity="center">
+				android:gravity="center">
-			    		<TextView
+				<TextView
-			    		    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			    		    android:text="@string/Channel"
+					android:text="@string/Channel"
-			    		    android:textColor="#ffffffff"
+					android:textStyle="bold"
-			    		    android:textStyle="bold"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-						<LinearLayout
+				<LinearLayout
-						    android:id="@+id/layoutSpinnerChannel"
+					android:id="@+id/layoutSpinnerChannel"
-						    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
+					android:background="@drawable/style_spinner"
-						    android:gravity="right"
+					android:gravity="right"
-						    android:minWidth="150dp"
+					android:minWidth="150dp"
-						    android:orientation="horizontal"
+					android:orientation="horizontal"
-						    android:paddingBottom="4dp"
+					android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
+					android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
+					android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+					android:paddingTop="4dp" >
 
-						    <TextView
+					<TextView
-						        android:id="@+id/textViewChannel"
+						android:id="@+id/textViewChannel"
-				    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
+						android:layout_gravity="center_vertical"
-				    		    android:text=""
+						android:text=""
-				    		    android:textColor="#000000"
+						android:textColor="#000000"
-				    		    android:textStyle="bold"
+						android:textStyle="bold"
-				    		    android:textSize="20dp"/>
+						android:textSize="20dp"/>
-						    <ImageView 
+					<ImageView
-						        android:src="@drawable/arrow_spinner"
+						android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
+						android:layout_gravity="center_vertical" />
-						</LinearLayout>
+				</LinearLayout>
-					</LinearLayout>
+			</LinearLayout>
-    			</LinearLayout>
+		</LinearLayout>
 
 		<LinearLayout 
-			    	android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-			    	android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-			    	android:orientation="horizontal"
+			android:orientation="horizontal"
-			    	android:gravity="center"
+			android:gravity="center"
-			    	android:layout_gravity="center_horizontal">
+			android:layout_gravity="center_horizontal">
     	    		
-					<LinearLayout 
+			<LinearLayout
-	    	    	    android:layout_weight="1"
+				android:layout_weight="1"
-	    	    	    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-	    	    	    android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-	    	    	    android:gravity="center"
+				android:gravity="center"
-	    	    	    android:paddingTop="3dp">
+				android:paddingTop="3dp">
-				    	    	<LinearLayout
+				<LinearLayout
-				    	    	    android:layout_width="276dp"
+					android:layout_width="276dp"
-				    	    	    android:layout_height="93dp"
+					android:layout_height="93dp"
-				    	    	    android:layout_gravity="center"
+					android:layout_gravity="center"
-				    	    	    android:background="@drawable/screen"
+					android:background="@drawable/screen"
-				    	    	    android:gravity="center"
+					android:gravity="center"
-				    	    	    android:orientation="vertical"
+					android:orientation="vertical"
-				    	    	    android:paddingBottom="0dp"
+					android:paddingBottom="0dp"
-				    	    	    android:paddingTop="7dp">
+					android:paddingTop="7dp">
 				
-							    		<TextView
+					<TextView
-							    		    android:id="@+id/textViewMessageChannel"
+						android:id="@+id/textViewMessageChannel"
-							    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
+						android:layout_gravity="center_horizontal"
-							    		    android:paddingBottom="7dp"
+						android:paddingBottom="7dp"
-							    		    android:textColor="#000000"
+						android:textColor="#000000"
-							    		    android:textSize="20dp"
+						android:textSize="20dp"
-							    		    android:textStyle="bold"/>
+						android:textStyle="bold"/>
-							    		<TextView
+					<TextView
-							    		    android:id="@+id/textViewMessageStatus"
+						android:id="@+id/textViewMessageStatus"
-							    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
+						android:layout_gravity="center_horizontal"
-							    		    android:textColor="#000000"
+						android:textColor="#000000"
-							    		    android:textSize="20dp"
+						android:textSize="20dp"
-							    		    android:textStyle="bold"/>
+						android:textStyle="bold"/>
-							    </LinearLayout>
+				</LinearLayout>
-				    </LinearLayout>
+			</LinearLayout>
-			    </LinearLayout>
+		</LinearLayout>
 		
 		<LinearLayout 
     	    android:layout_width="fill_parent"
@@ -366,104 +362,104 @@
     	    android:layout_gravity="center_horizontal"
     	    android:gravity="center_horizontal">
 
-    			<LinearLayout 
+			<LinearLayout
-    			    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		android:orientation="vertical"
+				android:orientation="vertical"
-    	    		android:gravity="center_horizontal"
+				android:gravity="center_horizontal"
-    	    		android:layout_weight="1">
+				android:layout_weight="1">
-				    	<LinearLayout 
+				<LinearLayout
-				    	    	android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-				    	    	android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-				    	    	android:orientation="vertical">
+					android:orientation="vertical">
-		    			    	<RadioGroup android:id="@+id/radioGroupCallType" 
+					<RadioGroup
-		    			    	    	android:layout_width="wrap_content" 
+						android:id="@+id/radioGroupCallType"
-		    			    	    	android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
-		    			    	    	android:layout_marginBottom="3sp">
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="3sp">
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioAll"
+							android:id="@+id/radioAll"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:checked="true"
+							android:checked="true"
-					    			    android:text="@string/AllCall"
+							android:text="@string/AllCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioGroup"
+							android:id="@+id/radioGroup"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:text="@string/GroupCall"
+							android:text="@string/GroupCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioPrivate"
+							android:id="@+id/radioPrivate"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:text="@string/PrivateCall"
+							android:text="@string/PrivateCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    		</RadioGroup>
+					</RadioGroup>
-					    		 <LinearLayout
+					<LinearLayout
-									    android:id="@+id/layoutSpinnerCallType"
+						android:id="@+id/layoutSpinnerCallType"
-									    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-									    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-									    android:background="@drawable/style_spinner"
+						android:background="@drawable/style_spinner"
-									    android:gravity="right"
+						android:gravity="right"
-									    android:minWidth="150dp"
+						android:minWidth="150dp"
-									    android:orientation="horizontal"
+						android:orientation="horizontal"
-									    android:paddingBottom="4dp"
+						android:paddingBottom="4dp"
-									    android:paddingLeft="3dp"
+						android:paddingLeft="3dp"
-									    android:paddingRight="3dp"
+						android:paddingRight="3dp"
-									    android:paddingTop="4dp"
+						android:paddingTop="4dp"
-									    android:visibility="invisible" >
+						android:visibility="invisible" >
 			
-									    <TextView
+						<TextView
-									        android:id="@+id/textViewCallType"
+							android:id="@+id/textViewCallType"
-							    		    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_vertical"
+							android:layout_gravity="center_vertical"
-							    		    android:text=""
+							android:text=""
-							    		    android:textColor="#000000"
+							android:textColor="#000000"
-							    		    android:textStyle="bold"
+							android:textStyle="bold"
-							    		    android:textSize="20dp"/>
+							android:textSize="20dp"/>
-									    <ImageView 
+						<ImageView
-									        android:src="@drawable/arrow_spinner"
+							android:src="@drawable/arrow_spinner"
-									        android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-									        android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-									        android:layout_gravity="center_vertical" />
+							android:layout_gravity="center_vertical" />
-								</LinearLayout>
+					</LinearLayout>
-			    		 </LinearLayout>
+				 </LinearLayout>
-    			</LinearLayout>
+			</LinearLayout>
-
-    			<LinearLayout
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="1"
-    			    android:gravity="center_vertical|center_horizontal"
-    			    android:orientation="vertical" >
-				    	<Button
-	    			        android:id="@+id/buttonPTT"
-	    			        style="@style/ButtonPTT"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="88dp"
-	    			        android:background="@drawable/style_buttonptt"
-	    			        android:gravity="center"
-	    			        android:paddingBottom="20dp"
-	    			        android:text="@string/PTT" />
-	    			    <Button
-	    			        android:id="@+id/buttonDKey"
-	    			        style="@style/ButtonText"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="wrap_content"
-	    			        android:background="@drawable/style_bluebutton"
-	    			        android:text="@string/DeKey"
-	    			        android:textSize="18dp" />
-    			</LinearLayout>
 
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:gravity="center_vertical|center_horizontal"
+				android:orientation="vertical" >
+				<Button
+					android:id="@+id/buttonPTT"
+					style="@style/ButtonPTT"
+					android:layout_width="135dp"
+					android:layout_height="88dp"
+					android:background="@drawable/style_buttonptt"
+					android:gravity="center"
+					android:paddingBottom="20dp"
+					android:text="@string/PTT" />
+				<Button
+					android:id="@+id/buttonDKey"
+					style="@style/ButtonText"
+					android:layout_width="135dp"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_bluebutton"
+					android:text="@string/DeKey"
+					android:textSize="18dp" />
+			</LinearLayout>
     	</LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>

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

@@ -123,19 +123,18 @@
     			    android:visibility="gone"
     			    android:background="@drawable/recycle"/>
     			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-   </LinearLayout>
-		    
-			<GridView 
-			    	android:id="@+id/gridViewRecordings" 
-			    	android:layout_width="fill_parent" 
-			    	android:layout_height="fill_parent"
-			    	android:verticalSpacing="1dp"
-			    	android:horizontalSpacing="0dp"
-			    	android:background="#999999"
-			    	android:drawSelectorOnTop="false"
-			    	android:listSelector="@drawable/gridalarm_selector"
-			    	android:numColumns="1"
-			    	android:padding="5dp"></GridView>
 		</LinearLayout>
+		    
+		<GridView
+				android:id="@+id/gridViewRecordings"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:verticalSpacing="1dp"
+				android:horizontalSpacing="0dp"
+				android:background="#999999"
+				android:drawSelectorOnTop="false"
+				android:listSelector="@drawable/gridalarm_selector"
+				android:numColumns="1"
+				android:padding="5dp"></GridView>
+	</LinearLayout>
 </LinearLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layoutMain"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -10,246 +11,237 @@
 	    android:layout_height="fill_parent"
 	    android:layout_width="fill_parent"
 	    android:layout_weight="80">
-		    <LinearLayout
+		<LinearLayout
-		        android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-		        android:orientation="vertical"
+			android:orientation="vertical"
-		        android:layout_gravity="center"
+			android:layout_gravity="center"
-		        android:paddingLeft="5dp"
+			android:paddingLeft="5dp"
-		        android:paddingBottom="50dp" >
+			android:paddingBottom="50dp" >
-				<LinearLayout 
+			<LinearLayout
-				    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-				    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-				    android:orientation="horizontal">
+				android:orientation="horizontal">
-				 <LinearLayout 
+				<LinearLayout
-			         	 android:layout_width="fill_parent"
+					 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+					 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+					 android:orientation="horizontal"
-			           	 android:gravity="left"
+					 android:gravity="left"
-			           	 android:paddingTop="10dp"
+					 android:paddingTop="10dp"
-			           	 android:paddingLeft="7dp"
+					 android:paddingLeft="7dp"
-			           	 android:layout_weight="0.4">
+					 android:layout_weight="0.4">
-			            <TextView
+					<TextView
-			                android:layout_width="fill_parent"
+						android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                android:text="@string/serverIP"
+						android:text="@string/serverIP"
-			                android:textSize="14dp"
+						android:textSize="14dp"
-			                android:textColor="#FFFFFF"
+						android:textStyle="bold"
-			                android:textStyle="bold"
+						android:layout_gravity="center_vertical"
-			                android:layout_gravity="center_vertical"
+						android:gravity="center_vertical|right"
-			                android:gravity="center_vertical|right"
+						android:layout_weight="2"/>
-			                android:layout_weight="2"/>
 		
-			            <LinearLayout
+					<LinearLayout
-			                android:layout_width="fill_parent"
+						android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                android:layout_weight="1" 
+						android:layout_weight="1"
-			                android:paddingTop="3dp">
+						android:paddingTop="3dp">
-			                <EditText
+						<EditText
-			                    android:id="@+id/appServerIP"
+							android:id="@+id/appServerIP"
-			                    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-			                    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-			                    android:gravity="center"
+							android:gravity="center"
-			                    android:minWidth="200dp"
+							android:minWidth="200dp"
-			                    android:singleLine="true"
+							android:singleLine="true"
-			                    android:imeOptions="actionDone" >
+							android:imeOptions="actionDone" >
-			                </EditText>
+						</EditText>
-			            </LinearLayout>
+					</LinearLayout>
 		
 				</LinearLayout>
-				 <LinearLayout 
+			 	<LinearLayout
-			         	 android:layout_width="fill_parent"
+					android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+					android:orientation="horizontal"
-			           	 android:gravity="left"
+					android:gravity="left"
-			           	 android:paddingTop="10dp"
+					android:paddingTop="10dp"
-			           	 android:layout_weight="0.6">
+					android:layout_weight="0.6">
-			            <TextView
+					<TextView
-			                android:layout_width="fill_parent"
+						android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                android:text="@string/serverPort"
+						android:text="@string/serverPort"
-			                android:textSize="14dp"
+						android:textSize="14dp"
-			                android:textColor="#FFFFFF"
+						android:textStyle="bold"
-			                android:textStyle="bold"
+						android:gravity="center_vertical|right"
-			                android:gravity="center_vertical|right"
+						android:layout_gravity="center_vertical|right"
-			                android:layout_gravity="center_vertical|right"
+						android:layout_weight="1.4"/>
-			                android:layout_weight="1.4"/>
+					<LinearLayout
-			            <LinearLayout 
+						android:layout_width="fill_parent"
-			                	android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
-			                	android:layout_height="wrap_content"
+						android:layout_weight="1"
-			                	android:layout_weight="1"
+						android:paddingTop="3dp">
-			                	android:paddingTop="3dp">
+						<EditText
-					            <EditText 
+							android:layout_height="wrap_content"
-					           			android:layout_height="wrap_content" 
+							android:id="@+id/appServerPort"
-					           			android:id="@+id/appServerPort" 
+							android:maxLength="5"
-					           			android:maxLength="5"
+							android:minWidth="73dp"
-					           			android:minWidth="73dp"
+							android:gravity="center"
-					           			android:gravity="center"
+							android:layout_width="wrap_content"
-					           			android:layout_width="wrap_content"
+							android:layout_gravity="center_vertical|right"
-					           			android:layout_gravity="center_vertical|right"
+							android:inputType="number"
-					           			android:inputType="number"
+							android:imeOptions="actionDone" />
-					           			android:imeOptions="actionDone">
+					</LinearLayout>
-								</EditText>
-						</LinearLayout>
 				</LinearLayout>
 			</LinearLayout>
-			
+
-			
 			<LinearLayout 
 			    android:layout_width="fill_parent"
 			    android:layout_height="wrap_content"
 			    android:orientation="horizontal"
 			    android:id="@+id/layoutPath">
 			    <LinearLayout 
-			         	 android:layout_width="fill_parent"
+					 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+					 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+					 android:orientation="horizontal"
-			           	 android:paddingTop="0dp"
+					 android:paddingTop="0dp"
-			           	 android:gravity="center_vertical|left">
+					 android:gravity="center_vertical|left">
-					    <LinearLayout 
+					<LinearLayout
-			                	android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                	android:layout_width="95dp"
+						android:layout_width="95dp"
-			                	android:layout_weight="0">
+						android:layout_weight="0">
-				            <TextView
+						<TextView
-				                android:layout_width="fill_parent"
+							android:layout_width="fill_parent"
-				                android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-				                android:text="@string/configName"
+							android:text="@string/configName"
-				                android:textSize="14dp"
+							android:textSize="14dp"
-				                android:textColor="#FFFFFF"
+							android:textStyle="bold"
-				                android:textStyle="bold"
+							android:gravity="center_vertical|right"
-				                android:gravity="center_vertical|right"
+							android:layout_gravity="center_vertical"/>
-				                android:layout_gravity="center_vertical"/>
+					</LinearLayout>
-			            </LinearLayout>
+					<LinearLayout
-			            <LinearLayout 
+						android:layout_height="wrap_content"
-			                	android:layout_height="wrap_content"
+						android:layout_width="0dp"
-			                	android:layout_width="0dp"
+						android:layout_weight="1"
-			                	android:layout_weight="1"
+						android:paddingTop="3dp">
-			                	android:paddingTop="3dp">
 		
-			                <EditText
+						<EditText
-			                    android:id="@+id/editTextPath"
+							android:id="@+id/editTextPath"
-			                    android:layout_width="fill_parent"
+							android:layout_width="fill_parent"
-			                    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-			                    android:gravity="right|center_vertical"
+							android:gravity="right|center_vertical"
-			                    android:text="serial"
+							android:text="serial"
-			                    android:imeOptions="actionDone"
+							android:imeOptions="actionDone"
-			                    android:minWidth="73dp"
+							android:minWidth="73dp"
-			                    
+
-			                    android:singleLine="true" >
+							android:singleLine="true" >
-			                    <requestFocus />
+							<requestFocus />
-			                </EditText>
+						</EditText>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp">
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:id="@+id/btn_browse"
+							android:text="@string/load"
+							style="@style/ButtonText"
+							android:textColor="#000"
+							android:textSize="18dp"/>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp"
+						android:paddingRight="3dp">
 		
-						</LinearLayout>
+						<ImageView
-			            <LinearLayout 
+							android:id="@+id/imageViewQuestionMark"
-			                	android:layout_height="wrap_content"
+							android:layout_width="wrap_content"
-			                	android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
-			                	android:layout_weight="0"
+							android:src="@drawable/questionmark_small" />
-			                	android:paddingTop="3dp">
+					</LinearLayout>
-					            <Button
-									android:layout_width="wrap_content"
-									android:layout_height="wrap_content"
-									android:id="@+id/btn_browse"
-									android:text="@string/load"
-									style="@style/ButtonText"
-									android:textColor="#000"
-									android:textSize="18dp"/>
-						</LinearLayout>
-						<LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="wrap_content"
-			                	android:layout_weight="0"
-			                	android:paddingTop="3dp"
-			                	android:paddingRight="3dp">
-		
-							<ImageView
-							    android:id="@+id/imageViewQuestionMark"
-							    android:layout_width="wrap_content"
-							    android:layout_height="wrap_content"
-							    android:src="@drawable/questionmark_small" />
-						</LinearLayout>
 				</LinearLayout>
-			    
 			</LinearLayout>
 			
 			<LinearLayout
-			        android:id="@+id/frameLayout11"
+				android:id="@+id/frameLayout11"
-			        android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-			        android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-			        android:orientation="horizontal"
+				android:orientation="horizontal"
-			        android:gravity="left" >
+				android:gravity="left" >
 			
-			        <TextView
+				<TextView
-			            android:layout_width="95dp"
+					android:layout_width="95dp"
-			            android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			            android:text="@string/language"
+					android:text="@string/language"
-			            android:textSize="14dp"
+					android:textSize="14dp"
-						android:layout_marginRight="2dp"
+					android:layout_marginRight="2dp"
-			            android:textColor="#FFFFFF"
+					android:textStyle="bold"
-			            android:textStyle="bold"
+					android:gravity="right"
-			            android:gravity="right"
+					android:layout_gravity="center_vertical"/>
-			            android:layout_gravity="center_vertical"/>
+				<LinearLayout
-					<LinearLayout
+					android:id="@+id/layoutSpinnerLanguage"
-						    android:id="@+id/layoutSpinnerLanguage"
+					android:layout_width="wrap_content"
-						    android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
-						    android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
-						    android:background="@drawable/style_spinner"
+					android:gravity="left|center_vertical"
-						    android:gravity="left|center_vertical"
+					android:minWidth="223dp"
-						    android:minWidth="223dp"
+					android:orientation="horizontal"
-						    android:orientation="horizontal"
+					android:paddingBottom="4dp"
-						    android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
-						    android:paddingLeft="3dp"
+					android:paddingRight="3dp"
-						    android:paddingRight="3dp"
+					android:paddingTop="4dp" >
-						    android:paddingTop="4dp" >
+					<ImageView
-					    	 <ImageView 
+						android:id="@+id/imageLanguage"
-					    	    android:id="@+id/imageLanguage"
+						android:src="@drawable/de"
-						        android:src="@drawable/de"
+						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:layout_gravity="center_vertical"
+						android:layout_weight="0" />
-						        android:layout_weight="0" />
+					<TextView
-						    <TextView
+						android:id="@+id/textViewSpinnerLanguage"
-						        android:id="@+id/textViewSpinnerLanguage"
+						android:layout_width="fill_parent"
-				    		    android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
-				    		    android:layout_gravity="center_vertical"
+						android:gravity="left"
-				    		    android:gravity="left"
+						android:text="Germany"
-				    		    android:text="Germany"
+						android:textColor="#000000"
-				    		    android:textColor="#000000"
+						android:textSize="17dp"
-				    		    android:textSize="17dp"
+						android:layout_weight="1"
-				    		    android:layout_weight="1"
+						android:paddingBottom="2dp"
-				    		    android:paddingBottom="2dp"
+						android:paddingLeft="3dp">
-				    		    android:paddingLeft="3dp">
+						<requestFocus />
-				    		    	<requestFocus />
+					</TextView>
-				    		    </TextView>
+					<ImageView
-						    <ImageView 
+						android:src="@drawable/arrow_spinner"
-						        android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
-						        android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
-						        android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
-						        android:layout_weight="0" />
+				</LinearLayout>
-						</LinearLayout>
 			</LinearLayout>
 			
-				<LinearLayout 
+			<LinearLayout
-			         	 android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+				android:orientation="horizontal"
-			           	 android:gravity="center_horizontal"
+				android:gravity="center_horizontal"
-			           	 android:layout_marginTop="20dp">
+				android:layout_marginTop="20dp">
-			            <Button
+				<Button
-							android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-							android:id="@+id/btn_save"
+					android:id="@+id/btn_save"
-							android:text="@string/save"
+					android:text="@string/save"
-							style="@style/ButtonText"
+					style="@style/ButtonText"
-							android:textSize="22dp"
+					android:textSize="22dp"
-		    			    android:background="@drawable/style_bluebutton"/>
+					android:background="@drawable/style_bluebutton"/>
-				</LinearLayout>
+			</LinearLayout>
 		</LinearLayout>
 	</LinearLayout>
-<RelativeLayout 
+	<RelativeLayout
-    android:layout_width="wrap_content"
+		android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+		android:layout_height="wrap_content"/>
     
-</RelativeLayout> 
 </LinearLayout>

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

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

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">SafeMobile Dispatch</string>
+    <string name="app_name">SafeDispatch Mobile</string>
-    <string name="app_name_demo">SafeMobile Dispatch Demo</string>
+    <string name="app_name_demo">SafeDispatch Mobile Demo</string>
     <string name="app_name_radiopod">RadioPod</string>
     <string name="app_name_radiopad">RadioPad</string>
     <string name="app_name_radiopodd">RadioPod</string>
@@ -257,5 +257,13 @@
 
 
     <string name="speedMph">%1$d mph</string>
+    <string name="DialogService_Info_ErrorMessage">Oops, something happened</string>
+    <string name="go_to_settings">Go to settings</string>
+    <string name="permission_denied">Permission Denied</string>
+    <string name="permissionBlocked">%1$s permission was not accepted. To be able to use the %2$s, please open application settings and grant the %3$s permission</string>
+    <string name="microphone">Microphone</string>
+    <string name="radio_tab">Radio Tab</string>
+    <string name="too_many_positions">You have selected %1$s positions.\nPlease select a smalled interval.</string>
+    <string name="no_data_for_interval">No data for this interval</string>
 
 </resources>

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

@@ -82,7 +82,7 @@
 	
 	<style name="mainBackground_sd">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -138,7 +138,7 @@
 	</style>
 	
 	<style name="bg_sd">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_sd">
@@ -155,7 +155,7 @@
 	
 	<style name="mainBackground_hy">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -211,7 +211,7 @@
 	</style>
 	
 	<style name="bg_hy">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_hy">
@@ -228,7 +228,7 @@
 	
 	<style name="mainBackground_vi">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -285,7 +285,7 @@
 	</style>
 	
 	<style name="bg_vi">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_vi">