Upload file

Author: Zenlua

pio/src/main/java/com/projectkr/shell/SplashActivity.kt

@@ -32,6 +32,7 @@ import java.io.BufferedReader
 import java.io.DataOutputStream
 import java.io.File
 import java.util.Locale
+import android.os.Looper
 
 class SplashActivity : AppCompatActivity() {
 
@@ -187,6 +188,8 @@ class SplashActivity : AppCompatActivity() {
     }
 
     private fun gotoHome() {
+        if (isFinishing || isDestroyed) return
+    
         startActivity(
             if (intent?.getBooleanExtra("JumpActionPage", false) == true)
                 Intent(this, ActionPage::class.java).apply { putExtras(intent!!) }
@@ -197,9 +200,59 @@ class SplashActivity : AppCompatActivity() {
 
     private fun runBeforeStartSh(config: KrScriptConfig, hasRoot: Boolean) {
 
-        Thread {
+        val updateHandler = UpdateLogViewHandler(binding.startStateText) {
+            gotoHome()
+        }
+    
+        BeforeStartThread(
+            this,
+            config,
+            hasRoot,
+            updateHandler
+        ).start()
+    }
+    
+    private class UpdateLogViewHandler(
+        private val logView: TextView,
+        private val onExit: () -> Unit
+    ) {
+        private val handler = Handler(Looper.getMainLooper())
+        private val rows = ArrayList<String>()
+        private var ignored = false
+    
+        fun onLogOutput(log: String) {
+            handler.post {
+                synchronized(rows) {
+                    if (rows.size > 6) {
+                        rows.removeAt(0)
+                        ignored = true
+                    }
+                    rows.add(log)
+                    logView.text = rows.joinToString(
+                        "\n",
+                        if (ignored) "……\n" else ""
+                    ).trim()
+                }
+            }
+        }
+    
+        fun onExit() {
+            handler.post {
+                onExit()
+            }
+        }
+    }
+    
+    private class BeforeStartThread(
+        private val context: Context,
+        private val config: KrScriptConfig,
+        private val hasRoot: Boolean,
+        private val updateHandler: UpdateLogViewHandler
+    ) : Thread() {
 
+        override fun run() {
             try {
+    
                 val process = if (hasRoot)
                     ShellExecutor.getSuperUserRuntime()
                 else
@@ -210,67 +263,49 @@ class SplashActivity : AppCompatActivity() {
                     val outputStream = DataOutputStream(process.outputStream)
 
                     ScriptEnvironmen.executeShell(
-                        this@SplashActivity,
+                        context,
                         outputStream,
                         config.beforeStartSh,
                         config.variables,
                         null,
                         "pio-splash"
                     )
 
-                    // Đọc stdout
-                    Thread {
-                        process.inputStream.bufferedReader().forEachLine { line ->
-                            runOnUiThread { onLogOutput(line) }
-                        }
-                    }.start()
+                    StreamReadThread(
+                        process.inputStream.bufferedReader(),
+                        updateHandler
+                    ).start()
 
-                    // Đọc stderr
-                    Thread {
-                        process.errorStream.bufferedReader().forEachLine { line ->
-                            runOnUiThread { onLogOutput(line) }
-                        }
-                    }.start()
+                    StreamReadThread(
+                        process.errorStream.bufferedReader(),
+                        updateHandler
+                    ).start()
 
-                    // Chờ shell kết thúc
                     process.waitFor()
                 }
 
             } catch (e: Exception) {
                 e.printStackTrace()
             }
 
-            // Khi shell exit mới vào Home
-            runOnUiThread {
-                gotoHome()
-            }
-    
-        }.start()
-    }
-
-    // Buffer lưu 4 dòng cuối
-    private val rows = mutableListOf<String>()
-    private var ignored = false
-    private val maxLines = 5
-    private val handler = android.os.Handler(android.os.Looper.getMainLooper())
-
-    private fun readStreamAsync(reader: BufferedReader) {
-        Thread {
-            reader.forEachLine { line ->
-                onLogOutput(line)
-            }
-        }.start()
+            // Quan trọng: giống code cũ
+            updateHandler.onExit()
+        }
     }
-
-    private fun onLogOutput(log: String) {
-        handler.post {
-            synchronized(rows) {
-                if (rows.size >= maxLines) {
-                    rows.removeAt(0)
-                    ignored = true
+    
+    private class StreamReadThread(
+        private val reader: BufferedReader,
+        private val updateHandler: UpdateLogViewHandler
+    ) : Thread() {
+    
+        override fun run() {
+            try {
+                var line: String?
+                while (true) {
+                    line = reader.readLine() ?: break
+                    updateHandler.onLogOutput(line)
                 }
-                rows.add(log)
-                binding.startStateText.text = rows.joinToString("\n", if (ignored) "……\n" else "")
+            } catch (_: Exception) {
             }
         }
     }