Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-13 20:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switched to Windows timezone list

Browse Source
This commit is contained in:
M66B
2023-10-27 15:05:21 +02:00
parent 8f66c88f9b
commit 97a7dbfb56
6 changed files with 284 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/CalendarHelper.java
View File

@@ -148,22 +148,34 @@ public class CalendarHelper {
String tzid = (tz == null ? null : tz.getID());
if (tzid == null)
tzid = TimeZone.getDefault().getID();
else {
// https://github.com/GNOME/evolution-mapi/blob/master/src/libexchangemapi/tz-mapi-to-ical
try (InputStream is = context.getAssets().open("tz-mapi-to-ical.txt")) {
else
try (InputStream is = context.getAssets().open("windows_timezones.txt")) {
BufferedReader br = new BufferedReader(new InputStreamReader((is)));
String line;
while ((line = br.readLine()) != null) {
String[] info = line.split("~~~");
if (info.length == 2 && info[0].equalsIgnoreCase(tzid)) {
EntityLog.log(context, "Event map " + tzid + " to " + info[1]);
tz.setID(info[1]);
}
if (line.startsWith("#"))
continue;
String[] info = line.split(";");
if (info.length != 5)
continue;
if (!info[2].equalsIgnoreCase(tzid))
continue;
// Austria;AT;W. Europe Standard Time;(UTC+01:00);Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
String utc = info[3]
.replace("UTC", "GMT")
.replace("(", "")
.replace(")", "");
String _tzid = TimeZone.getTimeZone(utc).getID();
EntityLog.log(context, "Event map " + tzid + " to " + _tzid + " " + info[3]);
tz.setID(_tzid);
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
}
String rrule = null;
RecurrenceRule recurrence = event.getRecurrenceRule();

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

@@ -4282,14 +4282,23 @@ public class FragmentMessages extends FragmentBase
for (long id : ids) {
EntityMessage message = db.message().getMessage(id);
EntityLog.log(context, "MMM message found=" + (message != null));
if (message == null)
continue;
List<EntityMessage> messages = db.message().getMessagesByThread(
message.account, message.thread, threading ? null : id, seen ? null : message.folder);
for (EntityMessage threaded : messages)
EntityLog.log(context, "MMM ids=" + ids.length + " seen=" + seen + " threading=" + threading +
" messages=" + messages.size());
for (EntityMessage threaded : messages) {
EntityFolder folder = db.folder().getFolder(threaded.folder);
EntityLog.log(context, "MMM message folder=" + folder.type +
" seen=" + threaded.ui_seen +
" change=" + (threaded.ui_seen != seen));
if (threaded.ui_seen != seen)
EntityOperation.queue(context, threaded, EntityOperation.SEEN, seen);
}
}
db.setTransactionSuccessful();