fix(power): Fix battery state / charge devices info.

[l-const]

Fixes #561.

Changes:

Before:

After:

Wrongfully using upower.on_battery (https://upower.freedesktop.org/docs/UPower.html) property instead of upower.device.state (https://upower.freedesktop.org/docs/Device.html) . The first one indicates whether it is a PC or laptop not if it is charging. The sibling properties of the object is LidIsClose :

I also found what KDE and lxqt is doing and what is using to derive this info:

1. Wrong tooltip and left click info in pending-charge state lxqt/lxqt-powermanagement#295 (comment)
2. https://github.com/KDE/solid/blob/master/src/solid/devices/frontend/battery.h#L201-L208 ( main KDE librarry abstration used for both)
3. An unrelated issue about the icon and this exact info into the main upower repo: https://gitlab.freedesktop.org/upower/upower/-/merge_requests/20
4. Actual, implementation : https://gitlab.freedesktop.org/upower/upower/-/blob/master/src/linux/up-device-idevice.c?ref_type=heads#L285-294

Note: LQXT seems to have more complicated logic with the icons used, but nevertheless you can see what they use here to pick the right .svg: https://github.com/lxqt/lxqt-powermanagement/blob/master/src/iconproducer.cpp#L292-L300

    switch (state)
    {
    case Solid::Battery::FullyCharged:
        svg.replace(QL1S("STATE_MARKER"), star);
        break;
    case Solid::Battery::Charging:
        svg.replace(QL1S("STATE_MARKER"), plus);
        break;
    case Solid::Battery::Discharging:
        svg.replace(QL1S("STATE_MARKER"), minus);
        break;
    default:
        svg.replace(QL1S("STATE_MARKER"), QString{});
    }

Sending the dbus message from terminal:

❯ dbus-send --print-reply             --system             --dest=org.freedesktop.UPower             /org/freedesktop/UPower/devices/battery_hidpp_battery_0     
        org.freedesktop.DBus.Properties.GetAll             string:org.freedesktop.UPower.Device | grep -C 2 "State"
      )
      dict entry(
         string "State"
         variant             uint32 2
      )

~
❯

2 -> Discharging

Caveat:

I only have a workstation , so I can't test the battery-applet (it doesn't show at all, but if there is a bug that there is it is hard to notice as i expect for laptop users to who only is visible to not show as charged and they might not notice that this is not changing when plugging it on power, or it might work because it is the main device?!!) that I believe is also wrong here:

https://github.com/pop-os/cosmic-applets/blob/master/cosmic-applet-battery/src/app.rs#L104-L127

I did test the on_battery example of the upower_dbus crate where is showing for my workstation that is false -> that would be interpreted that my workstation /desktop PC was charging with the current code!!!:

Edit: Found gnome-shell's implementation here: https://github.com/GNOME/gnome-shell/blob/d60bdc95faf3607ec579558074cf1ca919db041a/js/ui/status/system.js#L19-L85

Like i said for the system battery (not peripherals) they use the DisplayDevice (an alias object for the system) and the Upower.device.state interface/property

const BUS_NAME = 'org.freedesktop.UPower';
const OBJECT_PATH = '/org/freedesktop/UPower/devices/DisplayDevice';

const DisplayDeviceInterface = loadInterfaceXML('org.freedesktop.UPower.Device');
const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(DisplayDeviceInterface);

................
...............


 // The icons
        let chargingState = this._proxy.State === UPower.DeviceState.CHARGING
            ? '-charging' : '';
        let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10);
        const charged =
            this._proxy.State === UPower.DeviceState.FULLY_CHARGED ||
            (this._proxy.State === UPower.DeviceState.CHARGING && fillLevel === 100);
        const icon = charged
            ? 'battery-level-100-charged-symbolic'
            : `battery-level-${fillLevel}${chargingState}-symbolic`;

[mmstick]

Thanks!