From 09129639e10e2932d68889a27661902a73c823b5 Mon Sep 17 00:00:00 2001 From: otsmr Date: Wed, 13 May 2026 03:38:39 +0200 Subject: [PATCH] remove useless mutext lock --- lib/src/services/api/server_messages.api.dart | 65 +++++++++---------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/src/services/api/server_messages.api.dart b/lib/src/services/api/server_messages.api.dart index a68ab401..99ce4e36 100644 --- a/lib/src/services/api/server_messages.api.dart +++ b/lib/src/services/api/server_messages.api.dart @@ -4,7 +4,6 @@ import 'dart:io'; import 'package:clock/clock.dart'; import 'package:drift/drift.dart'; import 'package:hashlib/random.dart'; -import 'package:mutex/mutex.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/locator.dart'; import 'package:twonly/src/database/daos/contacts.dao.dart'; @@ -36,48 +35,44 @@ import 'package:twonly/src/services/signal/session.signal.dart'; import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/utils/misc.dart'; -final lockHandleServerMessage = Mutex(); - Future handleServerMessage(server.ServerToClient msg) async { - return lockHandleServerMessage.protect(() async { - Log.info('Processing a message from the server.'); + Log.info('Processing a message from the server.'); - /// Returns means, that the server can delete the message from the server. - final ok = client.Response_Ok()..none = true; - var response = client.Response()..ok = ok; + /// Returns means, that the server can delete the message from the server. + final ok = client.Response_Ok()..none = true; + var response = client.Response()..ok = ok; - try { - if (msg.v0.hasRequestNewPreKeys()) { - response = await handleRequestNewPreKey(); - } else if (msg.v0.hasNewMessage()) { - Log.info('Got 1 message from the server.'); - await handleClient2ClientMessage(msg.v0.newMessage); - } else if (msg.v0.hasNewMessages()) { - Log.info( - 'Got ${msg.v0.newMessages.newMessages.length} messages from the server.', - ); - for (final newMessage in msg.v0.newMessages.newMessages) { - try { - await handleClient2ClientMessage(newMessage); - } catch (e) { - Log.error(e); - } + try { + if (msg.v0.hasRequestNewPreKeys()) { + response = await handleRequestNewPreKey(); + } else if (msg.v0.hasNewMessage()) { + Log.info('Got 1 message from the server.'); + await handleClient2ClientMessage(msg.v0.newMessage); + } else if (msg.v0.hasNewMessages()) { + Log.info( + 'Got ${msg.v0.newMessages.newMessages.length} messages from the server.', + ); + for (final newMessage in msg.v0.newMessages.newMessages) { + try { + await handleClient2ClientMessage(newMessage); + } catch (e) { + Log.error(e); } - } else { - Log.error('Unknown server message: $msg'); } - } catch (e) { - Log.error(e); + } else { + Log.error('Unknown server message: $msg'); } + } catch (e) { + Log.error(e); + } - final v0 = client.V0() - ..seq = msg.v0.seq - ..response = response; + final v0 = client.V0() + ..seq = msg.v0.seq + ..response = response; - await apiService.sendResponse(ClientToServer()..v0 = v0); - AppState.gotMessageFromServer = true; - Log.info('Message from server proccessed.'); - }); + await apiService.sendResponse(ClientToServer()..v0 = v0); + AppState.gotMessageFromServer = true; + Log.info('Message from server proccessed.'); } DateTime lastPushKeyRequest = clock.now().subtract(const Duration(hours: 1));