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

Load the current and previous session's logs.

Browse Source
This commit is contained in:
akwizgran
2020-07-03 11:10:28 +01:00
parent 2d88819e80
commit a63619ab47
3 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java
View File

@@ -95,16 +95,11 @@ public class BriarReportPrimer implements ReportPrimer {
}
customData.put("Log", sb.toString());
sb = new StringBuilder();
try {
File logDir = ctx.getDir("log", MODE_PRIVATE);
for (String line : logManager.getPersistedLog(logDir)) {
sb.append(line).append('\n');
}
} catch (IOException e) {
sb.append("Could not recover persisted log: ").append(e);
}
customData.put("Persisted log", sb.toString());
customData.put("Persisted log",
getPersistedLog(ctx, logManager, false));
customData.put("Previous persisted log",
getPersistedLog(ctx, logManager, true));
// System memory
Object o = ctx.getSystemService(ACTIVITY_SERVICE);
@@ -270,6 +265,20 @@ public class BriarReportPrimer implements ReportPrimer {
return unmodifiableMap(customData);
}
private String getPersistedLog(Context ctx,
PersistentLogManager logManager, boolean old) {
File logDir = ctx.getDir("log", MODE_PRIVATE);
StringBuilder sb = new StringBuilder();
try {
for (String line : logManager.getPersistedLog(logDir, old)) {
sb.append(line).append('\n');
}
} catch (IOException e) {
sb.append("Could not recover persisted log: ").append(e);
}
return sb.toString();
}
}
private static class SingleShotAndroidExecutor extends Thread {