From 4efeb77fdc94ba4a12bf85a932e46869b291ed42 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 1 Jun 2020 00:06:05 +0200
Subject: [PATCH] remove deprecation

---
 .../omnipod/driver/comm/AapsOmnipodManager.java    |  3 +--
 .../omnipod/driver/ui/OmnipodUIPostprocessor.java  |  3 +--
 .../java/info/nightscout/androidaps/logging/L.kt   | 14 +-------------
 .../plugins/general/nsclient/NSUpload.java         |  3 +--
 .../androidaps/utils/locale/LocaleHelper.kt        |  2 --
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 5a47672e8c..575fe385ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -95,13 +95,12 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
 
     private final OmnipodManager delegate;
 
-    @Deprecated
+    //TODO: remove and use injection
     private static AapsOmnipodManager instance;
 
     private Date lastBolusTime;
     private Double lastBolusUnits;
 
-    @Deprecated
     public static AapsOmnipodManager getInstance() {
         return instance;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
index d206337384..7a6c025433 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
@@ -7,7 +7,6 @@ import java.util.Date;
 
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
@@ -103,7 +102,7 @@ public class OmnipodUIPostprocessor {
 
 
     private boolean isLogEnabled() {
-        return L.isEnabled(LTag.PUMP);
+        return true; //L.isEnabled(LTag.PUMP);
     }
 
     public RxBusWrapper getRxBus() {
diff --git a/core/src/main/java/info/nightscout/androidaps/logging/L.kt b/core/src/main/java/info/nightscout/androidaps/logging/L.kt
index b2156c4080..ad3ca2dad4 100644
--- a/core/src/main/java/info/nightscout/androidaps/logging/L.kt
+++ b/core/src/main/java/info/nightscout/androidaps/logging/L.kt
@@ -12,19 +12,7 @@ class L @Inject constructor(
 
     private var logElements: MutableList<LogElement> = ArrayList()
 
-    companion object {
-        @Deprecated("Use Dagger")
-        lateinit var instance: L
-
-        @Deprecated("Use Dagger")
-        @JvmStatic
-        fun isEnabled(ltag: LTag): Boolean {
-            return instance.findByName(ltag.name).enabled
-        }
-    }
-
     init {
-        instance= this
         LTag.values().forEach { logElements.add(LogElement(it, sp)) }
     }
 
@@ -46,7 +34,7 @@ class L @Inject constructor(
     }
 
     class LogElement {
-        var sp : SP
+        var sp: SP
         var name: String
         var defaultValue: Boolean
         var enabled: Boolean
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index f6cd44a84b..5aab6d18b6 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -232,8 +232,7 @@ public class NSUpload {
                     deviceStatus.enacted.put("requested", requested);
                 }
             } else {
-                if (L.isEnabled(LTag.NSCLIENT))
-                    aapsLogger.debug("OpenAPS data too old to upload, sending iob only");
+                aapsLogger.debug(LTag.NSCLIENT, "OpenAPS data too old to upload, sending iob only");
                 IobTotal[] iob = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
                 if (iob.length > 0) {
                     deviceStatus.iob = iob[0].json();
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
index d7bc0a8ce5..29d53e1e53 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
@@ -38,8 +38,6 @@ object LocaleHelper {
         val configuration = resources.configuration
         context.createConfigurationContext(configuration)
         configuration.setLocale(locale)
-        configuration.locale = locale
-        resources.updateConfiguration(configuration, resources.displayMetrics)
     }
 
     fun wrap(ctx: Context): Context {