corrected some logcat messages

This commit is contained in:
Graham Jones
2022-08-06 21:30:30 +01:00
parent c8c62db447
commit 6c8541091c

View File

@@ -1560,10 +1560,10 @@ public class SdServer extends Service implements SdDataReceiver {
private void checkEvents() { private void checkEvents() {
// Retrieve events from remote database // Retrieve events from remote database
if (mLm.mWac.getEvents((JSONObject remoteEventsObj) -> { if (mLm.mWac.getEvents((JSONObject remoteEventsObj) -> {
Log.v(TAG, "CheckEvents.getEvents.Callback()"); Log.v(TAG, "checkEvents.getEvents.Callback()");
Boolean haveUnvalidatedEvent = false; Boolean haveUnvalidatedEvent = false;
if (remoteEventsObj == null) { if (remoteEventsObj == null) {
Log.e(TAG, "CheckEvents.Callback: Error Retrieving events"); Log.e(TAG, "checkEvents.getEvents.Callback(): Error Retrieving events");
} else { } else {
try { try {
JSONArray eventsArray = remoteEventsObj.getJSONArray("events"); JSONArray eventsArray = remoteEventsObj.getJSONArray("events");
@@ -1577,12 +1577,14 @@ public class SdServer extends Service implements SdDataReceiver {
//Log.v(TAG,"CheckEventsTimer:setting firstUnvalidatedEvent to "+firstUnvalidatedEvent); //Log.v(TAG,"CheckEventsTimer:setting firstUnvalidatedEvent to "+firstUnvalidatedEvent);
} }
} }
Log.v(TAG, "CheckEventsTimer.onFinish.callback - haveUnvalidatedEvent = " + Log.v(TAG, "checkEvents() - haveUnvalidatedEvent = " +
haveUnvalidatedEvent); haveUnvalidatedEvent);
if (haveUnvalidatedEvent) { if (haveUnvalidatedEvent) {
Log.v(TAG,"checkEvents() - showing event notification and cancelling datashare notification.");
showEventNotification(); showEventNotification();
mNM.cancel(DATASHARE_NOTIFICATION_ID); mNM.cancel(DATASHARE_NOTIFICATION_ID);
} else { } else {
Log.v(TAG,"checkEvents() - cancelling event and datashare notifications");
mNM.cancel(EVENT_NOTIFICATION_ID); mNM.cancel(EVENT_NOTIFICATION_ID);
mNM.cancel(DATASHARE_NOTIFICATION_ID); mNM.cancel(DATASHARE_NOTIFICATION_ID);
} }