From 44d00258bf0c7786ec6db9c19809db126e6c8172 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 4 Mar 2018 18:05:16 +0100
Subject: Log view performance tweak and limiting

---
 .../pacien/tincapp/activities/ViewLogActivity.kt   | 36 +++++++++++++++-------
 app/src/main/res/values/strings.xml                |  1 +
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt
index d9fb733..ebdd22a 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/ViewLogActivity.kt
@@ -10,16 +10,22 @@ import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Executor
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.service.TincVpnService
+import java.util.*
+import kotlin.concurrent.timer
 
 /**
  * @author pacien
  */
 class ViewLogActivity : BaseActivity() {
   companion object {
+    private const val LOG_LINES = 250
     private const val LOG_LEVEL = 5
     private const val NEW_LINE = "\n"
+    private const val UPDATE_INTERVAL = 250L // ms
   }
 
+  private val log = LinkedList<String>()
+  private var logUpdateTimer: Timer? = null
   private var logger: Process? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -59,32 +65,40 @@ class ViewLogActivity : BaseActivity() {
   }
 
   private fun startLogging(level: Int = LOG_LEVEL) {
-    text_log.append(NEW_LINE)
-    text_log.append(resources.getString(R.string.message_log_level_set, level))
-    text_log.append(NEW_LINE)
-
+    appendLog(resources.getString(R.string.message_log_level_set, level))
     Tinc.log(TincVpnService.getCurrentNetName()!!, level).let { process ->
       logger = process
       Executor.runAsyncTask { printLog(process) }
     }
+    logUpdateTimer = timer(period = UPDATE_INTERVAL, action = { updateLog() })
   }
 
   private fun stopLogging() {
     logger?.destroy()
     logger = null
+    logUpdateTimer?.cancel()
+    logUpdateTimer?.purge()
+    logUpdateTimer = null
+    appendLog(resources.getString(R.string.message_log_paused))
+    updateLog()
   }
 
   private fun printLog(logger: Process) {
     logger.inputStream?.use { inputStream ->
       inputStream.bufferedReader().useLines { lines ->
-        lines.forEach {
-          text_log.post {
-            text_log.append(NEW_LINE)
-            text_log.append(it)
-            text_log.append(NEW_LINE)
-          }
-        }
+        lines.forEach { appendLog(it) }
       }
     }
   }
+
+  private fun appendLog(line: String) = synchronized(this) {
+    if (log.size >= LOG_LINES) log.removeFirst()
+    log.addLast(line)
+  }
+
+  private fun updateLog() = synchronized(this) {
+    log.joinToString(NEW_LINE + NEW_LINE, NEW_LINE, NEW_LINE).let {
+      text_log.post { text_log.text = it }
+    }
+  }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a412ae..6eaed13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,6 +83,7 @@
 	<string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\n\nCheck the logs for more details.</string>
 	<string name="message_loading">Loading…</string>
 	<string name="message_log_level_set">Log level set to %1$d.</string>
+	<string name="message_log_paused">Logging paused.</string>
 
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
-- 
cgit v1.2.3