Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +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

54
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,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()) {