From 81e1cd472945f3e798ee2efc0fe2bf442fb0a4af Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 21 Dec 2023 15:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8D=E5=86=99`L?=
 =?UTF-8?q?og`=E7=B1=BB=EF=BC=8C=E5=B0=86`Log.*`=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BB=A5=E4=BE=BF=E6=8E=92=E6=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#269?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/fragment/SettingsFragment.kt    | 22 ++++++++-----------
 app/src/main/res/values-en/strings.xml        |  2 ++
 app/src/main/res/values-zh-rCN/strings.xml    |  2 ++
 app/src/main/res/values-zh-rTW/strings.xml    |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
index 63975189..62be0ac8 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/SettingsFragment.kt
@@ -300,12 +300,12 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding?>(), View.OnClickL
                                 val srcDirPath = App.context.cacheDir.absolutePath + "/logs"
                                 val destDirPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).path + "/SmsForwarder"
                                 if (FileUtils.copyDir(srcDirPath, destDirPath, null)) {
-                                    XToastUtils.success("导出日志成功！存放路径：$destDirPath")
+                                    XToastUtils.success(getString(R.string.log_export_success) + destDirPath)
                                 } else {
-                                    XToastUtils.error("导出日志失败！")
+                                    XToastUtils.error(getString(R.string.log_export_failed))
                                 }
                             } catch (e: Exception) {
-                                XToastUtils.error("导出日志失败！")
+                                XToastUtils.error(getString(R.string.log_export_failed) + e.message)
                                 e.printStackTrace()
                             }
                         }
@@ -1038,7 +1038,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding?>(), View.OnClickL
 
         rgMainLanguages.setOnCheckedChangeListener { _, checkedId ->
             // 是否需要重启
-            val restart = when (checkedId) {
+            when (checkedId) {
                 R.id.rb_main_language_auto -> {
                     // 跟随系统
                     MultiLanguages.clearAppLanguage(requireContext())
@@ -1058,18 +1058,14 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding?>(), View.OnClickL
                     // 英语
                     MultiLanguages.setAppLanguage(requireContext(), LocaleContract.getEnglishLocale())
                 }
-
-                else -> false
             }
 
             // 重启应用
-            if (restart) {
-                XToastUtils.toast(R.string.multi_languages_toast)
-                val intent = Intent(App.context, MainActivity::class.java)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                startActivity(intent)
-                requireActivity().finish()
-            }
+            XToastUtils.toast(R.string.multi_languages_toast)
+            val intent = Intent(App.context, MainActivity::class.java)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            startActivity(intent)
+            requireActivity().finish()
         }
     }
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 7a19849b..be9aeff2 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1295,4 +1295,6 @@
     <string name="simplified_chinese">简体中文</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="english">English</string>
+    <string name="log_export_failed">Log Export Failed!</string>
+    <string name="log_export_success">Log exported successfully! Path:</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7155be8d..bc95a381 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1296,4 +1296,6 @@
     <string name="simplified_chinese">简体中文</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="english">English</string>
+    <string name="log_export_failed">导出日志失败！</string>
+    <string name="log_export_success">导出日志成功！存放路径：</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b1e5cabc..7d74bee6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1296,4 +1296,6 @@
     <string name="simplified_chinese">简体中文</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="english">English</string>
+    <string name="log_export_failed">日誌匯出失敗！</string>
+    <string name="log_export_success">日誌匯出成功！儲存路徑：</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 94150636..aa48efab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1296,4 +1296,6 @@
     <string name="simplified_chinese">简体中文</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="english">English</string>
+    <string name="log_export_failed">导出日志失败！</string>
+    <string name="log_export_success">导出日志成功！存放路径：</string>
 </resources>