From 51e845dceac46cd4bb649cc3f069d18dee94f819 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 12 Jun 2022 16:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Av3.0.2=E6=9D=A5?=
 =?UTF-8?q?=E7=94=B5=E8=BD=AC=E5=8F=91=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/receiver/PhoneStateReceiver.kt    | 17 +----------------
 .../idormy/sms/forwarder/utils/PhoneUtils.kt    |  7 +++----
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.kt b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.kt
index cf42e762..7547b072 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.kt
@@ -13,7 +13,6 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.workDataOf
 import com.google.gson.Gson
-import com.idormy.sms.forwarder.App
 import com.idormy.sms.forwarder.R
 import com.idormy.sms.forwarder.entity.CallInfo
 import com.idormy.sms.forwarder.entity.MsgInfo
@@ -147,22 +146,8 @@ class PhoneStateReceiver : BroadcastReceiver() {
             return
         }
 
-        //获取卡槽信息
-        if (App.SimInfoList.isEmpty()) {
-            App.SimInfoList = PhoneUtils.getSimMultiInfo()
-        }
-        Log.e(TAG, "SimInfoList = " + App.SimInfoList.toString())
-
         //卡槽id：-1=获取失败、0=卡槽1、1=卡槽2
-        var simSlot = -1
-        Log.e(TAG, "getSubscriptionId = " + callInfo.simId)
-        if (callInfo.simId != -1 && App.SimInfoList.isNotEmpty()) {
-            for (simInfo in App.SimInfoList.values) {
-                if (simInfo.mSubscriptionId == callInfo.simId) {
-                    simSlot = simInfo.mSimSlotIndex
-                }
-            }
-        }
+        val simSlot = callInfo.simId
         //获取卡槽信息
         val simInfo = when (simSlot) {
             0 -> "SIM1_" + SettingUtils.extraSim1
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
index 9c0034be..c4f5dc4a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
@@ -218,13 +218,12 @@ class PhoneUtils private constructor() {
                     val indexViaNumber = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && cursor.getColumnIndex("via_number") != -1) cursor.getColumnIndex("via_number") else -1
                     var isSimId = false
                     var indexSimId = -1
-                    if (cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID) != -1
+                    if (cursor.getColumnIndex("simid") != -1) {
+                        indexSimId = cursor.getColumnIndex("simid")
+                    } else if (cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID) != -1
                         && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
                     ) {
                         indexSimId = cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID)
-                    } else if (cursor.getColumnIndex("simid") != -1) {
-                        indexSimId = cursor.getColumnIndex("simid")
-                        //isSimId = true
                     }
                     do {
                         val callInfo = CallInfo(