diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java index 18e7a63aac..b4cc090398 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/Widget.java @@ -160,10 +160,10 @@ public class Widget extends AppWidgetProvider { views.setViewVisibility(R.id.todaywidget_battery_icon, View.GONE); String status = String.format("%1s", deviceForWidget.getStateString(context)); if (deviceForWidget.isConnected()) { - if (deviceForWidget.getBatteryLevel() > 1) { + if (deviceForWidget.getBatteryLevel(0) > 1) { views.setViewVisibility(R.id.todaywidget_battery_icon, View.VISIBLE); - status = String.format("%1s%%", deviceForWidget.getBatteryLevel()); + status = String.format("%1s%%", deviceForWidget.getBatteryLevel(0)); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java index 2dbb474ec5..483088e6a3 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/supercars/ControlActivity.java @@ -178,7 +178,7 @@ public class ControlActivity extends AbstractGBActivity implements JoystickView. } private void setBatteryLabel() { - String level = device.getBatteryLevel() > 0 ? String.format("%1s%%", device.getBatteryLevel()) : device.getName(); + String level = device.getBatteryLevel(0) > 0 ? String.format("%1s%%", device.getBatteryLevel(0)) : device.getName(); batteryPercentage.setText(level); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java index 7887b0d543..4b9e850ae0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusHandlerThread.java @@ -427,7 +427,7 @@ class HPlusHandlerThread extends GBDeviceIoThread { prevRealTimeRecord = record; - getDevice().setBatteryLevel(record.battery); + getDevice().setBatteryLevel(record.battery, 0); try (DBHandler dbHandler = GBApplication.acquireDB()) { HPlusHealthSampleProvider provider = new HPlusHealthSampleProvider(getDevice(), dbHandler.getDaoSession()); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java index 8c02886546..b04e6e5206 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/AsynchronousResponse.java @@ -719,7 +719,7 @@ public class AsynchronousResponse { if (resp.multi_level == null) { byte batteryLevel = resp.level; - this.support.getDevice().setBatteryLevel(batteryLevel); + this.support.getDevice().setBatteryLevel(batteryLevel, 0); GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo(); batteryInfo.state = BatteryState.BATTERY_NORMAL; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java index 5b02312ab0..b0f41d19d0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huawei/requests/GetBatteryLevelRequest.java @@ -67,7 +67,7 @@ public class GetBatteryLevelRequest extends Request { if (response.multi_level == null) { byte batteryLevel = response.level; - getDevice().setBatteryLevel(batteryLevel); + getDevice().setBatteryLevel(batteryLevel, 0); GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo(); batteryInfo.state = BatteryState.BATTERY_NORMAL; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java index 86e70a1f38..53dbe6c4ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java @@ -454,7 +454,7 @@ public class IGPSportDeviceSupport extends AbstractBTLESingleDeviceSupport { public void handleFactoryData(byte[] data) throws InvalidProtocolBufferException { Factory.factory_msg factoryMsg = Factory.factory_msg.parseFrom(data); if (factoryMsg.hasBattaryMsg()) { - gbDevice.setBatteryLevel(factoryMsg.getBattaryMsg().getPowerPercent()); + gbDevice.setBatteryLevel(factoryMsg.getBattaryMsg().getPowerPercent(), 0); } if (factoryMsg.getFactorySnMsgList().size() > 0) { // save serial to volatile address now, need to find way to use it as identifier in database diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/marstek/MarstekB2500DeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/marstek/MarstekB2500DeviceSupport.java index f4322f9798..d6020a048f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/marstek/MarstekB2500DeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/marstek/MarstekB2500DeviceSupport.java @@ -240,7 +240,7 @@ public class MarstekB2500DeviceSupport extends AbstractBTLESingleDeviceSupport { devicePrefsEdit.apply(); devicePrefsEdit.commit(); - getDevice().setBatteryLevel(battery_pct); + getDevice().setBatteryLevel(battery_pct, 0); getDevice().sendDeviceUpdateIntent(getContext()); Intent intent = new Intent(SolarEquipmentStatusActivity.ACTION_SEND_SOLAR_EQUIPMENT_STATUS) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java index 0fdcf0c927..a32a5a16b8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java @@ -781,10 +781,10 @@ public class QHybridSupport extends QHybridBaseSupport { } case "00002a19-0000-1000-8000-00805f9b34fb": { short level = value[0]; - gbDevice.setBatteryLevel(level); + gbDevice.setBatteryLevel(level, 0); GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo(); - batteryInfo.level = gbDevice.getBatteryLevel(); + batteryInfo.level = gbDevice.getBatteryLevel(0); batteryInfo.state = BatteryState.BATTERY_NORMAL; handleGBDeviceEvent(batteryInfo); break; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java index 7ffb4a8aae..ec1abffb53 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/misfit/MisfitWatchAdapter.java @@ -164,10 +164,10 @@ public class MisfitWatchAdapter extends WatchAdapter { } case "00002a19-0000-1000-8000-00805f9b34fb": { short level = value[0]; - gbDevice.setBatteryLevel(level); + gbDevice.setBatteryLevel(level, 0); GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo(); - batteryInfo.level = gbDevice.getBatteryLevel(); + batteryInfo.level = gbDevice.getBatteryLevel(0); batteryInfo.state = BatteryState.BATTERY_NORMAL; getDeviceSupport().handleGBDeviceEvent(batteryInfo); break; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java index 1c806bf6ff..27e27f9e5c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/requests/fossil_hr/configuration/ConfigurationGetRequest.java @@ -57,8 +57,8 @@ public class ConfigurationGetRequest extends FileEncryptedLookupAndGetRequest im }else if(item instanceof ConfigurationPutRequest.TimezoneOffsetConfigItem) { device.addDeviceInfo(new GenericItem(QHybridSupport.ITEM_TIMEZONE_OFFSET, String.valueOf(((ConfigurationPutRequest.TimezoneOffsetConfigItem) item).getValue()))); }else if(item instanceof ConfigurationPutRequest.BatteryConfigItem){ - device.setBatteryLevel((short) ((ConfigurationPutRequest.BatteryConfigItem) item).getBatteryPercentage()); - device.setBatteryVoltage(((ConfigurationPutRequest.BatteryConfigItem) item).getBatteryVoltage() / 1000f); + device.setBatteryLevel((short) ((ConfigurationPutRequest.BatteryConfigItem) item).getBatteryPercentage(), 0); + device.setBatteryVoltage(((ConfigurationPutRequest.BatteryConfigItem) item).getBatteryVoltage() / 1000f, 0); GBDeviceEventBatteryInfo batteryInfo = new GBDeviceEventBatteryInfo(); batteryInfo.level = (short) ((ConfigurationPutRequest.BatteryConfigItem) item).getBatteryPercentage(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java index 7d11d4f31a..7fcfaa66a4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/roidmi/RoidmiSupport.java @@ -58,7 +58,7 @@ public class RoidmiSupport extends AbstractHeadphoneSerialDeviceSupportV2