From 8dceaad8eaed4599590779634c3830c62d9a2784 Mon Sep 17 00:00:00 2001 From: fynngodau Date: Sat, 17 Apr 2021 13:20:30 +0200 Subject: [PATCH] Fix date format being used incorrectly (#1443) fixes #1441 --- .../org/microg/gms/nearby/core/ui/DotChartView.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/DotChartView.kt b/play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/DotChartView.kt index 76e5590d..e08a02a5 100644 --- a/play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/DotChartView.kt +++ b/play-services-nearby-core-ui/src/main/kotlin/org/microg/gms/nearby/core/ui/DotChartView.kt @@ -10,14 +10,12 @@ import android.annotation.TargetApi import android.content.Context import android.graphics.* import android.os.Build -import android.provider.Settings -import android.text.TextUtils +import android.text.format.DateFormat import android.util.AttributeSet import android.view.MotionEvent import android.view.View import org.microg.gms.nearby.exposurenotification.ExposureScanSummary import org.microg.gms.ui.resolveColor -import java.text.SimpleDateFormat import java.util.* import kotlin.math.max import kotlin.math.min @@ -38,12 +36,7 @@ class DotChartView : View { val now = System.currentTimeMillis() val min = now - 14 * 24 * 60 * 60 * 1000L val date = Date(min) - val format = Settings.System.getString(context.contentResolver, Settings.System.DATE_FORMAT); - val dateFormat = if (TextUtils.isEmpty(format)) { - android.text.format.DateFormat.getMediumDateFormat(context) - } else { - SimpleDateFormat(format) - } + val dateFormat = DateFormat.getMediumDateFormat(context) val lowest = dateFormat.parse(dateFormat.format(date))?.time ?: date.time for (day in 0 until 15) { date.time = now - (14 - day) * 24 * 60 * 60 * 1000L