From cee33a23acdabe77a85bc7a3ad961730f40e33a6 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 10 Mar 2026 16:53:21 +0000
Subject: [PATCH] Use transaction when loading logs.

---
 .../logsubmit/SubmitDebugLogViewModel.java    | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
index b3a7a370fc..3d566f9f21 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
@@ -61,7 +61,8 @@ public class SubmitDebugLogViewModel extends ViewModel {
             Log.blockUntilAllWritesFinished();
             stopwatch.split("flush");
 
-            LogDatabase.getInstance(AppDependencies.getApplication()).logs().trimToSize();
+            LogDatabase logDatabase = LogDatabase.getInstance(AppDependencies.getApplication());
+            logDatabase.logs().trimToSize();
             stopwatch.split("trim-old");
 
             if (!emitter.isDisposed()) {
@@ -69,35 +70,40 @@ public class SubmitDebugLogViewModel extends ViewModel {
             }
 
             List<String> currentChunk = new ArrayList<>();
+            logDatabase.getReadableDatabase().beginTransactionNonExclusive();
+            try {
+              try (LogDatabase.LogTable.CursorReader logReader = (LogDatabase.LogTable.CursorReader) logDatabase.logs().getAllBeforeTime(firstViewTime)) {
+                stopwatch.split("initial-query");
 
-            try (LogDatabase.LogTable.CursorReader logReader = (LogDatabase.LogTable.CursorReader) LogDatabase.getInstance(AppDependencies.getApplication()).logs().getAllBeforeTime(firstViewTime)) {
-              stopwatch.split("initial-query");
+                int count = 0;
+                while (logReader.hasNext() && !emitter.isDisposed()) {
+                  String next = logReader.next();
+                  currentChunk.add(next);
+                  count++;
 
-              int count = 0;
-              while (logReader.hasNext() && !emitter.isDisposed()) {
-                String next = logReader.next();
-                currentChunk.add(next);
-                count++;
-
-                if (count >= CHUNK_SIZE) {
-                  emitter.onNext(currentChunk);
-                  count = 0;
-                  currentChunk = new ArrayList<>();
+                  if (count >= CHUNK_SIZE) {
+                    emitter.onNext(currentChunk);
+                    count = 0;
+                    currentChunk = new ArrayList<>();
+                  }
                 }
-              }
 
-              // Send final chunk if any remaining
-              if (!emitter.isDisposed() && count > 0) {
-                emitter.onNext(currentChunk);
-              }
+                // Send final chunk if any remaining
+                if (!emitter.isDisposed() && count > 0) {
+                  emitter.onNext(currentChunk);
+                }
 
-              if (!emitter.isDisposed()) {
-                mode.postValue(Mode.NORMAL);
-                emitter.onComplete();
-              }
+                if (!emitter.isDisposed()) {
+                  mode.postValue(Mode.NORMAL);
+                  emitter.onComplete();
+                }
 
-              stopwatch.split("lines");
-              stopwatch.stop(TAG);
+                stopwatch.split("lines");
+                stopwatch.stop(TAG);
+              }
+              logDatabase.getReadableDatabase().setTransactionSuccessful();
+            } finally {
+              logDatabase.getReadableDatabase().endTransaction();
             }
           } catch (Exception e) {
             if (!emitter.isDisposed()) {