From c20350da13238e3f3d8e3d43ebf190898bb972ac Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 20 Mar 2024 10:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A`=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1`=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6`?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E7=8A=B6=E6=80=81`=EF=BC=9A=E5=BB=B6?=
 =?UTF-8?q?=E8=BF=9F5=E7=A7=92=E8=8E=B7=E5=8F=96WiFi=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=88=E7=BB=99=E5=A4=9F=E6=90=9C=E7=B4=A2=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=89=20#429?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt  | 5 +----
 .../java/com/idormy/sms/forwarder/workers/NetworkWorker.kt  | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt b/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt
index cbd8d91d..d8ebfc1e 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt
@@ -65,13 +65,10 @@ class NetworkChangeReceiver : BroadcastReceiver() {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     TaskUtils.dataSimSlot = getSlotIndex(context) + 1
                 }
+                TaskUtils.wifiSsid = ""
             } else if (networkInfo.type == ConnectivityManager.TYPE_WIFI) {
                 //WiFi网络
                 TaskUtils.networkState = 2
-                //获取WiFi名称
-                val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-                val wifiInfo = wifiManager.connectionInfo
-                TaskUtils.wifiSsid = wifiInfo.ssid.replace("\"", "")
             }
         } else {
             Log.d(TAG, "Network Disconnected")
diff --git a/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt b/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt
index 1225f1c5..a711de2a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt
@@ -1,6 +1,7 @@
 package com.idormy.sms.forwarder.workers
 
 import android.content.Context
+import android.net.wifi.WifiManager
 import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequestBuilder
@@ -100,6 +101,11 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
 
                     //WiFi
                     2 -> {
+                        //获取WiFi名称
+                        val wifiManager = App.context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+                        val wifiInfo = wifiManager.connectionInfo
+                        TaskUtils.wifiSsid = wifiInfo.ssid.replace("\"", "")
+
                         if (networkSetting.wifiSsid.isNotEmpty() && TaskUtils.wifiSsid != networkSetting.wifiSsid) {
                             Log.d(TAG, "TASK-${task.id}：wifiSsid is not match, networkSetting = $networkSetting")
                             continue