Merge pull request #3247 from deltachat/adb/issue-3194

limit number of lines to fetch from logcat
deltachat · Aug 19, 2024 · 595e364 · 595e364
2 parents 11adc08 + 9880cb2
commit 595e364
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java b/src/main/java/org/thoughtcrime/securesms/LogViewFragment.java
@@ -128,26 +128,24 @@ public File saveLogFile(File outputDir) {
   }
 
   private static String grabLogcat(LogViewFragment fragment) {
+    String command = "logcat -v threadtime -d -t 10000";
+    if (!Prefs.isDeveloperModeEnabled(fragment.getActivity())) {
+      command += " *:I";
+    }
     try {
-      final Process         process        = Runtime.getRuntime().exec("logcat -v threadtime -d");
+      final Process         process        = Runtime.getRuntime().exec(command);
       final BufferedReader  bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
       final StringBuilder   log            = new StringBuilder();
       final String          separator      = System.getProperty("line.separator");
-      final boolean devMode = Prefs.isDeveloperModeEnabled(fragment.getActivity());
 
       String line;
       while ((line = bufferedReader.readLine()) != null) {
         line = line.replaceFirst(" (\\d+) E ", " $1 \uD83D\uDD34 ");
         line = line.replaceFirst(" (\\d+) W ", " $1 \uD83D\uDFE0 ");
         line = line.replaceFirst(" (\\d+) I ", " $1 \uD83D\uDD35 ");
-        String debugLine = line.replaceFirst(" (\\d+) D ", " $1 \uD83D\uDFE2 ");
-        if (debugLine.equals(line)) { // not a debug entry
-          log.append(line);
-          log.append(separator);
-        } else if (devMode) {
-          log.append(debugLine);
-          log.append(separator);
-        }
+        line = line.replaceFirst(" (\\d+) D ", " $1 \uD83D\uDFE2 ");
+        log.append(line);
+        log.append(separator);
       }
       return log.toString();
     } catch (Exception e) {