Merge 1279bd2 into 8eac659

seanbudd · web-flow · commit f35d63248c54 · 2022-09-14T16:16:16.000+10:00
diff --git a/source/IAccessibleHandler/__init__.py b/source/IAccessibleHandler/__init__.py
@@ -798,7 +798,17 @@ def _get_role(self):
 		return controlTypes.Role.PANE
 
 	def event_gainFocus(self):
-		super(SecureDesktopNVDAObject, self).event_gainFocus()
+		from speech.speech import cancelSpeech
+		# NVDA announces the secure desktop when handling the gainFocus event.
+		# Before announcing the secure desktop and entering sleep mode,
+		# cancel speech so that speech does not overlap with the new instance of NVDA
+		# started on the secure desktop.
+		# Cancelling speech was previously handled by a foreground event fired when focusing SecureDesktopNVDAObject.
+		# The foreground event would incorrectly fire on the foreground window of the user desktop.
+		# This foreground event is now explicitly prevented due to the security concerns of
+		# setting the foreground object to an object 'below the lock screen'.
+		cancelSpeech()
+		super().event_gainFocus()
 		# After handling the focus, NVDA should sleep while the secure desktop is active.
 		self.sleepMode = self.SLEEP_FULL
 
