优化：仅测试转发规则与发送通道时Toast提示

pppscn · Jun 13, 2022 · be3617b · be3617b
1 parent bee6017
commit be3617b
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 68 deletions.
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SendUtils.kt
@@ -5,6 +5,7 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.workDataOf
 import com.google.gson.Gson
+import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.LogsAndRuleAndSender
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.database.entity.Sender
@@ -14,6 +15,7 @@ import com.idormy.sms.forwarder.entity.setting.*
 import com.idormy.sms.forwarder.utils.sender.*
 import com.idormy.sms.forwarder.workers.SendWorker
 import com.idormy.sms.forwarder.workers.UpdateLogsWorker
+import com.xuexiang.xui.utils.ResUtils
 import com.xuexiang.xutil.XUtil
 import com.xuexiang.xutil.data.DateUtils
 import java.text.SimpleDateFormat
@@ -121,7 +123,15 @@ object SendUtils {
 
     //更新转发日志状态
     fun updateLogs(logId: Long?, status: Int, response: String) {
-        if (logId == null) return
+        if (logId == null || logId == 0L) {
+            //测试的没有记录ID，这里取巧了
+            if (status == 2) {
+                XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+            } else {
+                XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+            }
+            return
+        }
 
         val sendResponse = SendResponse(logId, status, response)
         val request = OneTimeWorkRequestBuilder<UpdateLogsWorker>()

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/BarkUtils.kt
@@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
 import android.text.TextUtils
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.BarkResult
 import com.idormy.sms.forwarder.entity.setting.BarkSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
 import com.xuexiang.xhttp2.exception.ApiException
-import com.xuexiang.xui.utils.ResUtils
 import java.util.regex.Pattern
 
 @Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
@@ -80,7 +77,7 @@ class BarkUtils {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -89,10 +86,10 @@ class BarkUtils {
                         val resp = Gson().fromJson(response, BarkResult::class.java)
                         if (resp.code == 200L) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkUtils.kt
@@ -4,19 +4,16 @@ import android.text.TextUtils
 import android.util.Base64
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.DingtalkResult
 import com.idormy.sms.forwarder.entity.setting.DingtalkSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
 import com.xuexiang.xhttp2.exception.ApiException
-import com.xuexiang.xui.utils.ResUtils
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 import javax.crypto.Mac
@@ -100,7 +97,7 @@ class DingtalkUtils private constructor() {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -109,10 +106,10 @@ class DingtalkUtils private constructor() {
                         val resp = Gson().fromJson(response, DingtalkResult::class.java)
                         if (resp.errcode == 0L) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/EmailUtils.kt
@@ -7,7 +7,6 @@ import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.setting.EmailSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.idormy.sms.forwarder.utils.mail.Mail
 import com.idormy.sms.forwarder.utils.mail.MailSender
 import com.xuexiang.xui.utils.ResUtils
@@ -133,12 +132,12 @@ class EmailUtils {
                 override fun onError(e: Throwable) {
                     SendUtils.updateLogs(logId, 0, e.message.toString())
                     Log.e("MailSender", e.message.toString())
-                    XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message.toString())
+                    //XToastUtils.error(ResUtils.getString(R.string.request_failed) + e.message.toString())
                 }
 
                 override fun onSuccess() {
                     SendUtils.updateLogs(logId, 2, ResUtils.getString(R.string.request_succeeded))
-                    XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                    //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                 }
             })
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/FeishuUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/FeishuUtils.kt
@@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
 import android.util.Base64
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.FeishuResult
 import com.idormy.sms.forwarder.entity.setting.FeishuSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
 import com.xuexiang.xhttp2.exception.ApiException
-import com.xuexiang.xui.utils.ResUtils
 import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
 import java.util.*
@@ -148,7 +145,7 @@ class FeishuUtils private constructor() {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -157,10 +154,10 @@ class FeishuUtils private constructor() {
                         val resp = Gson().fromJson(response, FeishuResult::class.java)
                         if (resp.code == 0L) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/GotifyUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/GotifyUtils.kt
@@ -2,19 +2,16 @@ package com.idormy.sms.forwarder.utils.sender
 
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.GotifyResult
 import com.idormy.sms.forwarder.entity.setting.GotifySetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
 import com.xuexiang.xhttp2.exception.ApiException
-import com.xuexiang.xui.utils.ResUtils
 
 @Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
 class GotifyUtils {
@@ -58,7 +55,7 @@ class GotifyUtils {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -67,10 +64,10 @@ class GotifyUtils {
                         val resp = Gson().fromJson(response, GotifyResult::class.java)
                         if (resp?.id != null) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/PushplusUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/PushplusUtils.kt
@@ -10,7 +10,6 @@ import com.idormy.sms.forwarder.entity.result.PushplusResult
 import com.idormy.sms.forwarder.entity.setting.PushplusSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
@@ -82,7 +81,7 @@ class PushplusUtils private constructor() {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -91,10 +90,10 @@ class PushplusUtils private constructor() {
                         val resp = Gson().fromJson(response, PushplusResult::class.java)
                         if (resp.code == 200L) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/ServerchanUtils.kt
@@ -3,19 +3,16 @@ package com.idormy.sms.forwarder.utils.sender
 import android.text.TextUtils
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.ServerchanResult
 import com.idormy.sms.forwarder.entity.setting.ServerchanSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xhttp2.XHttp
 import com.xuexiang.xhttp2.cache.model.CacheMode
 import com.xuexiang.xhttp2.callback.SimpleCallBack
 import com.xuexiang.xhttp2.exception.ApiException
-import com.xuexiang.xui.utils.ResUtils
 
 @Suppress("PrivatePropertyName", "UNUSED_PARAMETER", "unused")
 class ServerchanUtils {
@@ -62,7 +59,7 @@ class ServerchanUtils {
                     override fun onError(e: ApiException) {
                         SendUtils.updateLogs(logId, 0, e.displayMessage)
                         Log.e(TAG, e.detailMessage)
-                        XToastUtils.error(e.displayMessage)
+                        //XToastUtils.error(e.displayMessage)
                     }
 
                     override fun onSuccess(response: String) {
@@ -71,10 +68,10 @@ class ServerchanUtils {
                         val resp = Gson().fromJson(response, ServerchanResult::class.java)
                         if (resp?.code == 0L) {
                             SendUtils.updateLogs(logId, 2, response)
-                            XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                            //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         } else {
                             SendUtils.updateLogs(logId, 0, response)
-                            XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                            //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         }
                     }
 

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt
@@ -12,7 +12,6 @@ import com.idormy.sms.forwarder.entity.setting.SmsSetting
 import com.idormy.sms.forwarder.utils.PhoneUtils
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
 import com.xuexiang.xui.utils.ResUtils
 import com.xuexiang.xutil.XUtil
 import com.xuexiang.xutil.net.NetworkUtils
@@ -53,16 +52,16 @@ class SmsUtils {
             val mSubscriptionId: Int = App.SimInfoList[simSlotIndex]?.mSubscriptionId ?: -1
 
             if (ActivityCompat.checkSelfPermission(XUtil.getContext(), Manifest.permission.SEND_SMS) != PackageManager.PERMISSION_GRANTED) {
-                XToastUtils.error(ResUtils.getString(R.string.no_sms_sending_permission))
+                //XToastUtils.error(ResUtils.getString(R.string.no_sms_sending_permission))
                 return
             }
             val res: String? = PhoneUtils.sendSms(mSubscriptionId, setting.mobiles, content)
             if (res == null) {
                 SendUtils.updateLogs(logId, 2, ResUtils.getString(R.string.request_succeeded))
-                XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
             } else {
                 SendUtils.updateLogs(logId, 0, res)
-                XToastUtils.error(ResUtils.getString(R.string.request_failed) + res)
+                //XToastUtils.error(ResUtils.getString(R.string.request_failed) + res)
             }
         }
 

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
@@ -4,15 +4,12 @@ import android.os.Looper
 import android.text.TextUtils
 import android.util.Log
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.database.entity.Rule
 import com.idormy.sms.forwarder.entity.MsgInfo
 import com.idormy.sms.forwarder.entity.result.TelegramResult
 import com.idormy.sms.forwarder.entity.setting.TelegramSetting
 import com.idormy.sms.forwarder.utils.SendUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
-import com.idormy.sms.forwarder.utils.XToastUtils
-import com.xuexiang.xui.utils.ResUtils
 import okhttp3.*
 import java.io.IOException
 import java.net.InetSocketAddress
@@ -106,7 +103,7 @@ class TelegramUtils {
                     SendUtils.updateLogs(logId, 0, e.message.toString())
                     e.printStackTrace()
                     Looper.prepare()
-                    XToastUtils.error("发送失败：" + e.message)
+                    //XToastUtils.error("发送失败：" + e.message)
                     Looper.loop()
                 }
 
@@ -119,12 +116,12 @@ class TelegramUtils {
                     if (resp.ok == true) {
                         SendUtils.updateLogs(logId, 2, responseStr.toString())
                         Looper.prepare()
-                        XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
+                        //XToastUtils.success(ResUtils.getString(R.string.request_succeeded))
                         Looper.loop()
                     } else {
                         SendUtils.updateLogs(logId, 0, responseStr.toString())
                         Looper.prepare()
-                        XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
+                        //XToastUtils.error(ResUtils.getString(R.string.request_failed) + response)
                         Looper.loop()
                     }
                 }