修复：通道测试闪退

2025-08-02 17:07:41 +08:00 · 2023-02-05 19:24:30 +08:00 · 2023-02-05 19:24:30 +08:00 · 1630fb18e9
commit 1630fb18e9
parent 0b3b39a802
15 changed files with 18 additions and 67 deletions
--- 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
@ -24,7 +24,7 @@ class BarkUtils {
        fun sendMsg(
            setting: BarkSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -107,8 +107,5 @@ class BarkUtils {

        }

-        fun sendMsg(setting: BarkSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkGroupRobotUtils.kt
@ -29,7 +29,7 @@ class DingtalkGroupRobotUtils private constructor() {
        fun sendMsg(
            setting: DingtalkGroupRobotSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -117,8 +117,5 @@ class DingtalkGroupRobotUtils private constructor() {

        }

-        fun sendMsg(setting: DingtalkGroupRobotSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/DingtalkInnerRobotUtils.kt
@ -35,7 +35,7 @@ class DingtalkInnerRobotUtils private constructor() {
        fun sendMsg(
            setting: DingtalkInnerRobotSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -122,7 +122,7 @@ class DingtalkInnerRobotUtils private constructor() {
        private fun sendTextMsg(
            setting: DingtalkInnerRobotSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -221,9 +221,5 @@ class DingtalkInnerRobotUtils private constructor() {
                })
        }

-        fun sendMsg(setting: DingtalkInnerRobotSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
-
    }
 }
--- 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
@ -20,7 +20,7 @@ class EmailUtils {
        fun sendMsg(
            setting: EmailSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -149,8 +149,5 @@ class EmailUtils {

        }

-        fun sendMsg(setting: EmailSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/FeishuAppUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/FeishuAppUtils.kt
@ -27,7 +27,7 @@ class FeishuAppUtils private constructor() {
        fun sendMsg(
            setting: FeishuAppSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -80,7 +80,7 @@ class FeishuAppUtils private constructor() {
        private fun sendTextMsg(
            setting: FeishuAppSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -143,10 +143,6 @@ class FeishuAppUtils private constructor() {
                })
        }

-        fun sendMsg(setting: FeishuAppSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
-
        private fun jsonInnerStr(string: String?): String {
            if (string == null) return "null"

--- 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
@ -82,7 +82,7 @@ class FeishuUtils private constructor() {
        fun sendMsg(
            setting: FeishuSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -182,8 +182,5 @@ class FeishuUtils private constructor() {
            return if (jsonStr.length >= 2) jsonStr.substring(1, jsonStr.length - 1) else jsonStr
        }

-        fun sendMsg(setting: FeishuSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -22,7 +22,7 @@ class GotifyUtils {
        fun sendMsg(
            setting: GotifySetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -84,8 +84,5 @@ class GotifyUtils {

        }

-        fun sendMsg(setting: GotifySetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -26,7 +26,7 @@ class PushplusUtils private constructor() {
        fun sendMsg(
            setting: PushplusSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -99,8 +99,5 @@ class PushplusUtils private constructor() {

        }

-        fun sendMsg(setting: PushplusSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -23,7 +23,7 @@ class ServerchanUtils {
        fun sendMsg(
            setting: ServerchanSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -77,8 +77,5 @@ class ServerchanUtils {

        }

-        fun sendMsg(setting: ServerchanSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -25,7 +25,7 @@ class SmsUtils {
        fun sendMsg(
            setting: SmsSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -73,8 +73,5 @@ class SmsUtils {
            }
        }

-        fun sendMsg(setting: SmsSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -29,7 +29,7 @@ class TelegramUtils private constructor() {
        fun sendMsg(
            setting: TelegramSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -136,10 +136,6 @@ class TelegramUtils private constructor() {

        }

-        fun sendMsg(setting: TelegramSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
-
        private fun htmlEncode(source: String?): String {
            if (source == null) {
                return ""
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/UrlSchemeUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/UrlSchemeUtils.kt
@ -25,7 +25,7 @@ class UrlSchemeUtils private constructor() {
        fun sendMsg(
            setting: UrlSchemeSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -74,8 +74,5 @@ class UrlSchemeUtils private constructor() {

        }

-        fun sendMsg(setting: UrlSchemeSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- 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
@ -31,7 +31,7 @@ class WebhookUtils {
        fun sendMsg(
            setting: WebhookSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -207,8 +207,5 @@ class WebhookUtils {
            return if (jsonStr.length >= 2) jsonStr.substring(1, jsonStr.length - 1) else jsonStr
        }

-        fun sendMsg(setting: WebhookSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkAgentUtils.kt
@ -35,7 +35,7 @@ class WeworkAgentUtils private constructor() {
        fun sendMsg(
            setting: WeworkAgentSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -119,7 +119,7 @@ class WeworkAgentUtils private constructor() {
        private fun sendTextMsg(
            setting: WeworkAgentSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -205,9 +205,5 @@ class WeworkAgentUtils private constructor() {
                })
        }

-        fun sendMsg(setting: WeworkAgentSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
-
    }
 }
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkRobotUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/WeworkRobotUtils.kt
@ -22,7 +22,7 @@ class WeworkRobotUtils private constructor() {
        fun sendMsg(
            setting: WeworkRobotSetting,
            msgInfo: MsgInfo,
-            rule: Rule?,
+            rule: Rule? = null,
            senderIndex: Int = 0,
            logId: Long = 0L,
            msgId: Long = 0L
@ -76,8 +76,5 @@ class WeworkRobotUtils private constructor() {

        }

-        fun sendMsg(setting: WeworkRobotSetting, msgInfo: MsgInfo) {
-            sendMsg(setting, msgInfo)
-        }
    }
 }