From 43eb6bfe0ef81f064cfb227326f1bf07a3dac05e Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Fri, 9 Sep 2022 20:23:02 +0200
Subject: [PATCH] remove AndroidThreeTen library, since we have java8 in this
 branch

---
 app/build.gradle                                         | 4 ----
 .../freeyourgadget/gadgetbridge/GBApplication.java       | 5 -----
 .../service/devices/huami/Huami2021Weather.java          | 4 ++--
 .../gadgetbridge/service/devices/huami/HuamiSupport.java | 9 +++++----
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d8983358..ffb9fc6e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -262,10 +262,6 @@ dependencies {
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.android.volley:volley:1.2.1'
 
-    // JSR-310 timezones backport for Android, since we're still on java 7
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.0'
-    testImplementation 'org.threeten:threetenbp:1.6.0'
-
     // Android SDK bundles org.json, but we need an actual implementation to replace the stubs in tests
     testImplementation 'org.json:json:20180813'
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index d258f40d2..9e9d31e4c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -101,8 +101,6 @@ import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_ID_ERROR
 
 import androidx.multidex.MultiDex;
 
-import com.jakewharton.threetenabp.AndroidThreeTen;
-
 /**
  * Main Application class that initializes and provides access to certain things like
  * logging and DB access.
@@ -194,9 +192,6 @@ public class GBApplication extends Application {
             return;
         }
 
-        // Initialize the timezones library
-        AndroidThreeTen.init(this);
-
         sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         prefs = new Prefs(sharedPrefs);
         gbPrefs = new GBPrefs(prefs);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java
index 54dabfe0e..e0b1c6dc7 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java
@@ -30,11 +30,11 @@ import net.e175.klaus.solarpositioning.SPA;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.format.DateTimeFormatter;
 
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index bc587e67f..ac7dbf8ca 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -39,16 +39,17 @@ import net.e175.klaus.solarpositioning.SPA;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.threeten.bp.Instant;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.zone.ZoneOffsetTransition;
-import org.threeten.bp.zone.ZoneRules;
+
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.zone.ZoneOffsetTransition;
+import java.time.zone.ZoneRules;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;