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

Fixed selecting calendars

This commit is contained in:
M66B 2022-11-03 14:36:02 +01:00
parent 9360763110
commit 8b5fd03117
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
View File

@ -70,10 +70,11 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
CalendarContract.Calendars.VISIBLE,
CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
},
CalendarContract.Calendars.VISIBLE + " = 1 AND " +
CalendarContract.Calendars.IS_PRIMARY + " = 1",
CalendarContract.Calendars.VISIBLE + " <> 0",
null,
CalendarContract.Calendars.ACCOUNT_NAME)) {
CalendarContract.Calendars.ACCOUNT_NAME + "," +
CalendarContract.Calendars.CALENDAR_DISPLAY_NAME
)) {
int colId = cursor.getColumnIndexOrThrow(CalendarContract.Calendars._ID);
int colAccount = cursor.getColumnIndexOrThrow(CalendarContract.Calendars.ACCOUNT_NAME);
@ -155,11 +156,11 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
String getTitle() {
return (this.visible ? "" : "(") +
(TextUtils.isEmpty(this.name) ? "" : this.name + ":") +
(this.account == null ? "-" : this.account) +
(BuildConfig.DEBUG && false ? ":" + (this.type == null ? "-" : this.type) : "") +
(TextUtils.isEmpty(this.name) ? "" : ":" + this.name) +
(this.visible ? "" : ")") +
" " + (this.primary && BuildConfig.DEBUG && false ? "*" : "");
" " + (this.primary ? "*" : "");
}
}
}

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

@ -3960,8 +3960,7 @@ public class MessageHelper {
try (Cursor cursor = resolver.query(CalendarContract.Calendars.CONTENT_URI,
new String[]{CalendarContract.Calendars._ID},
CalendarContract.Calendars.VISIBLE + " = 1 AND " +
CalendarContract.Calendars.IS_PRIMARY + " = 1 AND " +
CalendarContract.Calendars.VISIBLE + " <> 0 AND " +
CalendarContract.Calendars.ACCOUNT_NAME + " = ?" +
(selectedName == null
? ""