Merge branch 'pr/1928' into dev

Author: Lionel Laské

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - UUID v4 generation bug: incorrect bitwise operation forces variant to 8 #1840
 - Variable Shadowing - Overwrites Module Object #1846
 - Use of '=' instead of '==' in if else statement in Physics game activity.js #1870
+- Camera remains active when toggling off in QRCode activity (Web/Desktop) #1911
 
 ## [1.9.0] - 2025-03-25
 ### Added

activities/QRCode.activity/js/activity.js

@@ -229,6 +229,9 @@ define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "l
 			// Handle HTML5 capture
 			var outdiv = document.getElementById("outdiv");
 			var videostream = document.getElementById("video-stream");
+			if (videostream) {
+				videostream.style.visibility = "visible";
+			}
 			if (!photoButton.classList.contains('active')) {
 				document.getElementById("qr-code").style.visibility = "hidden";
 				document.getElementById("loading-spinner").style.visibility = "visible";
@@ -243,8 +246,10 @@ define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "l
 					videostream.style.visibility = "visible";
 				}
 			} else {
-				outdiv.style.visibility = "hidden";
-				videostream.style.visibility = "hidden";
+				if (typeof stopWebcam === "function") {
+					stopWebcam();
+				}
+				photoInitialized = false;
 				document.getElementById("loading-spinner").style.visibility = "hidden";
 				document.getElementById("qr-code").style.visibility = "visible";
 				userText.value = oldUserText;

activities/QRCode.activity/js/webqr.js

@@ -12,6 +12,7 @@ var v=null;
 var qrSize = 0;
 var margin = 0;
 var scannedCallback = null;
+var currentStream = null;
 
 
 var vidhtml = '<video id="video-stream" autoplay></video>';
@@ -83,8 +84,8 @@ function isCanvasSupported(){
   return !!(elem.getContext && elem.getContext('2d'));
 }
 function success(stream)
-{
-
+{    
+    currentStream = stream;
     v.srcObject = stream;
     v.play();
 
@@ -184,3 +185,24 @@ function setwebcam2(options)
     stype=1;
     setTimeout(captureToCanvas, 500);
 }
+function stopWebcam() {
+    if (currentStream) {
+        currentStream.getTracks().forEach(function(track) {
+            track.stop();
+        });
+        currentStream = null;
+    }
+
+    if (v) {
+        v.pause();
+        v.srcObject = null;
+    }
+
+    gUM = false;
+    stype = 0;
+
+    var outdiv = document.getElementById("outdiv");
+    if (outdiv) {
+        outdiv.innerHTML = "";
+    }
+}