refactor: update clipboard handling to Gtk4 API and rename SMS message handler to handleDigest

Author: Scroker

installed-tests/suites/components/testClipboardComponent.js

@@ -29,32 +29,60 @@ describe('The Clipboard component', function () {
         clipboard.destroy();
     });
 
-    it('pulls changes from the session clipboard', function (done) {
+    it('pulls changes from the session clipboard', async function () {
         const text = GLib.uuid_string_random();
 
-        const id = clipboard.connect('notify::text', (clipboard) => {
-            clipboard.disconnect(id);
-
-            expect(clipboard.text).toBe(text);
-            done();
+        const promise = new Promise((resolve) => {
+            const id = clipboard.connect('notify::text', (clipboard) => {
+                if (clipboard.text === text) {
+                    clipboard.disconnect(id);
+                    resolve();
+                }
+            });
         });
 
-        const provider = Gdk.ContentProvider.new_for_value(new GLib.Variant('s', text));
+        const provider = Gdk.ContentProvider.new_for_value(text);
         gtkClipboard.set_content(provider);
+
+        await promise;
+        expect(clipboard.text).toBe(text);
     });
 
-    it('pushes changes to the session clipboard', function (done) {
+    it('pushes changes to the session clipboard', async function () {
         const text = GLib.uuid_string_random();
 
-        const id = gtkClipboard.connect('changed', async (gtkClipboard) => {
-            gtkClipboard.disconnect(id);
-
-            const value = await gtkClipboard.read_text_async(null);
-            expect(value).toBe(text);
-            done();
+        const promise = new Promise((resolve) => {
+            const id = gtkClipboard.connect('changed', async (gtkClipboard) => {
+                const value = await new Promise((resolve, reject) => {
+                    gtkClipboard.read_text_async(null, (source, res) => {
+                        try {
+                            resolve(source.read_text_finish(res));
+                        } catch (e) {
+                            reject(e);
+                        }
+                    });
+                });
+
+                if (value === text) {
+                    gtkClipboard.disconnect(id);
+                    resolve();
+                }
+            });
         });
 
         clipboard.text = text;
+
+        await promise;
+        const value = await new Promise((resolve, reject) => {
+            gtkClipboard.read_text_async(null, (source, res) => {
+                try {
+                    resolve(source.read_text_finish(res));
+                } catch (e) {
+                    reject(e);
+                }
+            });
+        });
+        expect(value).toBe(text);
     });
 });
 

installed-tests/suites/plugins/testSmsPlugin.js

@@ -223,44 +223,25 @@ describe('The sms plugin', function () {
     });
 
     it('can request a list of conversations', async function () {
-        spyOn(localPlugin, '_handleMessages');
+        spyOn(localPlugin, '_handleDigest');
 
         localPlugin._requestConversations();
 
         await localPlugin.awaitPacket('kdeconnect.sms.messages');
-        expect(localPlugin._handleMessages).toHaveBeenCalled();
+        expect(localPlugin._handleDigest).toHaveBeenCalled();
     });
 
     it('can request full conversations', async function () {
-        spyOn(localPlugin, '_handleMessages').and.callThrough();
         spyOn(localPlugin, '_handleThread').and.callThrough();
         spyOn(localPlugin, '_requestConversation').and.callThrough();
 
-        localPlugin._requestConversations();
-
-        await localPlugin.awaitPacket('kdeconnect.sms.messages');
-        expect(localPlugin._handleMessages).toHaveBeenCalled();
-        expect(localPlugin._requestConversation).toHaveBeenCalledTimes(2);
-
-        localPlugin.handlePacket.calls.reset();
+        localPlugin.requestMore('1', -1);
 
         await localPlugin.awaitPacket('kdeconnect.sms.messages');
+        expect(localPlugin._requestConversation).toHaveBeenCalledWith('1', 10, -1);
         expect(localPlugin._handleThread).toHaveBeenCalled();
     });
 
-    it('only requests new or updated converations', async function () {
-        spyOn(localPlugin, '_handleMessages').and.callThrough();
-        spyOn(localPlugin, '_handleThread').and.callThrough();
-        spyOn(localPlugin, '_requestConversation').and.callThrough();
-
-        localPlugin._requestConversations();
-
-        await localPlugin.awaitPacket('kdeconnect.sms.messages');
-        expect(localPlugin._handleMessages).toHaveBeenCalled();
-
-        expect(localPlugin._requestConversation).not.toHaveBeenCalled();
-    });
-
     it('can send SMS messages', async function () {
         spyOn(remoteDevice, 'handlePacket').and.callThrough();
 

src/gsconnect-preferences.js

@@ -20,13 +20,6 @@ import './preferences/init.js';
 import {Window} from './preferences/service.js';
 import Config from './config.js';
 
-let GioUnix;
-try {
-    GioUnix = (await import('gi://GioUnix?version=2.0')).default;
-} catch {
-    GioUnix = Gio
-}
-
 /**
  * Class representing the GSConnect service daemon.
  */

src/service/components/clipboard.js

@@ -181,23 +181,35 @@ const Clipboard = GObject.registerClass({
      * GtkClipboard
      */
     async _gtkUpdateText() {
-        const mimetypes = await new Promise((resolve, reject) => {
-            this._clipboard.request_targets((clipboard, atoms) => resolve(atoms));
-        });
-
-        // Special case for a cleared clipboard
-        if (mimetypes.length === 0)
-            return this._applyUpdate('');
-
-        // Special case to ignore copied files
-        if (mimetypes.includes('text/uri-list'))
-            return;
-
-        const text = await new Promise((resolve, reject) => {
-            this._clipboard.request_text((clipboard, text) => resolve(text));
-        });
+        try {
+            const formats = this._clipboard.get_formats();
+            const mimetypes = formats.get_mime_types() || [];
+
+            // Special case for a cleared clipboard
+            if (mimetypes.length === 0)
+                return this._applyUpdate('');
+
+            // Special case to ignore copied files
+            if (mimetypes.includes('text/uri-list'))
+                return;
+
+            const text = await new Promise((resolve, reject) => {
+                this._clipboard.read_text_async(this._cancellable, (source, res) => {
+                    try {
+                        resolve(source.read_text_finish(res));
+                    } catch (e) {
+                        reject(e);
+                    }
+                });
+            });
+            this._applyUpdate(text);
+        } catch (e) {
+            if (e instanceof Error && e.matches && e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                return;
 
-        this._applyUpdate(text);
+            if (e instanceof Error)
+                debug(e);
+        }
     }
 
     destroy() {

src/service/plugins/sms.js

@@ -199,7 +199,7 @@ const SMSPlugin = GObject.registerClass({
     handlePacket(packet) {
         switch (packet.type) {
             case 'kdeconnect.sms.messages':
-                this._handleMessages(packet.body.messages);
+                this._handleDigest(packet.body.messages);
                 break;
         }
     }
@@ -255,7 +255,7 @@ const SMSPlugin = GObject.registerClass({
      *
      * @param {object[]} messages - A list of sms message objects
      */
-    _handleMessages(messages) {
+    _handleDigest(messages) {
         try {
             // If messages is empty there's nothing to do...
             if (messages.length === 0)