Merge pull request #1247 from jijojosephk/fix_awayOnSystemIdle_v2

Fix awayOnSystemIdle flag in Teams V2
IsmaelMartinez · May 4, 2024 · d3d8573 · d3d8573
2 parents f0c2825 + 0df56d1
commit d3d8573
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/app/browser/tools/activityHub.js b/app/browser/tools/activityHub.js
@@ -68,7 +68,7 @@ class ActivityHub {
 					// ALTERNATIVE: teams2IdleTracker._idleStateBehaviorSubject.next('Inactive');
 					teams2IdleTracker.transitionToIdle();
 				}
-			} catch(e) {
+			} catch (e) {
 				console.error('Failed to set teams2 Machine State', e);
 			}
 		} else {
@@ -89,11 +89,25 @@ class ActivityHub {
 	 * @param {number} status 
 	 */
 	setUserStatus(status) {
-		instance.whenReady().then((inst) => {
-			inst.injector.get('presenceService').setMyStatus(status, null, true);
-		}).catch(() => {
-			console.error('Failed to set User Status');
-		});
+		const teams2IdleTracker = ReactHandler.getTeams2IdleTracker();
+		if (teams2IdleTracker) {
+			try {
+				console.log(`setUserStatus teams2 status=${status}`);
+				if (status === 1) {
+					teams2IdleTracker.handleMonitoredWindowEvent();
+				} else {
+					teams2IdleTracker.transitionToIdle();
+				}
+			} catch (e) {
+				console.error('Failed to set teams2 User Status', e);
+			}
+		} else {
+			instance.whenReady().then((inst) => {
+				inst.injector.get('presenceService').setMyStatus(status, null, true);
+			}).catch(() => {
+				console.error('Failed to set User Status');
+			});
+		}
 	}
 
 	refreshAppState(controller, state) {

diff --git a/com.github.IsmaelMartinez.teams_for_linux.appdata.xml b/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.4.37" date="2024-05-04">
+			<description>
+				<ul>
+					<li>Fix awayOnSystemIdle flag in Teams V2</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.4.36" date="2024-05-03">
 			<description>
 				<ul>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.36",
+  "version": "1.4.37",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",