Safemobile
/
safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SD-188 - cleaned up TabLayoutActivity of unused code 

- small refactor
- null checks
This commit is contained in:
Bogdan Ungureanu 2022-03-23 13:07:40 +02:00
parent 7039199208
commit 34c578fdf5
12 changed files with 1642 additions and 2142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libSafeMobile/src/main/java/com/safemobile/interfaces/ITCPListener.java
View File

@ -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 onTCPConnectionUp(boolean previuosWasConnectionUp);
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp);
public void onTCPConnectionDown(boolean previousWasConnectionUp);
public void onTCPConnectionUp(boolean previousWasConnectionUp);
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp);
}

3
libSafeMobile/src/main/java/com/safemobile/services/TCPmsgParser.java
View File

@ -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);
}
}

2
safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java
View File

@ -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

4
safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
View File

@ -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);

2
safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java
View File

@ -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
}

2
safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java
View File

@ -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

82
safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
View File

@ -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)
SendPTT(selectedCallType, selectedID,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
if(parentTab.getCrtRadio() != null)
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)
parentTab.crtRadio = AppParams.listRadios.get(0);
if(parentTab.getCrtRadio() == null)
parentTab.setCrtRadio(AppParams.listRadios.get(0));
// if crtRadio not exists anymore
if(!AppParams.listRadios.contains(parentTab.crtRadio))
parentTab.crtRadio = AppParams.listRadios.get(0);
if(!AppParams.listRadios.contains(parentTab.getCrtRadio()))
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)
parentTab.sendDekey(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
if(parentTab.getCrtRadio() != null)
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);
parentTab.SendPTT(callType, id,gwid,rgwid,userID);
SM.Debug("sendPTT callType:"+callType);
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);
textViewChannel.setText(parentTab.crtRadio.getChannelName());
textViewZone.setText(parentTab.crtRadio.getZoneName());
textViewGateway.setText(parentTab.getCrtRadio().IP);
textViewChannel.setText(parentTab.getCrtRadio().getChannelName());
textViewZone.setText(parentTab.getCrtRadio().getZoneName());
// update UI
myHandler.post(UpdateResultsZoneChannelRUN);
radioGWChanged(parentTab.crtRadio.IP);
radioGWChanged(parentTab.getCrtRadio().IP);
}
}
};

18
safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
View File

@ -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)
textViewGateway.setText(parentTab.crtRadio.IP);
if(parentTab.getCrtRadio() != null)
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());
GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
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);
GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
textViewGateway.setText(parentTab.getCrtRadio().IP);
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
}
}
};

6
safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
View File

@ -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) {
}

8
safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity_beforeMod.java
View File

@ -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) {

4
safeDispatch/src/main/java/com/safemobile/dispatch/SetupActivity.java
View File

@ -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
/*

3645
safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
View File

File diff suppressed because it is too large Load Diff