No longer use SecureDesktopNVDAObject in 2024.1+ (#12)

LeonarddeR · Sep 7, 2023 · 736128f · 736128f
1 parent 8f6db19
commit 736128f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/addon/globalPlugins/rdAccess/__init__.py b/addon/globalPlugins/rdAccess/__init__.py
@@ -21,7 +21,6 @@
 import api
 import atexit
 from utils.security import isRunningOnSecureDesktop
-from IAccessibleHandler import SecureDesktopNVDAObject
 from .secureDesktopHandling import SecureDesktopHandler
 import versionInfo
 
@@ -349,7 +348,11 @@ def event_gainFocus(self, obj, nextHandler):
 					except Exception:
 						log.error("Error calling event_gainFocus on handler", exc_info=True)
 						continue
-			if configuredOperatingMode & configuration.OperatingMode.SECURE_DESKTOP:
+			if (
+				configuredOperatingMode & configuration.OperatingMode.SECURE_DESKTOP
+				and not secureDesktop.hasSecureDesktopExtensionPoint
+			):
+				from IAccessibleHandler import SecureDesktopNVDAObject
 				if isinstance(obj, SecureDesktopNVDAObject):
 					secureDesktop.post_secureDesktopStateChange.notify(isSecureDesktop=True)
 				elif self._sdHandler:

diff --git a/addon/lib/secureDesktop.py b/addon/lib/secureDesktop.py
@@ -3,6 +3,11 @@
 # License: GNU General Public License version 2.0
 
 from extensionPoints import Action
+import versionInfo
 
+hasSecureDesktopExtensionPoint = versionInfo.version_year >= 2024
 
-post_secureDesktopStateChange = Action()
+if hasSecureDesktopExtensionPoint:
+	from winAPI.secureDesktop import post_secureDesktopStateChange
+else:
+	post_secureDesktopStateChange = Action()
diff --git a/readme.md b/readme.md
@@ -22,9 +22,11 @@ This enables a user experience where managing a remote system feels just as perf
 * Ability to use speech and braille from the user session when accessing secure desktops
 
 ## Changelog
+
 ### Version 1.1
 
-- Added support for NVDA 2023.3 style device registration for automatic detection of braille displays [#11](https://github.com/leonardder/rdAccess/pull/11)
+- Added support for NVDA 2023.3 style device registration for automatic detection of braille displays. [#11](https://github.com/leonardder/rdAccess/pull/11)
+- Added support for NVDA 2024.1 Alpha `winAPI.secureDesktop.post_secureDesktopStateChange` extension point. [#12](https://github.com/leonardder/rdAccess/pull/12)
 
 ### Version 1.0