Don't include batt in location message if extended data is not set

Fixes #741
owntracks · Aug 2, 2023 · d352f8c · d352f8c
1 parent 01e48e1
commit d352f8c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - Both cloud and local backup should work now
 - Config export actually exports to a local file now, rather than just a somewhat useless "share"
 - `conn` value correctly filled out as `o` (offline) when there's no network connection (#1442)
+- `batt` is ommitted from locations if extended data is disabled (#741)
 
 ## Version 2.4.10
 

diff --git a/project/app/src/main/java/org/owntracks/android/model/messages/MessageLocation.kt b/project/app/src/main/java/org/owntracks/android/model/messages/MessageLocation.kt
@@ -33,7 +33,7 @@ open class MessageLocation(private val dep: MessageWithCreatedAt = MessageCreate
     var trigger: String? = null
 
     @JsonProperty("batt")
-    var battery = 0
+    var battery: Int? = null
 
     @JsonProperty("bs")
     var batteryStatus: BatteryStatus? = null

diff --git a/project/app/src/main/java/org/owntracks/android/support/DeviceMetricsProvider.kt b/project/app/src/main/java/org/owntracks/android/support/DeviceMetricsProvider.kt
@@ -15,11 +15,11 @@ import timber.log.Timber
 
 @Singleton
 class DeviceMetricsProvider @Inject internal constructor(@ApplicationContext private val context: Context) {
-    val batteryLevel: Int
+    val batteryLevel: Int?
         get() {
-            val intentFilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-            val batteryStatus = context.registerReceiver(null, intentFilter)
-            return batteryStatus?.getIntExtra(BatteryManager.EXTRA_LEVEL, 0) ?: 0
+            return context
+                .registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+                ?.getIntExtra(BatteryManager.EXTRA_LEVEL, 0)
         }
     val batteryStatus: BatteryStatus
         get() {

diff --git a/project/app/src/main/res/values/strings.xml b/project/app/src/main/res/values/strings.xml
@@ -215,7 +215,7 @@ To allow this, please enable Location in the device settings."</string>
     <string name="preferencesPortValidationError">"Port must be a number between 1 and 65535"</string>
     <string name="preferencesProfileId">"Mode"</string>
     <string name="preferencesPubExtendedData">"Extended data"</string>
-    <string name="preferencesPubExtendedDataSummary">"Include extended data in location reports"</string>
+    <string name="preferencesPubExtendedDataSummary">"Include battery status, connection type and monitoring mode in location reports"</string>
     <string name="preferencesRemoteCommand">"Remote commands"</string>
     <string name="preferencesRemoteCommandSummary">"Enable remote commands"</string>
     <string name="preferencesRemoteConfiguration">"Remote configuration"</string>

diff --git a/project/app/src/test/java/org/owntracks/android/support/ParserTest.kt b/project/app/src/test/java/org/owntracks/android/support/ParserTest.kt
@@ -110,7 +110,6 @@ class ParserTest {
               "_type" : "location",
               "acc" : 10,
               "alt" : 20,
-              "batt" : 0,
               "created_at" : 25,
               "inregions" : [ "Testregion1", "Testregion2" ],
               "lat" : 50.1,
@@ -157,7 +156,7 @@ class ParserTest {
         assertEquals("s5", message.trackerId)
         assertEquals(1600, message.accuracy.toLong())
         assertEquals(0.0, message.altitude.toDouble(), 0.0)
-        assertEquals(99, message.battery.toLong())
+        assertEquals(99, message.battery)
         assertEquals(BatteryStatus.FULL, message.batteryStatus)
         assertEquals("w", message.conn)
         assertEquals(52.3153748, message.latitude, 0.0)
@@ -422,7 +421,7 @@ class ParserTest {
         assertEquals("s5", messageLocation.trackerId)
         assertEquals(1600, messageLocation.accuracy.toLong())
         assertEquals(0.0, messageLocation.altitude.toDouble(), 0.0)
-        assertEquals(99, messageLocation.battery.toLong())
+        assertEquals(99, messageLocation.battery)
         assertEquals("w", messageLocation.conn)
         assertEquals(52.3153748, messageLocation.latitude, 0.0)
         assertEquals(5.0408462, messageLocation.longitude, 0.0)