From a545fddb3375514cc01d49f32092f867b3d439e5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 24 Oct 2017 22:59:07 +0900
Subject: [PATCH] Disable timestamps in Syncthing logs (fixes #960)

---
 .../nutomic/syncthingandroid/activities/LogActivity.java    | 2 +-
 .../nutomic/syncthingandroid/service/SyncthingRunnable.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
index e618b1a8..c0f60da4 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
@@ -130,7 +130,7 @@ public class LogActivity extends SyncthingActivity {
         try {
             ProcessBuilder pb;
             if (syncthingLog) {
-                pb = new ProcessBuilder("/system/bin/logcat", "-t", "300", "-v", "raw", "-s", "SyncthingNativeCode");
+                pb = new ProcessBuilder("/system/bin/logcat", "-t", "300", "-v", "time", "-s", "SyncthingNativeCode");
             } else {
                 pb = new ProcessBuilder("/system/bin/logcat", "-t", "300", "-v", "time", "*:i ps:s art:s");
             }
diff --git a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
index 6abc34f5..367c9b52 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@@ -73,13 +73,13 @@ public class SyncthingRunnable implements Runnable {
         mUseRoot = mPreferences.getBoolean(Constants.PREF_USE_ROOT, false) && Shell.SU.available();
         switch (command) {
             case generate:
-                mCommand = new String[]{ mSyncthingBinary.getPath(), "-generate", mContext.getFilesDir().toString() };
+                mCommand = new String[]{ mSyncthingBinary.getPath(), "-generate", mContext.getFilesDir().toString(), "-logflags=0" };
                 break;
             case main:
-                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-no-browser" };
+                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-no-browser", "-logflags=0" };
                 break;
             case reset:
-                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset" };
+                mCommand = new String[]{ mSyncthingBinary.getPath(), "-home", mContext.getFilesDir().toString(), "-reset", "-logflags=0" };
                 break;
             default:
                 throw new InvalidParameterException("Unknown command option");