Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-18 07:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use transaction when loading logs.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-03-10 16:53:21 +00:00
committed by Cody Henthorne
parent c5de7581ee
commit cee33a23ac
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
View File

@@ -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,8 +70,9 @@ public class SubmitDebugLogViewModel extends ViewModel {
}
List<String> currentChunk = new ArrayList<>();
try (LogDatabase.LogTable.CursorReader logReader = (LogDatabase.LogTable.CursorReader) LogDatabase.getInstance(AppDependencies.getApplication()).logs().getAllBeforeTime(firstViewTime)) {
logDatabase.getReadableDatabase().beginTransactionNonExclusive();
try {
try (LogDatabase.LogTable.CursorReader logReader = (LogDatabase.LogTable.CursorReader) logDatabase.logs().getAllBeforeTime(firstViewTime)) {
stopwatch.split("initial-query");
int count = 0;
@@ -99,6 +101,10 @@ public class SubmitDebugLogViewModel extends ViewModel {
stopwatch.split("lines");
stopwatch.stop(TAG);
}
logDatabase.getReadableDatabase().setTransactionSuccessful();
} finally {
logDatabase.getReadableDatabase().endTransaction();
}
} catch (Exception e) {
if (!emitter.isDisposed()) {
Log.e(TAG, "Error loading log lines", e);