From 628d17230f2cb45717c60110eb5ca25f11d4bdbe Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 5 May 2023 07:31:51 +0200 Subject: [PATCH] Update event: added logging --- .../java/eu/faircode/email/CalendarHelper.java | 18 +++++++++++++++--- .../java/eu/faircode/email/ServiceSend.java | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/CalendarHelper.java b/app/src/main/java/eu/faircode/email/CalendarHelper.java index 4cb595783b..414a16e69b 100644 --- a/app/src/main/java/eu/faircode/email/CalendarHelper.java +++ b/app/src/main/java/eu/faircode/email/CalendarHelper.java @@ -253,17 +253,26 @@ public class CalendarHelper { static void update(Context context, VEvent event, EntityMessage message) { String uid = (event.getUid() == null ? null : event.getUid().getValue()); - if (TextUtils.isEmpty(uid)) + if (TextUtils.isEmpty(uid)) { + EntityLog.log(context, EntityLog.Type.General, message, + "Update event: no uid"); return; + } List attendees = event.getAttendees(); - if (attendees == null || attendees.size() == 0) + if (attendees == null || attendees.size() == 0) { + EntityLog.log(context, EntityLog.Type.General, message, + "Update event: no attendees"); return; + } ParticipationStatus status = attendees.get(0).getParticipationStatus(); if (!ParticipationStatus.ACCEPTED.equals(status) && - !ParticipationStatus.DECLINED.equals(status)) + !ParticipationStatus.DECLINED.equals(status)) { + EntityLog.log(context, EntityLog.Type.General, message, + "Update event: not accepted/declined"); return; + } ContentResolver resolver = context.getContentResolver(); try (Cursor cursor = resolver.query(CalendarContract.Events.CONTENT_URI, @@ -271,6 +280,9 @@ public class CalendarHelper { CalendarContract.Events.UID_2445 + " = ?", new String[]{uid}, null)) { + if (cursor.getCount() == 0) + EntityLog.log(context, EntityLog.Type.General, message, + "Update event: uid not found"); while (cursor.moveToNext()) { long eventId = cursor.getLong(0); diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index b3946f4422..2fa6106e28 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -1039,6 +1039,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar VEvent event = icalendar.getEvents().get(0); EntityMessage message = db.message().getMessage(sid); CalendarHelper.update(this, event, message); + break; } catch (Throwable ex) { Log.e(ex);