littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-04 01:47:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

整理：删除多余的判断

Browse Source
This commit is contained in:
Naccl 2022-01-15 17:58:29 +08:00
parent 874cb7f957
commit 86f3960300
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsHubVo.java
View File

@ -30,11 +30,7 @@ public class SmsHubVo implements Serializable {
this.msgId = UUID.randomUUID().toString(); this.msgId = UUID.randomUUID().toString();
if (channel != null) { if (channel != null) {
String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先 String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先
if (!simInfo.isEmpty()) { simInfo = "SIM" + simId + ":" + simInfo;
simInfo = "SIM" + simId + ":" + simInfo;
} else {
simInfo = SimUtil.getSimInfo(simId);
}
this.channel = simInfo; this.channel = simInfo;
} }
this.content = content; this.content = content;

6
app/src/main/java/com/idormy/sms/forwarder/receiver/PhoneStateReceiver.java
View File

@ -81,11 +81,7 @@ public class PhoneStateReceiver extends BroadcastReceiver {
Log.d(TAG, "getSubscriptionId = " + callInfo.getSubscriptionId()); Log.d(TAG, "getSubscriptionId = " + callInfo.getSubscriptionId());
int simId = SimUtil.getSimIdBySubscriptionId(callInfo.getSubscriptionId()); int simId = SimUtil.getSimIdBySubscriptionId(callInfo.getSubscriptionId());
String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先 String simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); //自定义备注优先
if (!simInfo.isEmpty()) { simInfo = "SIM" + simId + "_" + simInfo;
simInfo = "SIM" + simId + "_" + simInfo;
} else {
simInfo = SimUtil.getSimInfo(simId);
}
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
List<PhoneBookEntity> contacts = ContactHelper.getInstance().getContactByNumber(context, phoneNumber); List<PhoneBookEntity> contacts = ContactHelper.getInstance().getContactByNumber(context, phoneNumber);

6
app/src/main/java/com/idormy/sms/forwarder/receiver/SmsBroadcastReceiver.java
View File

@ -53,11 +53,7 @@ public class SmsBroadcastReceiver extends BroadcastReceiver {
//自定义备注优先 //自定义备注优先
simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1(); simInfo = simId == 2 ? SettingUtil.getAddExtraSim2() : SettingUtil.getAddExtraSim1();
if (!simInfo.isEmpty()) { simInfo = "SIM" + simId + "_" + simInfo;
simInfo = "SIM" + simId + "_" + simInfo;
} else {
simInfo = SimUtil.getSimInfo(simId);
}
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "获取接收手机号失败：" + e.getMessage()); Log.e(TAG, "获取接收手机号失败：" + e.getMessage());
} }