diff --git a/app/src/main/java/org/traccar/client/BatteryStatus.kt b/app/src/main/java/org/traccar/client/BatteryStatus.kt index a7f0923..72fed01 100644 --- a/app/src/main/java/org/traccar/client/BatteryStatus.kt +++ b/app/src/main/java/org/traccar/client/BatteryStatus.kt @@ -17,5 +17,5 @@ package org.traccar.client data class BatteryStatus( val level: Double = 0.0, - val changing: Boolean = false, + val charging: Boolean = false, ) diff --git a/app/src/main/java/org/traccar/client/Position.kt b/app/src/main/java/org/traccar/client/Position.kt index 4847d9c..94e2974 100644 --- a/app/src/main/java/org/traccar/client/Position.kt +++ b/app/src/main/java/org/traccar/client/Position.kt @@ -49,7 +49,7 @@ data class Position( 0.0 }, battery = battery.level, - charging = battery.changing, + charging = battery.charging, mock = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { location.isMock } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { diff --git a/app/src/main/java/org/traccar/client/PositionProvider.kt b/app/src/main/java/org/traccar/client/PositionProvider.kt index c0a7587..1b84f9e 100644 --- a/app/src/main/java/org/traccar/client/PositionProvider.kt +++ b/app/src/main/java/org/traccar/client/PositionProvider.kt @@ -68,7 +68,7 @@ abstract class PositionProvider( val status = batteryIntent.getIntExtra(BatteryManager.EXTRA_STATUS, -1) return BatteryStatus( level = level * 100.0 / scale, - changing = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL, + charging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL, ) } return BatteryStatus()