service/upower: correctly deserialize UPowerDeviceState::Discharging

outfoxxed · outfoxxed · commit eaf854935b0d · 2025-01-04T03:37:53.000-08:00
???
diff --git a/src/services/upower/device.cpp b/src/services/upower/device.cpp
@@ -114,9 +114,7 @@ DBusResult<qreal> DBusDataTransform<PowerPercentage>::fromWire(qreal wire) {
 
 DBusResult<UPowerDeviceState::Enum>
 DBusDataTransform<UPowerDeviceState::Enum>::fromWire(quint32 wire) {
-	if (wire != UPowerDeviceType::Battery && wire >= UPowerDeviceState::Unknown
-	    && wire <= UPowerDeviceState::PendingDischarge)
-	{
+	if (wire >= UPowerDeviceState::Unknown && wire <= UPowerDeviceState::PendingDischarge) {
 		return DBusResult(static_cast<UPowerDeviceState::Enum>(wire));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,7 @@ DBusResult<qreal> DBusDataTransform<PowerPercentage>::fromWire(qreal wire) {`
`114`	`114`
`115`	`115`	`DBusResult<UPowerDeviceState::Enum>`
`116`	`116`	`DBusDataTransform<UPowerDeviceState::Enum>::fromWire(quint32 wire) {`
`117`		`- if (wire != UPowerDeviceType::Battery && wire >= UPowerDeviceState::Unknown`
`118`		`- && wire <= UPowerDeviceState::PendingDischarge)`
`119`		`- {`
	`117`	`+ if (wire >= UPowerDeviceState::Unknown && wire <= UPowerDeviceState::PendingDischarge) {`
`120`	`118`	`return DBusResult(static_cast<UPowerDeviceState::Enum>(wire));`
`121`	`119`	`}`
`122`	`120`