From 86f3960300d0e78b5773f01ba94e667eac7674b7 Mon Sep 17 00:00:00 2001 From: Naccl Date: Sat, 15 Jan 2022 17:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9A=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java | 6 +----- .../idormy/sms/forwarder/receiver/PhoneStateReceiver.java | 6 +----- .../idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java index 0bea966a..b08adff2 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java +++ b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java @@ -30,11 +30,7 @@ public class SmsHubVo implements Serializable { this.msgId = UUID.randomUUID().toString(); if (channel != null) { String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先 - if (!simInfo.isEmpty()) { - simInfo = "SIM" + simId + ":" + simInfo; - } else { - simInfo = SimUtil.getSimInfo(simId); - } + simInfo = "SIM" + simId + ":" + simInfo; this.channel = simInfo; } this.content = content; 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 335199bb..e9f14f3b 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 @@ -81,11 +81,7 @@ public class PhoneStateReceiver extends BroadcastReceiver { Log.d(TAG, "getSubscriptionId = " + callInfo.getSubscriptionId()); int simId = SimUtil.getSimIdBySubscriptionId(callInfo.getSubscriptionId()); String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先 - if (!simInfo.isEmpty()) { - simInfo = "SIM" + simId + "_" + simInfo; - } else { - simInfo = SimUtil.getSimInfo(simId); - } + simInfo = "SIM" + simId + "_" + simInfo; if (TextUtils.isEmpty(name)) { List contacts = ContactHelper.getInstance().getContactByNumber(context, phoneNumber); diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java b/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java index 0cf2e0ec..9a894462 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java +++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java @@ -53,11 +53,7 @@ public class SmsBroadcastReceiver extends BroadcastReceiver { //自定义备注优先 simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); - if (!simInfo.isEmpty()) { - simInfo = "SIM" + simId + "_" + simInfo; - } else { - simInfo = SimUtil.getSimInfo(simId); - } + simInfo = "SIM" + simId + "_" + simInfo; } catch (Exception e) { Log.e(TAG, "获取接收手机号失败：" + e.getMessage()); }