From 37d3584f776fb700f8440b0732e9085c4e540572 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 14 Aug 2022 17:02:22 -0700 Subject: [PATCH] Handle deprecation --- .../main/java/org/traccar/client/Position.kt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/traccar/client/Position.kt b/app/src/main/java/org/traccar/client/Position.kt index 9188710..5dd6c8f 100644 --- a/app/src/main/java/org/traccar/client/Position.kt +++ b/app/src/main/java/org/traccar/client/Position.kt @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,8 +42,19 @@ data class Position( altitude = location.altitude, speed = location.speed * 1.943844, // speed in knots course = location.bearing.toDouble(), - accuracy = if (location.provider != null && location.provider != LocationManager.GPS_PROVIDER) location.accuracy.toDouble() else 0.0, + accuracy = if (location.provider != null && location.provider != LocationManager.GPS_PROVIDER) { + location.accuracy.toDouble() + } else { + 0.0 + }, battery = battery, - mock = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) location.isFromMockProvider else false, + mock = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + location.isMock + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { + @Suppress("DEPRECATION") + location.isFromMockProvider + } else { + false + }, ) }