From a2638d5c82722b9c0f97dfed13b6044cc90f7591 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 26 Oct 2026 17:32:06 -0400 Subject: [PATCH] bump gomuks, use new pause/resume commands --- gomuks | 2 +- lib/controllers/client.dart | 3 +++ lib/controllers/gomuks_listener.dart | 5 +++-- lib/helpers/extensions/gomuks_buffer.dart | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gomuks b/gomuks index 53cae0e..081d5df 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 53cae0e0334aef5ac376ea84f19ba1cff8a92310 +Subproject commit 081d5df14be6bf7131e955461207e26da7ad23c9 diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart index a044d25..f158069 100644 --- a/lib/controllers/client.dart +++ b/lib/controllers/client.dart @@ -200,6 +200,9 @@ class ClientController extends AsyncNotifier { Future setState(SetStateRequest request) async => await _sendCommand("set_state", request.toJson()); + Future pauseSync() => _sendCommand("pause_sync"); + Future resumeSync() => _sendCommand("resume_sync"); + Future verify(String recoveryKey) => _sendCommand("verify", {"recovery_key": recoveryKey}); diff --git a/lib/controllers/gomuks_listener.dart b/lib/controllers/gomuks_listener.dart index a97599b..320ac2d 100644 --- a/lib/controllers/gomuks_listener.dart +++ b/lib/controllers/gomuks_listener.dart @@ -156,11 +156,12 @@ class GomuksListenerController extends AsyncNotifier { // Mobile OSes block network access for backgrounded apps, so pause // syncing instead of letting it fail. ref.listen(AppPausedController.provider, (_, paused) { + final client = ref.read(ClientController.provider.notifier); if (paused) { - GomuksPauseSync(handle); + client.pauseSync().onError(showError); } else { ref.invalidate(TypingController.provider); - GomuksResumeSync(handle); + client.resumeSync().onError(showError); } }, fireImmediately: true); } diff --git a/lib/helpers/extensions/gomuks_buffer.dart b/lib/helpers/extensions/gomuks_buffer.dart index 57425be..9ab1307 100644 --- a/lib/helpers/extensions/gomuks_buffer.dart +++ b/lib/helpers/extensions/gomuks_buffer.dart @@ -15,7 +15,10 @@ extension GomuksOwnedBufferToX on GomuksOwnedBuffer { } } - dynamic toJsonAndFree() => jsonDecode(utf8.decode(toBytesAndFree())); + dynamic toJsonAndFree() { + final bytes = toBytesAndFree(); + return bytes.isEmpty ? null : jsonDecode(utf8.decode(bytes)); + } } extension JsonToGomuksBuffer on Map {