Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Show toast if log file is empty.

Browse Source
This commit is contained in:
akwizgran
2020-07-04 12:02:37 +01:00
parent 81ed5978d6
commit ca5c18ece3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsActivity.java
View File

@@ -19,6 +19,7 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -104,9 +105,16 @@ public class SettingsActivity extends BriarActivity {
private void copyLog(boolean old, OutputStreamProvider osp) { private void copyLog(boolean old, OutputStreamProvider osp) {
ioExecutor.execute(() -> { ioExecutor.execute(() -> {
try { try {
PrintWriter w = new PrintWriter(osp.getOutputStream());
File logDir = getApplication().getDir("log", MODE_PRIVATE); File logDir = getApplication().getDir("log", MODE_PRIVATE);
for (String line : logManager.getPersistedLog(logDir, old)) { List<String> lines = logManager.getPersistedLog(logDir, old);
if (lines.isEmpty()) {
runOnUiThreadUnlessDestroyed(() ->
Toast.makeText(getApplication(), "Log is empty",
LENGTH_LONG).show());
return;
}
PrintWriter w = new PrintWriter(osp.getOutputStream());
for (String line : lines) {
w.println(line); w.println(line);
} }
w.close(); w.close();