mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 02:45:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent null values for BLE measured power, also allow negative values in case entire field is cleared out (#2158)

Browse source 
* Prevent storing null value for measured power and allow negative values

* Use actual default value

* Make variable private again
This commit is contained in:
Daniel Shokouhi 2022-01-18 13:43:39 -08:00 committed by GitHub
parent c09fa8d2a3
commit e4234ec98d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/homeassistant/companion/android/sensors/BluetoothSensorManager.kt
View file

@ -22,7 +22,7 @@ class BluetoothSensorManager : SensorManager {
private const val SETTING_BLE_TRANSMIT_POWER = "ble_transmit_power"
private const val SETTING_BLE_ADVERTISE_MODE = "ble_advertise_mode"
private const val SETTING_BLE_TRANSMIT_ENABLED = "ble_transmit_enabled"
private const val SETTING_BLE_MEASURED_POWER = "ble_measured_power_at_1m"
const val SETTING_BLE_MEASURED_POWER = "ble_measured_power_at_1m"
private const val DEFAULT_BLE_TRANSMIT_POWER = "ultraLow"
private const val DEFAULT_BLE_ADVERTISE_MODE = "lowPower"
@ -166,7 +166,7 @@ class BluetoothSensorManager : SensorManager {
val uuid = getSetting(context, bleTransmitter, SETTING_BLE_ID1, "string", UUID.randomUUID().toString())
val major = getSetting(context, bleTransmitter, SETTING_BLE_ID2, "string", DEFAULT_BLE_MAJOR)
val minor = getSetting(context, bleTransmitter, SETTING_BLE_ID3, "string", DEFAULT_BLE_MINOR)
val measuredPower = getSetting(context, bleTransmitter, SETTING_BLE_MEASURED_POWER, "number", DEFAULT_MEASURED_POWER_AT_1M).toInt()
val measuredPower = getSetting(context, bleTransmitter, SETTING_BLE_MEASURED_POWER, "number", DEFAULT_MEASURED_POWER_AT_1M).toIntOrNull() ?: DEFAULT_MEASURED_POWER_AT_1M.toInt()
val transmitPower = getSetting(context, bleTransmitter, SETTING_BLE_TRANSMIT_POWER, "list", listOf("ultraLow", "low", "medium", "high"), DEFAULT_BLE_TRANSMIT_POWER)
val advertiseMode = getSetting(context, bleTransmitter, SETTING_BLE_ADVERTISE_MODE, "list", listOf("lowPower", "balanced", "lowLatency"), DEFAULT_BLE_ADVERTISE_MODE)

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

@ -279,8 +279,13 @@ class SensorDetailFragment(
pref.isIconSpaceReserved = false
pref.setOnBindEditTextListener { fieldType ->
if (setting.valueType == "number")
fieldType.inputType = InputType.TYPE_CLASS_NUMBER
if (setting.valueType == "number") {
if (setting.name == BluetoothSensorManager.SETTING_BLE_MEASURED_POWER)
fieldType.inputType =
InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_SIGNED
else
fieldType.inputType = InputType.TYPE_CLASS_NUMBER
}
}
pref.setOnPreferenceChangeListener { _, newValue ->