Fix awayOnSystemIdle behaviour when locking the screen: now it shows …

…status as 'Available' when locking the screen with awayOnSystemIdle = false (#1335)

Co-authored-by: kindofblues <[email protected]>

app/browser/notifications/activityManager.js

@@ -19,15 +19,32 @@ class ActivityManager {
 	watchSystemIdleState() {
 		const self = this;
 		self.ipcRenderer.invoke('get-system-idle-state').then((state) => {
-			activityHub.setMachineState(state.system === 'active' ? 1 : 2);
-			const timeOut = (state.system === 'active' ? self.config.appIdleTimeoutCheckInterval : self.config.appActiveCheckInterval) * 1000;
-
+			let timeOut;
 			if (this.config.awayOnSystemIdle) {
+				/*
+					Same logic as before: 
+						awayOnSystemIdle = true, sets status "Away" when screen is locked.
+				*/
+				activityHub.setMachineState(state.system === 'active' ? 1 : 2);
+				timeOut = (state.system === 'active' ? self.config.appIdleTimeoutCheckInterval : self.config.appActiveCheckInterval) * 1000;
+
 				if (state.system === 'active' && state.userIdle === 1) {
 					activityHub.setUserStatus(1);
 				} else if (state.system !== 'active' && state.userCurrent === 1) {
 					activityHub.setUserStatus(3);
 				}
+			} else {
+				/*
+					Handle screen locked: 
+						awayOnSystemIdle = false, keeps status "Available" when locking the screen.
+				*/
+				if ((state.system === 'active') || (state.system === 'locked')) {
+					activityHub.setMachineState(1);
+					timeOut = self.config.appIdleTimeoutCheckInterval * 1000;
+				} else {
+					activityHub.setMachineState(2);
+					timeOut = self.config.appActiveCheckInterval * 1000;
+				}			
 			}
 
 			setTimeout(() => self.watchSystemIdleState(), timeOut);

com.github.IsmaelMartinez.teams_for_linux.appdata.xml

@@ -14,6 +14,13 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.8.1" date="2024-07-10">
+			<description>
+				<ul>
+					<li>Fix awayOnSystemIdle behaviour when locking the screen: now it shows status as "Available" when locking the screen with awayOnSystemIdle = false</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.8.0" date="2024-07-08">
 			<description>
 				<ul>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",