1
0
mirror of https://github.com/etesync/android synced 2025-05-12 03:48:48 +00:00

Merge pull request #473 from Springuin/master

Time zone guessing improved, fixes 'Assuming time zone Etc/GMT for Etc/G...
This commit is contained in:
rfc2822 2015-03-29 14:44:25 +02:00
commit 7d5ed0bd11

View File

@ -349,14 +349,27 @@ public class Event extends Resource {
return;
String localTZ = Time.TIMEZONE_UTC;
boolean foundMatch = false;
String availableTZs[] = SimpleTimeZone.getAvailableIDs();
for (String availableTZ : availableTZs)
// Try to find an exact match
for (String availableTZ : availableTZs) {
if (tzID.equals(availableTZ)) {
localTZ = availableTZ;
foundMatch = true;
break;
}
}
if (!foundMatch) {
// Try to find something else that matches
for (String availableTZ : availableTZs) {
if (tzID.indexOf(availableTZ, 0) != -1) {
localTZ = availableTZ;
break;
}
}
}
Log.d(TAG, "Assuming time zone " + localTZ + " for " + tzID);
date.setTimeZone(tzRegistry.getTimeZone(localTZ));
}