From c64d427c4df3f030be27d30b255138d4110fa05d Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:49:37 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E5=8E=BB=E9=99=A4=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E6=8A=A5=E5=91=8A=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/activities/MainActivity.kt     | 31 ++++++-------------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
index 4762e77a..f8587399 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
@@ -19,17 +19,17 @@ import com.google.android.material.navigation.NavigationBarItemView
 import com.google.android.material.navigation.NavigationBarMenuView
 import com.google.android.material.navigation.NavigationBarView
 import com.google.android.material.snackbar.Snackbar
-import com.huanchengfly.tieba.post.*
+import com.huanchengfly.tieba.post.BaseApplication
+import com.huanchengfly.tieba.post.R
 import com.huanchengfly.tieba.post.adapters.ViewPagerAdapter
 import com.huanchengfly.tieba.post.api.Error
-import com.huanchengfly.tieba.post.api.LiteApi
 import com.huanchengfly.tieba.post.api.interfaces.CommonCallback
-import com.huanchengfly.tieba.post.api.retrofit.doIfFailure
-import com.huanchengfly.tieba.post.api.retrofit.doIfSuccess
+import com.huanchengfly.tieba.post.dpToPxFloat
 import com.huanchengfly.tieba.post.fragments.MainForumListFragment
 import com.huanchengfly.tieba.post.fragments.MessageFragment
 import com.huanchengfly.tieba.post.fragments.MyInfoFragment
 import com.huanchengfly.tieba.post.fragments.PersonalizedFeedFragment
+import com.huanchengfly.tieba.post.goToActivity
 import com.huanchengfly.tieba.post.interfaces.Refreshable
 import com.huanchengfly.tieba.post.models.MyInfoBean
 import com.huanchengfly.tieba.post.services.NotifyJobService
@@ -37,8 +37,6 @@ import com.huanchengfly.tieba.post.utils.*
 import com.huanchengfly.tieba.post.widgets.MyViewPager
 import com.microsoft.appcenter.crashes.Crashes
 import com.microsoft.appcenter.distribute.Distribute
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -181,16 +179,9 @@ open class MainActivity : BaseActivity(), NavigationBarView.OnItemSelectedListen
                     showDialog {
                         setTitle(R.string.title_dialog_crash)
                         setMessage(R.string.message_dialog_crash)
-                        setPositiveButton(R.string.button_copy_crash_link) { _, _ ->
-                            launch(IO + job) {
-                                LiteApi.instance.pastebinAsync(
-                                    "崩溃报告 ${
-                                        formatDateTime(
-                                            "yyyy-MM-dd HH:mm:ss",
-                                            it.appErrorTime.time
-                                        )
-                                    }",
-                                    """
+                        setPositiveButton(R.string.button_copy_crash) { _, _ ->
+                            TiebaUtil.copyText(
+                                this@MainActivity, """
                                         App 版本：${device.appVersion}
                                         系统版本：${device.osVersion}
                                         机型：${device.oemName} ${device.model}
@@ -198,13 +189,9 @@ open class MainActivity : BaseActivity(), NavigationBarView.OnItemSelectedListen
                                         崩溃：
                                         ${it.stackTrace}
                                     """.trimIndent()
-                                ).doIfSuccess {
-                                    TiebaUtil.copyText(this@MainActivity, it)
-                                }.doIfFailure {
-                                    toastShort(R.string.toast_get_link_failed)
-                                }
-                            }
+                            )
                         }
+                        setNegativeButton(R.string.button_cancel, null)
                     }
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f287f8a..a567b8ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -503,4 +503,5 @@
     <string name="summary_battery_optimization_old_android_version">旧版 Android 无“电池优化”</string>
     <string name="summary_battery_optimization_ignored">“电池优化”已忽略</string>
     <string name="toast_ignore_battery_optimization_already">已忽略电池优化</string>
+    <string name="button_copy_crash">复制崩溃报告</string>
 </resources>