SD-188 - cleaned up TabLayoutActivity of unused code

- small refactor
- null checks

libSafeMobile/build.gradle

@@ -19,13 +19,6 @@ 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

@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
     </application>

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

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

libSafeMobile/src/main/java/com/safemobile/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);
         }
     }
     

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

@@ -1,5 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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

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

safeDispatch/release/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.safemobile.dispatch",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 8000033,
-      "versionName": "8.0.33",
-      "outputFile": "SafeDispatchMobile_v.8.0.33-release.apk"
-    }
-  ],
-  "elementType": "File"
-}

safeDispatch/src/main/AndroidManifest.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.safemobile.dispatch">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.safemobile.dispatch"
+    android:versionCode="9"
+    android:versionName="1.0.9">
 
     <!-- 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.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
@@ -25,7 +30,7 @@
 
     <application
         android:configChanges="orientation"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:screenOrientation="landscape"
         android:theme="@style/AppTheme">

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

@@ -76,7 +76,7 @@ public class AlarmActivity extends Activity {
 		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
 		textView1.setTextSize(24);
 
-		getParentTab().alarmActivity = this;
+		getParentTab().setAlarmActivity(this);
 	}
 
 	@Override

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

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

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

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

safeDispatch/src/main/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);
@@ -673,10 +673,10 @@ public class RadioActivity extends Activity {
 		dialog.setCancelable(true);
 		dialog.setCanceledOnTouchOutside(true);
 
-		TextView text = dialog.findViewById(R.id.text);
+		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = dialog.findViewById(R.id.image);
+		ImageView image = (ImageView) dialog.findViewById(R.id.image);
 		
-		image.setImageResource(R.mipmap.ic_launcher);
+		image.setImageResource(R.drawable.ic_launcher);
 		text.setText(errorMsg);
 		dialog.show();
 	}
@@ -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();
@@ -184,10 +184,10 @@ public class RecordingsActivity extends Activity {
 		dialog.setCancelable(true);
 		dialog.setCanceledOnTouchOutside(true);
 
-		TextView text = dialog.findViewById(R.id.text);
+		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = dialog.findViewById(R.id.image);
+		ImageView image = (ImageView) dialog.findViewById(R.id.image);
 		
-		image.setImageResource(R.mipmap.ic_launcher);
+		image.setImageResource(R.drawable.ic_launcher);
 		text.setText(errorMsg);
 		dialog.show();
 	}
@@ -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;
+    }
+}

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

@@ -11,7 +11,7 @@
                android:layout_height="wrap_content"
                android:layout_marginRight="10dp"
                android:layout_gravity="center_vertical"
-               android:src="@mipmap/ic_launcher"
+               android:src="@drawable/ic_launcher"
                />
    <LinearLayout 
    			  android:layout_width="wrap_content"

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

@@ -24,7 +24,7 @@
 	               android:layout_height="wrap_content"
 	               android:layout_marginRight="10dp"
 	               android:layout_gravity="center_vertical"
-	               android:src="@mipmap/ic_launcher"
+	               android:src="@drawable/ic_launcher"
 	               android:contentDescription="image for dialog"
 	               />
 	   <LinearLayout 

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

@@ -7,7 +7,7 @@
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@mipmap/ic_launcher"
+			android:src="@drawable/ic_launcher"
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp"
 			android:paddingTop="5dp"

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

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:layout_height="fill_parent"
+	android:id="@+id/tab1Layout" android:orientation="horizontal"
-	android:id="@+id/tab1Layout"
-	android:orientation="horizontal"
 	style="?bg">
 	
 	<RelativeLayout
@@ -164,11 +162,10 @@
 							android:text="@string/startDate"
 							android:textSize="22dp"
 							android:paddingLeft="5dp"
-							android:layout_marginTop="15sp"
 							android:textColor="#000000"
 							android:gravity="left"
 							android:id="@+id/labelStartDate"
-							/>
+							android:visibility="gone"/>
 						<LinearLayout
 							android:id="@+id/layoutStartPicker"
 							android:layout_height="wrap_content"
@@ -205,7 +202,7 @@
 							android:textColor="#000000"
 							android:gravity="left"
 							android:id="@+id/labelEndDate"
-							/>
+							android:visibility="gone"/>
 						<LinearLayout
 							android:id="@+id/layoutEndPicker"
 							android:layout_height="wrap_content"
@@ -287,15 +284,14 @@
     		</LinearLayout>
 
 			<fragment
-				xmlns:tools="http://schemas.android.com/tools"
 				android:layout_width="fill_parent"
 				android:layout_height="fill_parent"
 				android:id="@+id/map"
 				android:layout_toRightOf="@id/slidelayout"
 				android:layout_weight="1"
-				tools:context=".HistoryActivity"
 				android:name="com.google.android.gms.maps.SupportMapFragment" />
 
+
 		</LinearLayout>
 		 <ImageView
 			android:id="@+id/changeMapType"

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

@@ -1,4 +0,0 @@
-<?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">SafeDispatch Mobile</string>
+    <string name="app_name">SafeMobile Dispatch</string>
-    <string name="app_name_demo">SafeDispatch Mobile Demo</string>
+    <string name="app_name_demo">SafeMobile Dispatch Demo</string>
     <string name="app_name_radiopod">RadioPod</string>
     <string name="app_name_radiopad">RadioPad</string>
     <string name="app_name_radiopodd">RadioPod</string>

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_logo</item>
+    	<item name="android:background">@drawable/safedispatch</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -138,7 +138,7 @@
 	</style>
 	
 	<style name="bg_sd">
-	    <item name="android:background">@drawable/safedispatch_logo</item>
+	    <item name="android:background">@drawable/safedispatch</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_logo</item>
+    	<item name="android:background">@drawable/safedispatch</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -211,7 +211,7 @@
 	</style>
 	
 	<style name="bg_hy">
-	    <item name="android:background">@drawable/safedispatch_logo</item>
+	    <item name="android:background">@drawable/safedispatch</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_logo</item>
+    	<item name="android:background">@drawable/safedispatch</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -285,7 +285,7 @@
 	</style>
 	
 	<style name="bg_vi">
-	    <item name="android:background">@drawable/safedispatch_logo</item>
+	    <item name="android:background">@drawable/safedispatch</item>
 	</style>
 	
 	 <style name="header_vi">