SD-188 - cleaned up TabLayoutActivity of unused code

- small refactor
- null checks

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

@@ -155,12 +155,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
 	}
 	
 	
-	public boolean sendAlarmAcknowledge(int alarm_id, int type)
+	public boolean sendAlarmAcknowledge(int alarm_id, int type, String unitName)
 	{
 		if(tcp == null) 
 			return false;
 		
-		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#");
+		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#" + AppParams.USERID + "#" + unitName + "#");
 		if(res)
 			SM.Debug("Message [sendAlarmAcknowledge] sent to app server alarm_id:" + alarm_id + " type:" + type);
 		else

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/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/services/TCPmsgParser.java

@@ -10,7 +10,6 @@ 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{
@@ -150,7 +149,7 @@ public class TCPmsgParser implements Runnable{
         TCPEvent event = new TCPEvent( this, _msg );
         Iterator<ITCPListener> listeners = _listeners.iterator();
         while( listeners.hasNext() ) {
-            ( (ITCPListener) listeners.next() ).alarmLiveRecv(event);
+            ( (ITCPListener) listeners.next() ).alarmLiveReceived(event);
         }
     }
     

safeDispatch/src/main/AndroidManifest.xml

@@ -10,13 +10,15 @@
         android:glEsVersion="0x00020000"
         android:required="true" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <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

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

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

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

@@ -42,12 +42,12 @@ public class HistoryActivity extends AppCompatActivity {
         setContentView(R.layout.tabhistory);
 
         parentTab = (TabLayoutActivity) getParent();
-        parentTab.historyActivity = this;
+        parentTab.setHistoryActivity(this);
 
         Locale locale = new Locale(AppParams.LANGUAGETMP);
         Locale.setDefault(locale);
 
-        googleMap = parentTab.liveActivity.getMap();
+        googleMap = parentTab.getLiveActivity().getMap();
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
 

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

@@ -112,7 +112,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
         }

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

@@ -215,7 +215,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

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

@@ -236,7 +236,7 @@ public class RadioActivity extends Activity {
 			}
 			
 			// send current activity to parrent
-			parentTab.radioActivity = this;
+			parentTab.setRadioActivity(this);
 			
 			// register to be notified when an event is triggered
 	    	registerBroadcastIntents();
@@ -315,10 +315,10 @@ public class RadioActivity extends Activity {
 			if(!pttONoff)
 			{
 				String chanMsg = "", statMsg = "";
-				if(parentTab.crtRadio!= null)
+				if(parentTab.getCrtRadio() != null)
-					SendPTT(selectedCallType, selectedID,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
+					SendPTT(selectedCallType, selectedID, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
 				// flag in Call
-				parentTab.inCall = true;
+				parentTab.setInCall(true);
 				pttONoff= true;
 				if(audioH!=null)
 					audioH.soundNeeded = true;
@@ -381,7 +381,7 @@ public class RadioActivity extends Activity {
 	{
 		String chanMsg = "", statMsg = "";
 		if(!AppParams.DEMO)
-			SendPTT(selectedCallType+10, 1,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
+			SendPTT(selectedCallType+10, 1, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
 		pttONoff= false;
 		if(audioH!=null)
 			audioH.soundNeeded = false;
@@ -417,7 +417,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// display dialog with adapter
 				ArrayList<String> tmp = new ArrayList<String>();
@@ -438,7 +438,7 @@ public class RadioActivity extends Activity {
 						//textViewChannel.setText(crtChannels.get(which).chName);
 						
 						// send change to App
-						onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
+						onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
 					}
 				});
 				
@@ -492,7 +492,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// display dialog with adapter
 				ArrayList<String> tmp = new ArrayList<String>();
@@ -511,7 +511,7 @@ public class RadioActivity extends Activity {
 						
 						// send change to App
 						//onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), getNR4CH(textViewChannel.getText().toString()));
-						onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
+						onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
 					}
 				});
 				
@@ -560,7 +560,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// create spinner selected
 				AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -686,17 +686,17 @@ public class RadioActivity extends Activity {
 	{
 		// save radios
 		AppParams.listRadios = radios;
-		if(parentTab.crtRadio == null)
+		if(parentTab.getCrtRadio() == null)
-			parentTab.crtRadio = AppParams.listRadios.get(0);
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
 		// if crtRadio not exists anymore
-		if(!AppParams.listRadios.contains(parentTab.crtRadio))
+		if(!AppParams.listRadios.contains(parentTab.getCrtRadio()))
-			parentTab.crtRadio = AppParams.listRadios.get(0);
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
 
-		SM.Debug(parentTab.crtRadio.toString());
+		SM.Debug(parentTab.getCrtRadio().toString());
 		// get status for selected Radio
-		ReqRadioStatus(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID);
+		ReqRadioStatus(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID);
 		// get selected Zone and CH
-		onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, 0,0);
+		onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, 0,0);
 		
 		myHandler.post(updateGatewaysRUN);
 	}
@@ -716,7 +716,7 @@ public class RadioActivity extends Activity {
 		allGWsIP.clear();
 		for(RadioGW radio: AppParams.listRadios)
 			allGWsIP.add(radio.IP);
-		textViewGateway.setText(parentTab.crtRadio.IP);
+		textViewGateway.setText(parentTab.getCrtRadio().IP);
     }
     
 	
@@ -743,20 +743,20 @@ public class RadioActivity extends Activity {
     	
     	SM.Debug("am primit: " + _radioID + "," + _GWID + "," + _zoneNR + "," + _chNR);
     	
-    	if ((parentTab.crtRadio == null)||((parentTab.crtRadio.GW_ID == _GWID)&&(parentTab.crtRadio.ID == _radioID)))
+    	if ((parentTab.getCrtRadio() == null)||((parentTab.getCrtRadio().GW_ID == _GWID)&&(parentTab.getCrtRadio().ID == _radioID)))
     	{
 	    	// update crtRadios, crtZones, and crtChannel
 	    	for(RadioGW radio: AppParams.listRadios)
 	    		if(radio.GW_ID == _GWID && radio.ID == _radioID)
 	    		{
-	    			parentTab.crtRadio = radio;
+	    			parentTab.setCrtRadio(radio);
 	    			crtZones = radio.zoneList;
 	    			cmdForMe = true;
 	    		}
     	}    	 
         if (cmdForMe)
         {
-	    	for(Zone zone: parentTab.crtRadio.zoneList)
+	    	for(Zone zone: parentTab.getCrtRadio().zoneList)
 	    		if(zone.id == _zoneNR)
 	    			crtChannels = zone.channelList;
 	    	// update UI
@@ -776,7 +776,7 @@ public class RadioActivity extends Activity {
 
 		if(AppParams.listRadios.size()>0)
 		{
-			textViewGateway.setText(parentTab.crtRadio.IP);
+			textViewGateway.setText(parentTab.getCrtRadio().IP);
 			
 			// get all radio IP
 			allGWsIP.clear();
@@ -784,13 +784,13 @@ public class RadioActivity extends Activity {
 				allGWsIP.add(radio.IP);
 			
 			// set spinners and text
-			if(parentTab.crtRadio == null)		
+			if(parentTab.getCrtRadio() == null)
 			{
-				parentTab.crtRadio = AppParams.listRadios.get(0);
+				parentTab.setCrtRadio(AppParams.listRadios.get(0));
 				textViewGateway.setText(allGWsIP.get(0));
 				// set zone
 				ArrayList<String> zones = new ArrayList<String>();
-				crtZones = parentTab.crtRadio.zoneList;
+				crtZones = parentTab.getCrtRadio().zoneList;
 				for(Zone zone: crtZones)
 					zones.add(zone.ZoneName);
 				
@@ -799,7 +799,7 @@ public class RadioActivity extends Activity {
 				//spinnerZone.setSelection(0);
 				// set channel
 				ArrayList<String> channel = new ArrayList<String>();
-				crtChannels = parentTab.crtRadio.zoneList.get(0).channelList;
+				crtChannels = parentTab.getCrtRadio().zoneList.get(0).channelList;
 				for(Channel ch: crtChannels)
 					channel.add(ch.chName);
 				textViewChannel.setText(channel.get(0).toString());
@@ -811,10 +811,10 @@ public class RadioActivity extends Activity {
 			{
 				for(RadioGW radio: AppParams.listRadios)
 					if(radio.ID == radioID && radio.GW_ID == GWID)
-						parentTab.crtRadio = radio;
+						parentTab.setCrtRadio(radio);
 				// get zones for adapter
 				ArrayList<String> zones = new ArrayList<String>();
-				crtZones = parentTab.crtRadio.zoneList;
+				crtZones = parentTab.getCrtRadio().zoneList;
 				int position = 0;
 				// get selected Zone
 				for(int i=0; i< crtZones.size(); i++)
@@ -828,7 +828,7 @@ public class RadioActivity extends Activity {
 
 				// set channel
 				ArrayList<String> channel = new ArrayList<String>();
-				crtChannels =  parentTab.crtRadio.zoneList.get(position).channelList;
+				crtChannels =  parentTab.getCrtRadio().zoneList.get(position).channelList;
 				position = 0;
 				// get current channel
 				for(int i=0; i< crtChannels.size(); i++)
@@ -856,7 +856,7 @@ public class RadioActivity extends Activity {
 			{
 				UpdateEnableDisableButtons("offline");
 				onZoneCHChange(radio.ID, radio.GW_ID,0,0);		// get zone and channel for crt radio
-				parentTab.crtRadio = radio;
+				parentTab.setCrtRadio(radio);
 			}
 		textViewGateway.setText(newIP);
 		
@@ -957,10 +957,10 @@ public class RadioActivity extends Activity {
 	    		buttonPTT.setEnabled(true);
 	    		buttonDKey.setEnabled(false);
 	    	}
-	    	if(parentTab.crtActivity == parentTab.RADIO && selectedCallType == calltype)
+	    	if(parentTab.getCrtActivity() == parentTab.RADIO_TAB_ID && selectedCallType == calltype)
 	    		parentTab.enableMenuButtons(false);
 	    	if(selectedCallType == calltype)
-	    		parentTab.inCall = true;
+	    		parentTab.setInCall(true);
 	    	
     	}
     	else if (callstatus==3)
@@ -986,7 +986,7 @@ public class RadioActivity extends Activity {
 		    	  }
 		    	  parentTab.enableMenuButtons(true);
 		    	  
-		    	parentTab.inCall = false;
+		    	parentTab.setInCall(false);
     		}
     	}
      }
@@ -1182,8 +1182,8 @@ public class RadioActivity extends Activity {
     // send Dekey to AppServer
     private void SendDekey()
 	{
-    	if(parentTab.crtRadio != null)
+    	if(parentTab.getCrtRadio() != null)
-    		parentTab.sendDekey(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+    		parentTab.sendDekey(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
 	}
     
     // send change Channel and Zone message to AppServer
@@ -1215,8 +1215,8 @@ public class RadioActivity extends Activity {
     	//113 -grpcall stop
     public void SendPTT(int callType, int id,int gwid, int rgwid,long userID)
     {    	
-	  	SM.Debug("SendPTT callType:"+callType);
+	  	SM.Debug("sendPTT callType:"+callType);
-	  	parentTab.SendPTT(callType, id,gwid,rgwid,userID);
+	  	parentTab.sendPTT(callType, id,gwid,rgwid,userID);
     }
     
     
@@ -1241,13 +1241,13 @@ public class RadioActivity extends Activity {
         		UpdateZoneCH(zc.rgwID, zc.gwID, zc.zoneNr, zc.channelNr);	
         	}
         	else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) {
-        		textViewGateway.setText(parentTab.crtRadio.IP);
+        		textViewGateway.setText(parentTab.getCrtRadio().IP);
-        		textViewChannel.setText(parentTab.crtRadio.getChannelName());
+        		textViewChannel.setText(parentTab.getCrtRadio().getChannelName());
-        		textViewZone.setText(parentTab.crtRadio.getZoneName());
+        		textViewZone.setText(parentTab.getCrtRadio().getZoneName());
         		
         		// update UI
     			myHandler.post(UpdateResultsZoneChannelRUN);
-        		radioGWChanged(parentTab.crtRadio.IP);
+        		radioGWChanged(parentTab.getCrtRadio().IP);
         	}
         }
     };

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

@@ -127,7 +127,7 @@ public class RecordingsActivity extends Activity {
 								// 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);
+								GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID);
 							}
 						});
 				AlertDialog alert = builder.create();
@@ -137,7 +137,7 @@ public class RecordingsActivity extends Activity {
 		textViewGateway.setVisibility(View.INVISIBLE);
 		
 		
-        parentTab.recordingsActivity = this;
+        parentTab.setRecordingsActivity(this);
         
         // register to receive broadcasts
         registerBroadcastIntents();
@@ -208,17 +208,17 @@ public class RecordingsActivity extends Activity {
     		
     		Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
     		
-    		if(parentTab.crtRadio != null)
+    		if(parentTab.getCrtRadio() != null)
-    			textViewGateway.setText(parentTab.crtRadio.IP);
+    			textViewGateway.setText(parentTab.getCrtRadio().IP);
     		
     		/*
     		if(parentTab.allRadios == null)
     			GetGWRadios();
     		 */
-    		if(playingPosition < 0 && parentTab.crtRadio != null)
+    		if(playingPosition < 0 && parentTab.getCrtRadio() != null)
     		{
-    			SM.Debug("GetRecordings resume + crtRadio:"+parentTab.crtRadio.toString());
+    			SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
-    			GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+    			GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
     		}
     		
     	}
@@ -402,8 +402,8 @@ public class RecordingsActivity extends Activity {
         		updateNumberOfRecordings();
         	}
         	else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) { 
-        		textViewGateway.setText(parentTab.crtRadio.IP);
+        		textViewGateway.setText(parentTab.getCrtRadio().IP);
-        		GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+        		GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
         	}
         }
     };

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

@@ -965,7 +965,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void alarmLiveRecv(TCPEvent event) {
+					public void alarmLiveReceived(TCPEvent event) {
 					}
 
 					@Override
@@ -994,7 +994,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 +1034,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/dispatch/SDMobileActivity_beforeMod.java

@@ -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/dispatch/SetupActivity.java

@@ -199,7 +199,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)
         {
@@ -245,7 +245,7 @@ public class SetupActivity extends Activity {
 			parentTab.stopTCPParser();
 			// recreate TCP with new settings
 			parentTab.loadSettings();
-			parentTab.TCPinit();
+			parentTab.tcpInit();
 			*/
 			// start thread to add listener
 			/*

safeDispatch/src/main/java/com/safemobile/lib/PermissionService.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 PermissionService 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;
+    }
+}