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

Consider events without method as tentative

This commit is contained in:
M66B 2021-05-16 14:39:09 +02:00
parent adf130df6b
commit c5bb884473
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -2716,7 +2716,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return; return;
if (icalendar == null || if (icalendar == null ||
icalendar.getMethod() == null ||
icalendar.getEvents().size() == 0) { icalendar.getEvents().size() == 0) {
clearCalendar(); clearCalendar();
grpCalendar.setVisibility(View.GONE); grpCalendar.setVisibility(View.GONE);
@ -2780,7 +2779,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvAttendees.setVisibility(attendee.size() == 0 ? View.GONE : View.VISIBLE); tvAttendees.setVisibility(attendee.size() == 0 ? View.GONE : View.VISIBLE);
boolean canRespond = boolean canRespond =
(icalendar.getMethod().isRequest() && (icalendar.getMethod() != null &&
icalendar.getMethod().isRequest() &&
organizer != null && organizer.getEmail() != null && organizer != null && organizer.getEmail() != null &&
message.to != null && message.to.length > 0); message.to != null && message.to.length > 0);
grpCalendarResponse.setVisibility(canRespond ? View.VISIBLE : View.GONE); grpCalendarResponse.setVisibility(canRespond ? View.VISIBLE : View.GONE);
@ -2839,7 +2839,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
int status; int status;
if (icalendar.getMethod().isRequest()) if (icalendar.getMethod() == null)
status = CalendarContract.Events.STATUS_TENTATIVE;
else if (icalendar.getMethod().isRequest())
status = CalendarContract.Events.STATUS_TENTATIVE; status = CalendarContract.Events.STATUS_TENTATIVE;
else if (icalendar.getMethod().isCancel()) else if (icalendar.getMethod().isCancel())
status = CalendarContract.Events.STATUS_CANCELED; status = CalendarContract.Events.STATUS_CANCELED;