Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-01 14:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential ANR in debug log viewer.

Browse Source
This commit is contained in:
lisa-signal
2025-08-08 16:23:10 -04:00
committed by Greyson Parrelli
parent 308f4c817f
commit 5e8d72e19e
2 changed files with 20 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
View File

@@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.debuglogsviewer.DebugLogsViewer;
import org.thoughtcrime.securesms.BaseActivity;
import org.thoughtcrime.securesms.R;
@@ -357,27 +358,29 @@ public class SubmitDebugLogActivity extends BaseActivity {
hasPresentedLines = true;
}
int chunkSize = 1000;
int count = 0;
SignalExecutors.BOUNDED.execute(() -> {
int chunkSize = 1000;
int count = 0;
StringBuilder lineBuilder = new StringBuilder();
StringBuilder lineBuilder = new StringBuilder();
for (LogLine line : lines) {
if (line == null) continue;
for (LogLine line : lines) {
if (line == null) continue;
lineBuilder.append(String.format("%s\n", line.getText()));
count++;
lineBuilder.append(String.format("%s\n", line.getText()));
count++;
if (count >= chunkSize) {
DebugLogsViewer.presentLines(logWebView, lineBuilder.toString());
lineBuilder.setLength(0);
count = 0;
if (count >= chunkSize) {
DebugLogsViewer.presentLines(logWebView, lineBuilder.toString());
lineBuilder.setLength(0);
count = 0;
}
}
}
if (lineBuilder.length() > 0) {
DebugLogsViewer.presentLines(logWebView, lineBuilder.toString());
}
if (lineBuilder.length() > 0) {
DebugLogsViewer.presentLines(logWebView, lineBuilder.toString());
}
});
}
private void presentMode(@NonNull SubmitDebugLogViewModel.Mode mode) {