increased logging again

lib/src/database/daos/messages.dao.dart

@@ -153,6 +153,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
       );
       final groupIds = entry.value;
 
+      final deletedCount =
           await (delete(messages)..where(
                 (m) =>
                     m.groupId.isIn(groupIds) &
@@ -165,6 +166,12 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
                             m.createdAt.isSmallerThanValue(deletionTime))),
               ))
               .go();
+
+      if (deletedCount > 0) {
+        Log.info(
+          'Deleted $deletedCount messages for groups $groupIds due to retention policy.',
+        );
+      }
     }
   }
 
@@ -266,12 +273,14 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
           actionTimestamp = msg.createdAt;
         }
 
+        final ts = actionTimestamp;
+        await transaction(() async {
           await into(messageActions).insertOnConflictUpdate(
             MessageActionsCompanion(
               messageId: Value(messageId),
               contactId: contactId,
               type: const Value(MessageActionType.openedAt),
-            actionAt: Value(actionTimestamp),
+              actionAt: Value(ts),
             ),
           );
 
@@ -279,17 +288,33 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
             messageId,
             MessageActionType.openedAt,
           );
-        final rowsUpdated =
+          await (update(
+            messages,
+          )..where((tbl) => tbl.messageId.equals(messageId))).write(
+            MessagesCompanion(
+              openedAt: Value(ts),
+              openedByAll: Value(isOpenedByAll ? ts : null),
+            ),
+          );
+        });
+
+        // Read-back verification: confirm the write was persisted.
+        final verified = await getMessageById(messageId).getSingleOrNull();
+        if (verified != null && verified.openedAt == null) {
+          Log.warn(
+            'handleMessagesOpened read-back failed for $messageId, retrying',
+          );
           await (update(
             messages,
           )..where((tbl) => tbl.messageId.equals(messageId))).write(
             MessagesCompanion(
               openedAt: Value(actionTimestamp),
-                openedByAll: Value(isOpenedByAll ? actionTimestamp : null),
             ),
           );
+        }
+
         Log.info(
-          'handleMessagesOpened updated $rowsUpdated rows for message $messageId',
+          'handleMessagesOpened completed for message $messageId',
         );
       } catch (e) {
         Log.error('handleMessagesOpened failed for $messageId: $e');
@@ -302,6 +327,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
     String messageId,
     DateTime timestamp,
   ) async {
+    await transaction(() async {
       await into(messageActions).insertOnConflictUpdate(
         MessageActionsCompanion(
           messageId: Value(messageId),
@@ -314,6 +340,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
         messageId,
         MessagesCompanion(ackByServer: Value(timestamp)),
       );
+    });
   }
 
   Future<bool> haveAllMembers(
@@ -347,18 +374,20 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
     String messageId,
     MessagesCompanion updatedValues,
   ) async {
-    await (update(
+    final count = await (update(
       messages,
     )..where((c) => c.messageId.equals(messageId))).write(updatedValues);
+    Log.info('Updated $count message(s) with messageId $messageId');
   }
 
   Future<void> updateMessagesByMediaId(
     String mediaId,
     MessagesCompanion updatedValues,
-  ) {
-    return (update(
+  ) async {
+    final count = await (update(
       messages,
     )..where((c) => c.mediaId.equals(mediaId))).write(updatedValues);
+    Log.info('Updated $count message(s) with mediaId $mediaId');
   }
 
   Future<Message?> insertMessage(MessagesCompanion message) async {

lib/src/database/twonly.db.dart

@@ -1,4 +1,3 @@
-import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart'
     show DriftNativeOptions, driftDatabase;
@@ -246,38 +245,4 @@ class TwonlyDB extends _$TwonlyDB {
       Log.info('Table: $tableName, Size: $tableSize bytes');
     }
   }
-
-  Future<void> deleteDataForTwonlySafe() async {
-    await (delete(messages)..where(
-          (t) =>
-              (t.mediaStored.equals(false) &
-              t.isDeletedFromSender.equals(false)),
-        ))
-        .go();
-    await update(messages).write(
-      const MessagesCompanion(
-        downloadToken: Value(null),
-      ),
-    );
-    await (delete(mediaFiles)..where(
-          (t) => (t.stored.equals(false)),
-        ))
-        .go();
-    await delete(receipts).go();
-    await delete(receivedReceipts).go();
-    await update(contacts).write(
-      const ContactsCompanion(
-        avatarSvgCompressed: Value(null),
-        senderProfileCounter: Value(0),
-      ),
-    );
-    await (delete(signalPreKeyStores)..where(
-          (t) => (t.createdAt.isSmallerThanValue(
-            clock.now().subtract(
-              const Duration(days: 25),
-            ),
-          )),
-        ))
-        .go();
-  }
 }

lib/src/services/api/mediafiles/upload.api.dart

@@ -64,20 +64,6 @@ Future<void> reuploadMediaFiles() async {
           }
         }
 
-        if (receipt.retryCount >= 2) {
-          // After two retries, change the receiptId. This addresses a bug where the receiver received the message and marked it as received, but the app was closed before the message was fully processed. Because the receipt was already stored, subsequent retries were detected as duplicates and rejected.
-          final oldReceiptId = receipt.receiptId;
-          final updatedReceipt = await twonlyDB.receiptsDao.rotateReceiptId(
-            oldReceiptId,
-          );
-          if (updatedReceipt == null) continue;
-
-          Log.info(
-            'Changed receiptId $oldReceiptId to ${updatedReceipt.receiptId} as retryCount is ${receipt.retryCount}',
-          );
-          receipt = updatedReceipt;
-        }
-
         var messageId = receipt.messageId;
         if (receipt.messageId == null) {
           Log.info('Message not in receipt. Loading it from the content.');