From 6d166251125e3079538b88a186b4f9bd9ac2e574 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Thu, 14 Jul 2022 09:48:12 +0200
Subject: [PATCH] Fossil Hybrid HR: Fix 2nd TZ widget offset

The 2nd TimeZone watchface widget was configured with an offset that
didn't take DST into account. This change makes it use the correct
offset.

Fixes #2761
---
 .../gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
index 2c969c226..09e1c3c7e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HybridHRWatchfaceFactory.java
@@ -30,6 +30,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.LinkedHashMap;
 import java.util.TimeZone;
 
@@ -98,7 +99,7 @@ public class HybridHRWatchfaceFactory {
                         JSONObject data = new JSONObject();
                         TimeZone tz = TimeZone.getTimeZone(widgetDesc.getExtraConfigString("tzName", null));
                         String tzShortName = widgetDesc.getExtraConfigString("tzName", null).replaceAll(".*/", "");
-                        int tzOffsetMins = tz.getRawOffset() / 1000 / 60;
+                        int tzOffsetMins = tz.getOffset(Calendar.getInstance().getTimeInMillis()) / 1000 / 60;
                         data.put("tzName", widgetDesc.getExtraConfigString("tzName", null));
                         data.put("loc", tzShortName);
                         data.put("utc", tzOffsetMins);