brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timeLimitsManager: Store screen time state on suspend/resume

Browse Source 
There are two main changes in this commit:
 * Listen to the `prepare-for-sleep` signal from `LoginManager`, which
   is emitted just before suspending and just after resuming. When the
   signal is received, update the user’s screen time state (active or
   inactive), add a transition if necessary, and save the screen time
   history if necessary.
 * Factor the `preparingForSleep` property of `LoginManager` into the
   user’s screen time state, meaning that the user will be considered
   inactive between the system going for suspend and coming back from
   resume.

The rest of the changes in the commit are boilerplate to allow for this
functionality to be unit tested.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8185
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3643>
This commit is contained in:
Philip Withnall
2025-02-19 15:54:13 +00:00
committed by Marge Bot
parent 9dd5f7a8a8
commit 6a43b6f551
2 changed files with 149 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/misc/timeLimitsManager.js
View File

@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
//
// Copyright 2024 GNOME Foundation, Inc.
// Copyright 2024, 2025 GNOME Foundation, Inc.
//
// This is a GNOME Shell component to support screen time limits and statistics.
//
@ -84,13 +84,15 @@ function userStateToString(userState) {
*
* Active/Inactive time is based off the total time the user account has spent
* logged in to at least one active session, not idle (and not locked, but
* that’s a subset of idle time).
* that’s a subset of idle time), and not suspended.
* This corresponds to the `active` state from sd_uid_get_state()
* (https://www.freedesktop.org/software/systemd/man/latest/sd_uid_get_state.html),
* plus `IdleHint` from
* https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.login1.html#User%20Objects.
* https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.login1.html#User%20Objects,
* plus `PreparingForSleep` from
*.https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.login1.html#The%20Manager%20Object.
* ‘Inactive’ time corresponds to all the other states from sd_uid_get_state(),
* or if `IdleHint` is true.
* or if `IdleHint` is true or if `PreparingForSleep` is true.
*
* All times within the class are handled in terms of wall/real clock time,
* rather than monotonic time. This is because it’s necessary to continue
@ -121,7 +123,7 @@ export const TimeLimitsManager = GObject.registerClass({
'daily-limit-reached': {},
},
}, class TimeLimitsManager extends GObject.Object {
constructor(historyFile, clock, loginUserFactory, settingsFactory) {
constructor(historyFile, clock, loginManagerFactory, loginUserFactory, settingsFactory) {
super();
// Allow these few bits of global state to be overridden for unit testing
@ -143,6 +145,9 @@ export const TimeLimitsManager = GObject.registerClass({
return timeChangeSource.attach(null);
},
};
this._loginManagerFactory = loginManagerFactory ?? {
new: LoginManager.getLoginManager,
};
this._loginUserFactory = loginUserFactory ?? {
newAsync: () => {
const loginManager = LoginManager.getLoginManager();
@ -163,6 +168,7 @@ export const TimeLimitsManager = GObject.registerClass({
this._state = TimeLimitsState.DISABLED;
this._stateTransitions = [];
this._cancellable = null;
this._loginManager = null;
this._loginUser = null;
this._lastStateChangeTimeSecs = 0;
this._timerId = 0;
@ -252,6 +258,13 @@ export const TimeLimitsManager = GObject.registerClass({
}
// Start listening for notifications to the user’s state.
this._loginManager = this._loginManagerFactory.new();
this._loginManager.connectObject(
'prepare-for-sleep',
() => this._updateUserState(true).catch(
e => console.warn(`Failed to update user state: ${e.message}`)),
this);
this._loginUser = await this._loginUserFactory.newAsync();
this._loginUser.connectObject(
'g-properties-changed',
@ -277,6 +290,9 @@ export const TimeLimitsManager = GObject.registerClass({
this._loginUser?.disconnectObject(this);
this._loginUser = null;
this._loginManager?.disconnectObject(this);
this._loginManager = null;
this._state = TimeLimitsState.DISABLED;
this._lastStateChangeTimeSecs = 0;
this.notify('state');
@ -360,7 +376,9 @@ export const TimeLimitsManager = GObject.registerClass({
}
_calculateUserStateFromLogind() {
const isActive = this._loginUser.State === 'active' && !this._loginUser.IdleHint;
const isActive = this._loginUser.State === 'active' &&
!this._loginUser.IdleHint &&
!this._loginManager.preparingForSleep;
return isActive ? UserState.ACTIVE : UserState.INACTIVE;
}