From 4a81c0d0a568b4f0807f36803bdabc19163457b3 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 14 Jun 2022 19:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B5=8B=E8=AF=95TG?=
 =?UTF-8?q?/Webhook=E5=8F=91=E9=80=81=E9=80=9A=E9=81=93=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E8=B0=83=E7=94=A8Toast=E5=BC=95?=
 =?UTF-8?q?=E5=8F=91FC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idormy/sms/forwarder/utils/sender/TelegramUtils.kt    | 6 +++---
 .../com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt
index 11bfee20..07b3f816 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/TelegramUtils.kt
@@ -100,9 +100,9 @@ class TelegramUtils {
             client.newCall(request).enqueue(object : Callback {
 
                 override fun onFailure(call: Call, e: IOException) {
-                    SendUtils.updateLogs(logId, 0, e.message.toString())
                     e.printStackTrace()
                     Looper.prepare()
+                    SendUtils.updateLogs(logId, 0, e.message.toString())
                     //XToastUtils.error("发送失败：" + e.message)
                     Looper.loop()
                 }
@@ -114,13 +114,13 @@ class TelegramUtils {
 
                     val resp = Gson().fromJson(responseStr, TelegramResult::class.java)
                     if (resp.ok == true) {
-                        SendUtils.updateLogs(logId, 2, responseStr.toString())
                         Looper.prepare()
+                        SendUtils.updateLogs(logId, 2, responseStr.toString())
                         //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         Looper.loop()
                     } else {
-                        SendUtils.updateLogs(logId, 0, responseStr.toString())
                         Looper.prepare()
+                        SendUtils.updateLogs(logId, 0, responseStr.toString())
                         //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         Looper.loop()
                     }
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
index c380c93f..b42b70e9 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WebhookUtils.kt
@@ -160,10 +160,10 @@ class WebhookUtils {
 
             client.newCall(requestBuilder.build()).enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
-                    SendUtils.updateLogs(logId, 0, e.message.toString())
-                    //LogUtils.updateLog(logId, 0, e.message)
                     //解决在子线程中调用Toast的异常情况处理
                     Looper.prepare()
+                    e.printStackTrace()
+                    SendUtils.updateLogs(logId, 0, e.message.toString())
                     //XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message)
                     Looper.loop()
                 }
@@ -175,13 +175,13 @@ class WebhookUtils {
 
                     //返回http状态200即为成功
                     if (200 == response.code()) {
-                        SendUtils.updateLogs(logId, 2, responseStr)
                         Looper.prepare()
+                        SendUtils.updateLogs(logId, 2, responseStr)
                         //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         Looper.loop()
                     } else {
-                        SendUtils.updateLogs(logId, 0, responseStr)
                         Looper.prepare()
+                        SendUtils.updateLogs(logId, 0, responseStr)
                         //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         Looper.loop()
                     }