added mutext protection for critical code

ios/build/.last_build_id

@@ -0,0 +1 @@
+ce49e7d90cd902197f9a9cbc84219d23

lib/src/providers/api/api.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:drift/drift.dart';
 import 'package:hive/hive.dart';
 import 'package:logging/logging.dart';
+import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
@@ -16,7 +17,10 @@ import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/signal.dart' as SignalHelper;
 import 'package:twonly/src/utils/storage.dart';
 
+final lockSendingMessages = Mutex();
+
 Future tryTransmitMessages() async {
+  lockSendingMessages.protect(() async {
     Map<String, dynamic> retransmit = await getAllMessagesForRetransmitting();
 
     if (retransmit.isEmpty) return;
@@ -50,6 +54,7 @@ Future tryTransmitMessages() async {
     }
     Box box = await getMediaStorage();
     box.put("messages-to-retransmit", jsonEncode(failed));
+  });
 }
 
 class RetransmitMessage {
@@ -102,6 +107,7 @@ Future<Map<String, dynamic>> getAllMessagesForRetransmitting() async {
 Future<Result> encryptAndSendMessage(
     int? messageId, int userId, MessageJson msg,
     {PushKind? pushKind}) async {
+  return await lockSendingMessages.protect<Result>(() async {
     Uint8List? bytes = await SignalHelper.encryptMessage(msg, userId);
 
     if (bytes == null) {
@@ -109,7 +115,8 @@ Future<Result> encryptAndSendMessage(
       return Result.error(ErrorCode.InternalError);
     }
 
-  String stateId = (messageId ?? (60001 + Random().nextInt(100000))).toString();
+    String stateId =
+        (messageId ?? (60001 + Random().nextInt(100000))).toString();
     Box box = await getMediaStorage();
 
     List<int>? pushData;
@@ -150,6 +157,7 @@ Future<Result> encryptAndSendMessage(
     }
 
     return resp;
+  });
 }
 
 Future sendTextMessage(

lib/src/providers/api/server_messages.dart

@@ -5,6 +5,7 @@ import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:logging/logging.dart';
+import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/app.dart';
 import 'package:twonly/src/database/twonly_database.dart';
@@ -23,16 +24,11 @@ import 'package:twonly/src/services/notification_service.dart';
 // ignore: library_prefixes
 import 'package:twonly/src/utils/signal.dart' as SignalHelper;
 
-bool isBlocked = false;
+final lockHandleServerMessage = Mutex();
 
 Future handleServerMessage(server.ServerToClient msg) async {
+  return lockHandleServerMessage.protect(() async {
     client.Response? response;
-  int maxCounter = 0; // only block for 2 seconds
-  while (isBlocked && maxCounter < 200) {
-    await Future.delayed(Duration(milliseconds: 10));
-    maxCounter += 1;
-  }
-  isBlocked = true;
 
     try {
       if (msg.v0.hasRequestNewPreKeys()) {
@@ -52,13 +48,12 @@ Future handleServerMessage(server.ServerToClient msg) async {
       response = client.Response()..error = ErrorCode.InternalError;
     }
 
-  isBlocked = false;
-
     var v0 = client.V0()
       ..seq = msg.v0.seq
       ..response = response;
 
     apiProvider.sendResponse(ClientToServer()..v0 = v0);
+  });
 }
 
 Future<client.Response> handleDownloadData(DownloadData data) async {
@@ -300,7 +295,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
           return client.Response()..error = ErrorCode.InternalError;
         }
 
-        encryptAndSendMessage(
+        await encryptAndSendMessage(
           message.messageId!,
           fromUserId,
           MessageJson(

pubspec.lock

@@ -932,6 +932,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  mutex:
+    dependency: "direct main"
+    description:
+      name: mutex
+      sha256: "8827da25de792088eb33e572115a5eb0d61d61a3c01acbc8bcbe76ed78f1a1f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   nested:
     dependency: transitive
     description:

pubspec.yaml

@@ -61,6 +61,7 @@ dependencies:
   flutter_svg: ^2.0.17
   flutter_volume_controller: ^1.3.3
   fixnum: ^1.1.1
+  mutex: ^3.1.0
   # avatar_maker
   # avatar_maker: 
   #   path: ./dependencies/avatar_maker/