replace threetenabp and threetenbp with built-in desugaring mechanism…

… so java.time is usable now even when the API level is below 24; reduce lint warnings
mathisdt · Apr 3, 2022 · 884cabb · 884cabb
1 parent 9117d28
commit 884cabb
Show file tree

Hide file tree

Showing 44 changed files with 167 additions and 162 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,6 +12,7 @@ android {
     compileSdkVersion 31
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -82,9 +83,9 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'net.sf.supercsv:super-csv:2.4.0'
     implementation 'org.tinylog:tinylog:1.3.6'
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.0'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.google.truth:truth:1.1.3'
-    testImplementation 'org.threeten:threetenbp:1.6.0'
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
diff --git a/app/lint.xml b/app/lint.xml
@@ -1,3 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lint>
+    <issue id="Deprecated" severity="informational" />
+    <issue id="LongLogTag" severity="ignore" />
+    <issue id="InvalidResourceFolder" severity="ignore" />
+    <issue id="ApplySharedPref" severity="ignore" />
 </lint>
diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/Basics.java b/app/src/main/java/org/zephyrsoft/trackworktime/Basics.java
@@ -49,9 +49,6 @@
 import org.pmw.tinylog.policies.DailyPolicy;
 import org.pmw.tinylog.writers.LogcatWriter;
 import org.pmw.tinylog.writers.RollingFileWriter;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.ZoneId;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.location.CoordinateUtil;
 import org.zephyrsoft.trackworktime.location.LocationCallback;
@@ -66,6 +63,9 @@
 import org.zephyrsoft.trackworktime.util.PreferencesUtil;
 
 import java.io.File;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
@@ -90,15 +90,6 @@ public class Basics extends BroadcastReceiver {
 
     private static Basics instance = null;
 
-    /**
-     * Creates an instance of this class.
-     */
-    public Basics() {
-        if (instance == null) {
-            instance = this;
-        }
-    }
-
     /**
      * Fetches the singleton.
      */

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/DebugActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/DebugActivity.java
@@ -25,10 +25,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.ZoneId;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.ActivityDebugBinding;
 
+import java.time.ZoneId;
+
 public class DebugActivity extends AppCompatActivity {
 
     @Override

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/DocumentTreeStorage.java b/app/src/main/java/org/zephyrsoft/trackworktime/DocumentTreeStorage.java
@@ -30,7 +30,6 @@
 import androidx.documentfile.provider.DocumentFile;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
 import org.zephyrsoft.trackworktime.util.PermissionsUtil;
 
 import java.io.BufferedOutputStream;
@@ -40,6 +39,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
+import java.time.LocalDate;
 import java.util.Objects;
 
 /**

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/EventListActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/EventListActivity.java
@@ -39,8 +39,6 @@
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.ListActivityBinding;
 import org.zephyrsoft.trackworktime.databinding.ListItemBinding;
@@ -55,6 +53,8 @@
 import org.zephyrsoft.trackworktime.util.DateTimeUtil;
 import org.zephyrsoft.trackworktime.weektimes.WeekIndexConverter;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/InsertDefaultTimesActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/InsertDefaultTimesActivity.java
@@ -27,7 +27,6 @@
 import androidx.core.util.Consumer;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.DefaultTimesBinding;
 import org.zephyrsoft.trackworktime.model.Target;
@@ -38,6 +37,7 @@
 import org.zephyrsoft.trackworktime.ui.DateTextViewController;
 import org.zephyrsoft.trackworktime.ui.TargetTimeValidityCheck;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/OptionsActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/OptionsActivity.java
@@ -16,6 +16,7 @@
 package org.zephyrsoft.trackworktime;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
@@ -31,7 +32,6 @@
 import androidx.preference.PreferenceFragmentCompat;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
 import org.zephyrsoft.trackworktime.backup.WorkTimeTrackerBackupManager;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.options.CheckIntervalPreference;
@@ -47,6 +47,7 @@
 import org.zephyrsoft.trackworktime.util.PreferencesUtil;
 
 import java.text.DateFormat;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -203,6 +204,7 @@ && getActivity() != null) {
             }
         }
 
+        @SuppressLint("deprecation")
         @Override
         public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
             if (requestCode == Constants.MISSING_PRIVILEGE_ACCESS_LOCATION_ID) {

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/ReportsActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/ReportsActivity.java
@@ -33,7 +33,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.ZonedDateTime;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.ReportsBinding;
 import org.zephyrsoft.trackworktime.model.Event;
@@ -51,6 +50,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/ShortcutReceiver.java b/app/src/main/java/org/zephyrsoft/trackworktime/ShortcutReceiver.java
@@ -19,10 +19,11 @@
 import android.os.Bundle;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.OffsetDateTime;
 import org.zephyrsoft.trackworktime.model.TypeEnum;
 import org.zephyrsoft.trackworktime.timer.TimerManager;
 
+import java.time.OffsetDateTime;
+
 /**
  * This technically is an activity but it only receives intents from shortcuts
  * and the directly exits again. No UI is ever shown.

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/TargetEditActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/TargetEditActivity.java
@@ -35,15 +35,15 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.format.DateTimeFormatter;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.TargetBinding;
 import org.zephyrsoft.trackworktime.model.Target;
 import org.zephyrsoft.trackworktime.model.TargetEnum;
 import org.zephyrsoft.trackworktime.timer.TimerManager;
 import org.zephyrsoft.trackworktime.util.DateTimeUtil;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
 /**

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/ThirdPartyReceiver.java b/app/src/main/java/org/zephyrsoft/trackworktime/ThirdPartyReceiver.java
@@ -21,12 +21,13 @@
 import android.os.Bundle;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.OffsetDateTime;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.model.Task;
 import org.zephyrsoft.trackworktime.model.TypeEnum;
 import org.zephyrsoft.trackworktime.timer.TimerManager;
 
+import java.time.OffsetDateTime;
+
 /**
  * Hook for clock-in with third-party apps like Tasker or Llama.
  * Also handles actions triggered directly from the notification and from the widget of TWT.

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/Widget.java b/app/src/main/java/org/zephyrsoft/trackworktime/Widget.java
@@ -30,11 +30,12 @@
 import androidx.core.content.ContextCompat;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
 import org.zephyrsoft.trackworktime.model.PeriodEnum;
 import org.zephyrsoft.trackworktime.timer.TimerManager;
 import org.zephyrsoft.trackworktime.util.DateTimeUtil;
 
+import java.time.LocalDate;
+
 public class Widget extends AppWidgetProvider {
 
     private static final String ACTION_UPDATE = BuildConfig.APPLICATION_ID + ".WIDGET_UPDATE";

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerActivity.java
@@ -59,8 +59,6 @@
 import com.google.android.material.navigation.NavigationView;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.DayOfWeek;
-import org.threeten.bp.LocalDate;
 import org.zephyrsoft.trackworktime.backup.BackupFileInfo;
 import org.zephyrsoft.trackworktime.database.DAO;
 import org.zephyrsoft.trackworktime.databinding.ActivityMainBinding;
@@ -85,6 +83,8 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
 

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerApplication.java b/app/src/main/java/org/zephyrsoft/trackworktime/WorkTimeTrackerApplication.java
@@ -40,8 +40,6 @@
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkManager;
 
-import com.jakewharton.threetenabp.AndroidThreeTen;
-
 import org.acra.ACRA;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.DialogConfigurationBuilder;
@@ -62,8 +60,6 @@ public class WorkTimeTrackerApplication extends Application {
 	public void onCreate() {
 		Logger.info("creating application");
 
-		AndroidThreeTen.init(this);
-
 		NotificationChannel notificationChannel = null;
 		NotificationChannel serviceNotificationChannel = null;
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/database/DAO.java b/app/src/main/java/org/zephyrsoft/trackworktime/database/DAO.java
@@ -54,21 +54,6 @@
 import androidx.annotation.VisibleForTesting;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.Instant;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.LocalTime;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZoneOffset;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.chrono.IsoChronology;
-import org.threeten.bp.format.DateTimeFormatter;
-import org.threeten.bp.format.DateTimeFormatterBuilder;
-import org.threeten.bp.format.ResolverStyle;
-import org.threeten.bp.temporal.ChronoField;
-import org.threeten.bp.temporal.ChronoUnit;
-import org.threeten.bp.temporal.TemporalAccessor;
 import org.zephyrsoft.trackworktime.Basics;
 import org.zephyrsoft.trackworktime.UpgradeActivity;
 import org.zephyrsoft.trackworktime.backup.WorkTimeTrackerBackupManager;
@@ -86,6 +71,21 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.ref.WeakReference;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.chrono.IsoChronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/editevent/EventEditActivity.java b/app/src/main/java/org/zephyrsoft/trackworktime/editevent/EventEditActivity.java
@@ -29,13 +29,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.LocalTime;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.temporal.ChronoUnit;
 import org.zephyrsoft.trackworktime.Basics;
 import org.zephyrsoft.trackworktime.Constants;
 import org.zephyrsoft.trackworktime.EventListActivity;
@@ -49,6 +42,13 @@
 import org.zephyrsoft.trackworktime.timer.TimerManager;
 import org.zephyrsoft.trackworktime.ui.DateTextViewController;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 /**

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/editevent/TimeTextViewController.java b/app/src/main/java/org/zephyrsoft/trackworktime/editevent/TimeTextViewController.java
@@ -25,10 +25,11 @@
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 
-import org.threeten.bp.LocalTime;
 import org.zephyrsoft.trackworktime.Basics;
 import org.zephyrsoft.trackworktime.util.DateTimeUtil;
 
+import java.time.LocalTime;
+
 public class TimeTextViewController {
 
 	private final TextView view;

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/location/WifiScanner.java b/app/src/main/java/org/zephyrsoft/trackworktime/location/WifiScanner.java
@@ -26,9 +26,9 @@
 import androidx.annotation.Nullable;
 
 import org.pmw.tinylog.Logger;
-import org.threeten.bp.LocalDateTime;
 import org.zephyrsoft.trackworktime.util.PermissionsUtil;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/model/CalcCacheEntry.java b/app/src/main/java/org/zephyrsoft/trackworktime/model/CalcCacheEntry.java
@@ -15,10 +15,10 @@
  */
 package org.zephyrsoft.trackworktime.model;
 
-import org.threeten.bp.LocalDate;
-
 import org.zephyrsoft.trackworktime.database.DAO;
 
+import java.time.LocalDate;
+
 /**
  * Data class for an event.
  *

diff --git a/app/src/main/java/org/zephyrsoft/trackworktime/model/Event.java b/app/src/main/java/org/zephyrsoft/trackworktime/model/Event.java
@@ -15,9 +15,10 @@
  */
 package org.zephyrsoft.trackworktime.model;
 
-import org.threeten.bp.OffsetDateTime;
 import org.zephyrsoft.trackworktime.database.DAO;
 
+import java.time.OffsetDateTime;
+
 /**
  * Data class for an event.
  *