From c7166ae3ba91bcaa34e037f18f54e011a16daf8b Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 17 Jan 2024 09:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=AE=B0=E5=BD=95cr?=
 =?UTF-8?q?ash=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/Release.yml                 |  6 ++++--
 .github/workflows/Weekly_Build.yml            |  6 ++++--
 .../main/java/com/idormy/sms/forwarder/App.kt |  5 +++++
 .../com/idormy/sms/forwarder/utils/Log.kt     | 21 ++++++++++++-------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index a339ba41..6d83eb10 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -23,9 +23,11 @@ jobs:
       - uses: actions/checkout@v4
       # 设置jdk环境为11
       - name: set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'zulu'
+          java-version: '11'
+          java-package: jdk
       # 获取打包秘钥
       - name: Checkout Android Keystore
         uses: actions/checkout@v4
diff --git a/.github/workflows/Weekly_Build.yml b/.github/workflows/Weekly_Build.yml
index 37a3e7d6..53e018e9 100644
--- a/.github/workflows/Weekly_Build.yml
+++ b/.github/workflows/Weekly_Build.yml
@@ -30,9 +30,11 @@ jobs:
           delete_workflow_pattern: 'Weekly Build'
       # 设置jdk环境为11
       - name: set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'zulu'
+          java-version: '11'
+          java-package: jdk
       # 获取打包秘钥
       - name: Checkout Android Keystore
         uses: actions/checkout@v4
diff --git a/app/src/main/java/com/idormy/sms/forwarder/App.kt b/app/src/main/java/com/idormy/sms/forwarder/App.kt
index 23bf5bdf..7f3483ea 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/App.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/App.kt
@@ -100,6 +100,11 @@ class App : Application(), CactusCallback, Configuration.Provider by Core {
 
     override fun onCreate() {
         super.onCreate()
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            isDebug = true
+            e.printStackTrace()
+            Log.e(TAG, "onCreate: $e")
+        }
         try {
             context = applicationContext
             initLibs()
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/Log.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/Log.kt
index 5106dfc1..b2daa222 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/Log.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/Log.kt
@@ -46,18 +46,23 @@ object Log {
 
         if (!App.isDebug) return
 
-        createLogFile()
-
-        logFile?.let { file ->
+        Thread {
             try {
-                val logTimeStamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()).format(Date())
-                val logWriter = FileWriter(file, true)
-                logWriter.append("$logTimeStamp | $level | $tag | $message\n\n")
-                logWriter.close()
+                createLogFile()
+                logFile?.let { file ->
+                    try {
+                        val logTimeStamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()).format(Date())
+                        val logWriter = FileWriter(file, true)
+                        logWriter.append("$logTimeStamp | $level | $tag | $message\n\n")
+                        logWriter.close()
+                    } catch (e: Exception) {
+                        AndroidLog.e(TAG, "Error writing to file: ${e.message}")
+                    }
+                }
             } catch (e: Exception) {
                 AndroidLog.e(TAG, "Error writing to file: ${e.message}")
             }
-        }
+        }.start()
     }
 
     fun v(tag: String, message: String) {