Merge pull request 'when receiving a new alarm && current tab is alarms, refresh alarm list' (#22) from SD-224 into develop

Reviewed-on: #22
This commit is contained in:
CiufudeanDani 2022-04-07 10:16:35 +00:00
commit 539170109d
2 changed files with 4 additions and 7 deletions

View File

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

View File

@ -1741,11 +1741,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
}
//list for SMS
if (AppParams.crtTab == AppParams.Tabs.alarms) {
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
if (AppParams.crtTab == AppParams.Tabs.alarms)
getAlarms(AppParams.USERID);
}
}
@Override
public void onRecordingsListReceived(TCPEvent event) {