diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java index 21e6f3517..5b2d758c5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java @@ -50,7 +50,7 @@ import org.jackhuang.hmcl.util.platform.windows.WinConstants; import java.net.URI; import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.util.Arrays; import java.util.Locale; import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig; @@ -63,18 +63,27 @@ public final class AccountListPage extends DecoratorAnimatedPage implements Deco static final BooleanProperty RESTRICTED = new SimpleBooleanProperty(true); private static boolean isExemptedRegion() { - if ("Asia/Shanghai".equals(ZoneId.systemDefault().getId())) + String zoneId = ZoneId.systemDefault().getId(); + if (Arrays.asList( + "Asia/Shanghai", + // Although Asia/Beijing is not a legal name, Deepin uses it + "Asia/Beijing", + "Asia/Chongqing", + "Asia/Chungking", + "Asia/Harbin" + ).contains(zoneId)) return true; - if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS - && NativeUtils.USE_JNA - && ZonedDateTime.now().getOffset().getTotalSeconds() == 8 * 3600) { // GMT+8 + if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && NativeUtils.USE_JNA) { Kernel32 kernel32 = Kernel32.INSTANCE; // https://learn.microsoft.com/windows/win32/intl/table-of-geographical-locations - if (kernel32 != null && kernel32.GetUserGeoID(WinConstants.GEOCLASS_NATION) == 45) + if (kernel32 != null && kernel32.GetUserGeoID(WinConstants.GEOCLASS_NATION) == 45) // China return true; - } + } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && "GMT+08:00".equals(zoneId)) + // Some Linux distributions may use invalid time zone ids (e.g., Asia/Beijing) + // Java may not be able to resolve this name and use GMT+08:00 instead. + return true; return false; }