mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-06 17:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix current version sensor so it properly reports the flavor (#3104)

Browse source 
* Fix current version sensor so it properly reports the flavor

* Review comments
This commit is contained in:
Daniel Shokouhi 2022-11-28 19:11:12 -08:00 committed by GitHub
parent bd044c9be0
commit fd7a593c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/homeassistant/companion/android/sensors/AppSensorManager.kt Executable file
View file

@ -0,0 +1,9 @@
package io.homeassistant.companion.android.sensors
import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.sensors.AppSensorManagerBase
class AppSensorManager : AppSensorManagerBase() {
override fun getCurrentVersion(): String = BuildConfig.VERSION_NAME
}

1
app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
View file

@ -10,7 +10,6 @@ import android.net.wifi.WifiManager
import android.os.PowerManager import android.os.PowerManager
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.homeassistant.companion.android.BuildConfig import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.sensors.AppSensorManager
import io.homeassistant.companion.android.common.sensors.AudioSensorManager import io.homeassistant.companion.android.common.sensors.AudioSensorManager
import io.homeassistant.companion.android.common.sensors.BatterySensorManager import io.homeassistant.companion.android.common.sensors.BatterySensorManager
import io.homeassistant.companion.android.common.sensors.DNDSensorManager import io.homeassistant.companion.android.common.sensors.DNDSensorManager

7
common/src/main/java/io/homeassistant/companion/android/common/sensors/AppSensorManager.kt → common/src/main/java/io/homeassistant/companion/android/common/sensors/AppSensorManagerBase.kt
View file

@ -9,11 +9,10 @@ import android.os.Process
import android.util.Log import android.util.Log
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import io.homeassistant.companion.android.common.BuildConfig
import java.math.RoundingMode import java.math.RoundingMode
import io.homeassistant.companion.android.common.R as commonR import io.homeassistant.companion.android.common.R as commonR
class AppSensorManager : SensorManager { abstract class AppSensorManagerBase : SensorManager {
companion object { companion object {
private const val TAG = "AppSensor" private const val TAG = "AppSensor"
private const val GB = 1000000000 private const val GB = 1000000000
@ -137,12 +136,14 @@ class AppSensorManager : SensorManager {
} }
} }
abstract fun getCurrentVersion(): String
private fun updateCurrentVersion(context: Context) { private fun updateCurrentVersion(context: Context) {
if (!isEnabled(context, currentVersion.id)) if (!isEnabled(context, currentVersion.id))
return return
val state = BuildConfig.VERSION_NAME val state = getCurrentVersion()
onSensorUpdated( onSensorUpdated(
context, context,

9
wear/src/main/java/io/homeassistant/companion/android/sensors/AppSensorManager.kt Executable file
View file

@ -0,0 +1,9 @@
package io.homeassistant.companion.android.sensors
import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.sensors.AppSensorManagerBase
class AppSensorManager : AppSensorManagerBase() {
override fun getCurrentVersion(): String = BuildConfig.VERSION_NAME
}

1
wear/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
View file

@ -10,7 +10,6 @@ import android.os.Build
import android.os.PowerManager import android.os.PowerManager
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.homeassistant.companion.android.BuildConfig import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.sensors.AppSensorManager
import io.homeassistant.companion.android.common.sensors.AudioSensorManager import io.homeassistant.companion.android.common.sensors.AudioSensorManager
import io.homeassistant.companion.android.common.sensors.BatterySensorManager import io.homeassistant.companion.android.common.sensors.BatterySensorManager
import io.homeassistant.companion.android.common.sensors.DNDSensorManager import io.homeassistant.companion.android.common.sensors.DNDSensorManager