From 9179b2f51eb91fa9a9fc6268c840d61be582d5cc Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Thu, 4 Mar 2021 13:07:59 +0100 Subject: [PATCH] Wasp-OS: Fix crash on Android<8 Fixes #2216 --- .../service/devices/waspos/WaspOSDeviceSupport.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java index 39fbde24f..86ea7e2f4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/waspos/WaspOSDeviceSupport.java @@ -20,6 +20,7 @@ import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCharacteristic; import android.content.Context; import android.net.Uri; +import android.text.format.DateFormat; import android.widget.Toast; import org.json.JSONArray; @@ -30,11 +31,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Calendar; -import java.util.SimpleTimeZone; import java.util.UUID; import nodomain.freeyourgadget.gadgetbridge.GBApplication; @@ -241,10 +239,9 @@ public class WaspOSDeviceSupport extends AbstractBTLEDeviceSupport { void setTime(TransactionBuilder builder) { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("(yyyy, MM, dd, HH, mm, ss)"); - LocalDateTime now = LocalDateTime.now(); - String cmd = "\u0010watch.rtc.set_localtime("+dtf.format(now)+")\n"; - uartTx(builder, cmd+"\n"); + CharSequence formattedDate = DateFormat.format("(yyyy, MM, dd, HH, mm, ss)", new java.util.Date()); + String cmd = "\u0010watch.rtc.set_localtime(" + formattedDate + ")\n"; + uartTx(builder, cmd + "\n"); } @Override