mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent index out of range

This commit is contained in:
M66B 2024-01-29 08:56:08 +01:00
parent 053f9008d4
commit c0f7fe0405
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -10292,8 +10292,11 @@ public class FragmentMessages extends FragmentBase
return null;
ICalendar icalendar = CalendarHelper.parse(context, calendar.getFile(context));
VEvent event = icalendar.getEvents().get(0);
List<VEvent> events = icalendar.getEvents();
if (events == null || events.size() == 0)
return null;
VEvent event = events.get(0);
int status = CalendarContract.Events.STATUS_TENTATIVE;
if (event.getStatus() != null &&
Status.CONFIRMED.equals(event.getStatus().getValue()))

31
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -4461,20 +4461,25 @@ public class MessageHelper {
File file = local.getFile(context);
ICalendar icalendar = CalendarHelper.parse(context, file);
Method method = icalendar.getMethod();
VEvent event = icalendar.getEvents().get(0);
List<VEvent> events = icalendar.getEvents();
if (events == null || events.size() == 0)
EntityLog.log(context, "No events");
else {
VEvent event = events.get(0);
// https://www.rfc-editor.org/rfc/rfc5546#section-3.2
if (method != null && method.isCancel())
CalendarHelper.delete(context, event, message);
else if (method == null || method.isRequest()) {
if (ical_tentative)
CalendarHelper.insert(context, icalendar, event,
CalendarContract.Events.STATUS_TENTATIVE, account, message);
else
EntityLog.log(context, "Tentative event not stored");
} else
EntityLog.log(context, "Unknown event method=" + method.getValue());
// https://www.rfc-editor.org/rfc/rfc5546#section-3.2
Method method = icalendar.getMethod();
if (method != null && method.isCancel())
CalendarHelper.delete(context, event, message);
else if (method == null || method.isRequest()) {
if (ical_tentative)
CalendarHelper.insert(context, icalendar, event,
CalendarContract.Events.STATUS_TENTATIVE, account, message);
else
EntityLog.log(context, "Tentative event not stored");
} else
EntityLog.log(context, "Unknown event method=" + method.getValue());
}
} catch (Throwable ex) {
Log.w(ex);
db.attachment().setWarning(local.id, Log.formatThrowable(ex));