screensaver/controller.js: Give lockScreen an optional callback.

The callback has one argument - whether or not the lock succeeded.

Author: mtwebster

js/ui/screensaver/controller.js

@@ -87,28 +87,36 @@ var ScreensaverController = class {
         return this.#settings.get_boolean('allow-keyboard-shortcuts');
     }
 
-    lockScreen(askForAwayMessage) {
-        if (Main.lockdownSettings.get_boolean('disable-lock-screen'))
+    lockScreen(askForAwayMessage, callback = null) {
+        if (Main.lockdownSettings.get_boolean('disable-lock-screen')) {
+            if (callback)
+                callback(this.#locked);
             return;
+        }
 
         if (askForAwayMessage && this.#settings.get_boolean('ask-for-away-message')) {
             let dialog = new AwayMessageDialog.AwayMessageDialog((message) => {
-                this.#doLock(message);
+                this.#doLock(message, callback);
             });
             dialog.open();
             return;
         }
 
-        this.#doLock(null);
+        this.#doLock(null, callback);
     }
 
-    #doLock(awayMessage) {
+    #doLock(awayMessage, callback) {
         if (this.#screenShield) {
-            this.#screenShield.lock(false, awayMessage);
+            this.#screenShield.lock(false, awayMessage, callback);
             return;
         }
 
-        this.#screenSaverProxy.LockRemote(awayMessage || "");
+        this.#screenSaverProxy.LockRemote(awayMessage || "", (result, error) => {
+            if (error)
+                global.logError(`ScreensaverController: LockRemote failed: ${error.message}`);
+            if (callback)
+                callback(!error);
+        });
     }
 
     hideKeyboard() {

js/ui/screensaver/screenShield.js

@@ -358,9 +358,11 @@ var ScreenShield = GObject.registerClass({
         clipboard.set_text(St.ClipboardType.CLIPBOARD, '');
     }
 
-    lock(immediate = false, awayMessage = null) {
+    lock(immediate = false, awayMessage = null, callback = null) {
         if (this.isLocked() || this._activationPending) {
             _log('ScreenShield: Already locked or activation pending, ignoring lock request');
+            if (callback)
+                callback(this.isLocked());
             return;
         }
 
@@ -374,10 +376,14 @@ var ScreenShield = GObject.registerClass({
                     this._stopLockDelay();
                     this._setLocked();
                 }
+                if (callback)
+                    callback(success);
             });
         } else {
             this._stopLockDelay();
             this._setLocked();
+            if (callback)
+                callback(true);
         }
     }