From f9a3608500497be80d9655fbd2f2695c488938c2 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 14 Jun 2022 11:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=B8=8D=E5=A1=AB=E5=86=99=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E7=9B=B4=E6=8E=A5=E8=BF=9B=E5=85=A5=20=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=8E=A7=E5=88=B6=C2=B7=E5=AE=A2=E6=88=B7=E7=AB=AF=20?=
 =?UTF-8?q?->=20=E4=B8=80=E9=94=AE=E6=8D=A2=E6=96=B0=E6=9C=BA=20->=20?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idormy/sms/forwarder/fragment/ClientFragment.kt   |  2 +-
 .../sms/forwarder/fragment/client/CloneFragment.kt    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt
index 9d690c03..e7ded512 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/ClientFragment.kt
@@ -132,7 +132,7 @@ class ClientFragment : BaseFragment<FragmentClientBinding?>(),
 
     override fun onItemClick(itemView: View, item: PageInfo, position: Int) {
         try {
-            if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
+            if (item.name != ResUtils.getString(R.string.api_clone) && !CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
                 XToastUtils.error(getString(R.string.invalid_service_address))
                 serverConfig = null
                 return
diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CloneFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CloneFragment.kt
index fe791642..0358842f 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CloneFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CloneFragment.kt
@@ -18,6 +18,7 @@ import com.idormy.sms.forwarder.core.BaseFragment
 import com.idormy.sms.forwarder.databinding.FragmentClientCloneBinding
 import com.idormy.sms.forwarder.entity.CloneInfo
 import com.idormy.sms.forwarder.server.model.BaseResponse
+import com.idormy.sms.forwarder.utils.CommonUtils
 import com.idormy.sms.forwarder.utils.HttpServerUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
 import com.idormy.sms.forwarder.utils.XToastUtils
@@ -220,6 +221,11 @@ class CloneFragment : BaseFragment<FragmentClientCloneBinding?>(), View.OnClickL
 
     //推送配置
     private fun pushData() {
+        if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
+            XToastUtils.error(getString(R.string.invalid_service_address))
+            return
+        }
+
         pushCountDownHelper?.start()
 
         val requestUrl: String = HttpServerUtils.serverAddress + "/clone/push"
@@ -273,6 +279,11 @@ class CloneFragment : BaseFragment<FragmentClientCloneBinding?>(), View.OnClickL
 
     //拉取配置
     private fun pullData() {
+        if (!CommonUtils.checkUrl(HttpServerUtils.serverAddress)) {
+            XToastUtils.error(getString(R.string.invalid_service_address))
+            return
+        }
+        
         exportCountDownHelper?.start()
 
         val requestUrl: String = HttpServerUtils.serverAddress + "/clone/pull"