From d1ee12fafc819af11cc3552ce080322a68df5655 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 29 Mar 2020 23:52:24 +0200 Subject: [PATCH] replace deprecated calls --- .../plugins/configBuilder/PluginStore.kt | 1 + .../general/tidepool/TidepoolPlugin.kt | 5 ++-- .../general/tidepool/comm/InfoInterceptor.kt | 24 ++++++------------- .../general/tidepool/comm/TidepoolUploader.kt | 2 +- .../tidepool/events/EventTidepoolStatus.kt | 11 --------- .../general/tidepool/utils/RateLimit.kt | 17 ++++++------- 6 files changed, 21 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt index 30014d38e3..0bce3e34eb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt @@ -190,6 +190,7 @@ class PluginStore @Inject constructor( */ private fun determineActivePlugin(pluginsInCategory: ArrayList, pluginType: PluginType): T? { + @Suppress("UNCHECKED_CAST") val activePlugin = getTheOneEnabledInArray(pluginsInCategory, pluginType) as T? if (activePlugin != null) { setFragmentVisiblities((activePlugin as PluginBase).name, pluginsInCategory, pluginType) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt index ce535e41fd..e21f67957d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt @@ -50,7 +50,8 @@ class TidepoolPlugin @Inject constructor( private val fabricPrivacy: FabricPrivacy, private val tidepoolUploader: TidepoolUploader, private val uploadChunk: UploadChunk, - private val sp: SP + private val sp: SP, + private val rateLimit: RateLimit ) : PluginBase(PluginDescription() .mainType(PluginType.GENERAL) .pluginName(R.string.tidepool) @@ -103,7 +104,7 @@ class TidepoolPlugin @Inject constructor( if (isEnabled(PluginType.GENERAL) && (!sp.getBoolean(R.string.key_tidepool_only_while_charging, false) || ChargingStateReceiver.isCharging()) && (!sp.getBoolean(R.string.key_tidepool_only_while_unmetered, false) || NetworkChangeReceiver.isWifiConnected()) - && RateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt())) + && rateLimit.rateLimit("tidepool-new-data-upload", T.mins(4).secs().toInt())) doUpload() }, { fabricPrivacy.logException(it) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt index c1a9f55dc6..59268f49b0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/InfoInterceptor.kt @@ -1,32 +1,22 @@ package info.nightscout.androidaps.plugins.general.tidepool.comm -import info.nightscout.androidaps.logging.L -import info.nightscout.androidaps.logging.StacktraceLoggerWrapper +import info.nightscout.androidaps.logging.AAPSLogger +import info.nightscout.androidaps.logging.LTag import okhttp3.Interceptor import okhttp3.Response import okio.Buffer -import org.slf4j.LoggerFactory import java.io.IOException -class InfoInterceptor(tag: String) : Interceptor { - - private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL) - private var tag = "interceptor" - - init { - this.tag = tag - } +class InfoInterceptor(val tag: String = "interceptor", val aapsLogger: AAPSLogger) : Interceptor { @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val request = chain.request() request.body?.let { - if (L.isEnabled(L.TIDEPOOL)) { - log.debug("Interceptor Body size: " + it.contentLength()) - val requestBuffer = Buffer() - it.writeTo(requestBuffer) - log.debug("Interceptor Body: " + requestBuffer.readUtf8()) - } + aapsLogger.debug(LTag.TIDEPOOL, "Interceptor Body size: " + it.contentLength()) + val requestBuffer = Buffer() + it.writeTo(requestBuffer) + aapsLogger.debug(LTag.TIDEPOOL, "Interceptor Body: " + requestBuffer.readUtf8()) } return chain.proceed(request) } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt index a6d89f8971..51c16af342 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt @@ -68,7 +68,7 @@ class TidepoolUploader @Inject constructor( val client = OkHttpClient.Builder() .addInterceptor(httpLoggingInterceptor) - .addInterceptor(InfoInterceptor(TidepoolUploader::class.java.name)) + .addInterceptor(InfoInterceptor(TidepoolUploader::class.java.name, aapsLogger)) .build() retrofit = Retrofit.Builder() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt index bbb86c45b8..aff358ba08 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/events/EventTidepoolStatus.kt @@ -1,23 +1,13 @@ package info.nightscout.androidaps.plugins.general.tidepool.events import info.nightscout.androidaps.events.Event -import info.nightscout.androidaps.logging.L -import info.nightscout.androidaps.logging.StacktraceLoggerWrapper import info.nightscout.androidaps.utils.DateUtil -import org.slf4j.LoggerFactory import java.text.SimpleDateFormat import java.util.* class EventTidepoolStatus(val status: String) : Event() { - private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL) - var date: Long = DateUtil.now() - init { - if (L.isEnabled(L.TIDEPOOL)) - log.debug("New status: $status") - } - private var timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault()) fun toPreparedHtml(): StringBuilder { @@ -29,5 +19,4 @@ class EventTidepoolStatus(val status: String) : Event() { stringBuilder.append("
") return stringBuilder } - } \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt index 6f23a3f9c1..9e48d0b90f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/utils/RateLimit.kt @@ -1,26 +1,27 @@ package info.nightscout.androidaps.plugins.general.tidepool.utils -import info.nightscout.androidaps.logging.L -import info.nightscout.androidaps.logging.StacktraceLoggerWrapper +import info.nightscout.androidaps.logging.AAPSLogger +import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.T -import org.slf4j.LoggerFactory import java.util.* +import javax.inject.Inject +import javax.inject.Singleton -object RateLimit { +@Singleton +class RateLimit @Inject constructor( + val aapsLogger: AAPSLogger +) { private val rateLimits = HashMap() - private val log = StacktraceLoggerWrapper.getLogger(L.TIDEPOOL) - // return true if below rate limit @Synchronized fun rateLimit(name: String, seconds: Int): Boolean { // check if over limit rateLimits[name]?.let { if (DateUtil.now() - it < T.secs(seconds.toLong()).msecs()) { - if (L.isEnabled(L.TIDEPOOL)) - log.debug("$name rate limited: $seconds seconds") + aapsLogger.debug(LTag.TIDEPOOL, "$name rate limited: $seconds seconds") return false } }