From 8f1af5afc079f0849a1fe93db18bf8e2e6f91020 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 28 Jan 2022 20:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9D=A5=E7=94=B5?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E7=9A=84=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=88=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8D=A1=E6=A7=BD=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=97=B6=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=8D=A1?=
 =?UTF-8?q?=E6=A7=BD1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/receiver/PhoneStateReceiver.java  | 12 +++++++++---
 .../idormy/sms/forwarder/utils/PhoneUtils.java  | 17 ++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
index 2b5586bd..7d0d382f 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
@@ -96,9 +96,15 @@ public class PhoneStateReceiver extends BroadcastReceiver {
         Log.d(TAG, callInfo.toString());
         String name = callInfo.getName();
         String viaNumber = callInfo.getViaNumber(); //来源号码
+
+        //卡槽判断：获取卡槽失败时，默认为卡槽1
+        String simInfo = "";
+        int simId = 1;
         Log.d(TAG, "getSubscriptionId = " + callInfo.getSubscriptionId()); //TODO:这里的SubscriptionId跟短信的不一样
-        int simId = SimUtil.getSimIdBySubscriptionId(callInfo.getSubscriptionId());
-        String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先
+        if (callInfo.getSubscriptionId() != -1) {
+            simId = SimUtil.getSimIdBySubscriptionId(callInfo.getSubscriptionId());
+        }
+        simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先
         simInfo = "SIM" + simId + "_" + simInfo;
 
         if (TextUtils.isEmpty(name)) {
@@ -136,7 +142,7 @@ public class PhoneStateReceiver extends BroadcastReceiver {
         String str = context.getString(R.string.linkman) + name + "\n";
         if (!TextUtils.isEmpty(viaNumber)) str += context.getString(R.string.via_number) + viaNumber + "\n";
         str += context.getString(R.string.mandatory_type);
-        if (type == 3) return str + context.getString(R.string.received_call);
+        if (type == 1) return str + context.getString(R.string.received_call);
         if (type == 2) return str + context.getString(R.string.local_outgoing_call);
         return str + context.getString(R.string.missed_call);
     }
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
index 64de8866..f2654f7b 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
@@ -539,31 +539,38 @@ public class PhoneUtils {
         }
 
         try {
-            String[] columns = {CallLog.Calls.CACHED_NAME, //通话记录的联系人
+            /*String[] columns = {CallLog.Calls.CACHED_NAME, //通话记录的联系人
                     CallLog.Calls.NUMBER, //通话记录的电话号码
                     CallLog.Calls.DATE, //通话记录的日期
                     CallLog.Calls.DURATION, //通话时长
                     CallLog.Calls.TYPE, //通话类型
                     (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N ? CallLog.Calls.VIA_NUMBER : ""), //来源号码
                     "simid" //卡槽ID
-            };
+            };*/
 
             CallInfo callInfo;
-            Cursor cursor = context.getContentResolver().query(CallLog.Calls.CONTENT_URI, columns,
+            Cursor cursor = context.getContentResolver().query(CallLog.Calls.CONTENT_URI, null,
                     CallLog.Calls.NUMBER + " like ?",
                     new String[]{phoneNumber + "%"}, CallLog.Calls.DEFAULT_SORT_ORDER);
             Log.i(TAG, "cursor count:" + cursor.getCount());
 
             //noinspection LoopStatementThatDoesntLoop
             while (cursor.moveToNext()) {
+                int simColumnIndex = -1;
+                if (cursor.getColumnIndex("simid") != -1) {
+                    simColumnIndex = cursor.getColumnIndex("simid");
+                } else if (cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID) != -1) {
+                    simColumnIndex = cursor.getColumnIndex(CallLog.Calls.PHONE_ACCOUNT_ID);
+                }
+
                 callInfo = new CallInfo(
                         cursor.getString(cursor.getColumnIndex(CallLog.Calls.CACHED_NAME)),  //姓名
                         cursor.getString(cursor.getColumnIndex(CallLog.Calls.NUMBER)),  //号码
                         cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATE)), //获取通话日期
                         cursor.getInt(cursor.getColumnIndex(CallLog.Calls.DURATION)),//获取通话时长，值为多少秒
                         cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE)), //获取通话类型：1.呼入2.呼出3.未接
-                        (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N ? cursor.getString(cursor.getColumnIndex(CallLog.Calls.VIA_NUMBER)) : null), //来源号码
-                        cursor.getInt(cursor.getColumnIndex("simid")) //卡槽id
+                        (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N && cursor.getColumnIndex("via_number") != -1 ? cursor.getString(cursor.getColumnIndex(CallLog.Calls.VIA_NUMBER)) : null), //来源号码
+                        simColumnIndex != -1 ? cursor.getInt(simColumnIndex) : -1 //卡槽id
                 );
                 Log.d(TAG, callInfo.toString());
                 cursor.close();