Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition where not all logs would be added to the viewer.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-08-13 21:43:01 -04:00
parent a34ccd8ce7
commit 33f7fdedfa
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.ThreadUtil;
import org.signal.debuglogsviewer.DebugLogsViewer;
import org.thoughtcrime.securesms.BaseActivity;
import org.thoughtcrime.securesms.R;
@@ -44,9 +44,9 @@ import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
public class SubmitDebugLogActivity extends BaseActivity {
@@ -346,27 +346,29 @@ public class SubmitDebugLogActivity extends BaseActivity {
private void subscribeToLogLines() {
Disposable disposable = viewModel.getLogLinesObservable()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::presentLines, throwable -> {
.observeOn(Schedulers.io())
.subscribe(this::appendLines, throwable -> {
// Handle error
this.progressCard.setVisibility(View.GONE);
ThreadUtil.runOnMain(() -> {
this.progressCard.setVisibility(View.GONE);
});
});
disposables.add(disposable);
}
private void presentLines(@NonNull List<String> lines) {
warningBanner.setVisibility(View.VISIBLE);
submitButton.setVisibility(View.VISIBLE);
SignalExecutors.BOUNDED.execute(() -> {
StringBuilder lineBuilder = new StringBuilder();
for (String line : lines) {
lineBuilder.append(line).append("\n");
}
DebugLogsViewer.appendLines(logWebView, lineBuilder.toString());
private void appendLines(@NonNull List<String> lines) {
ThreadUtil.runOnMain(() -> {
warningBanner.setVisibility(View.VISIBLE);
submitButton.setVisibility(View.VISIBLE);
});
StringBuilder lineBuilder = new StringBuilder();
for (String line : lines) {
lineBuilder.append(line).append("\n");
}
DebugLogsViewer.appendLines(logWebView, lineBuilder.toString());
}
private void presentMode(@NonNull SubmitDebugLogViewModel.Mode mode) {