From b6f95f654021b95cfd6794e2fb2baa8e62add0aa Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 3 Mar 2014 18:52:25 +0000
Subject: [PATCH] Show all logcat ouput for the current process in
TestingActivity.
---
.../org/briarproject/android/TestingActivity.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/TestingActivity.java b/briar-android/src/org/briarproject/android/TestingActivity.java
index 0ff9381ce9..96138b7e54 100644
--- a/briar-android/src/org/briarproject/android/TestingActivity.java
+++ b/briar-android/src/org/briarproject/android/TestingActivity.java
@@ -32,6 +32,7 @@ import java.util.Scanner;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.logging.Logger;
+import java.util.regex.Pattern;
import javax.inject.Inject;
@@ -290,18 +291,22 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
StringBuilder log = new StringBuilder();
try {
- Runtime runtime = Runtime.getRuntime();
- Process process = runtime.exec("logcat -d -s TorPlugin");
+ int pid = android.os.Process.myPid();
+ Pattern pattern = Pattern.compile("./[^(]+\\( *" + pid + "\\):.*");
+ Process process = Runtime.getRuntime().exec("logcat -d *:I");
Scanner scanner = new Scanner(process.getInputStream());
while(scanner.hasNextLine()) {
- log.append(scanner.nextLine());
- log.append('\n');
+ String line = scanner.nextLine();
+ if(pattern.matcher(line).matches()) {
+ log.append(line);
+ log.append('\n');
+ }
}
scanner.close();
} catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
- statusMap.put("Tor log:", log.toString());
+ statusMap.put("Debugging log:", log.toString());
return Collections.unmodifiableMap(statusMap);
}
--
GitLab