diff --git a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java index 6e38fbdf..c98d1b58 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/sender/SendUtil.java @@ -68,7 +68,7 @@ public class SendUtil { LogUtil.init(context); String key = "SIM" + simId; - List ruleList = RuleUtil.getRule(null, key, type); + List ruleList = RuleUtil.getRule(null, key, type, "1"); //只取已启用的规则 if (!ruleList.isEmpty()) { Log.d(TAG, ruleList.toString()); SenderUtil.init(context); diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleUtil.java index 53e2abf8..e6d32cdc 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/RuleUtil.java +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/RuleUtil.java @@ -92,6 +92,10 @@ public class RuleUtil { } public static List getRule(Long id, String key, String type) { + return getRule(id, key, type, null); + } + + public static List getRule(Long id, String key, String type, String status) { // Define a projection that specifies which columns from the database // you will actually use after this query. String[] projection = { @@ -123,6 +127,11 @@ public class RuleUtil { selectionArgList.add(type); } + if (status != null) { + selection += " and " + RuleTable.RuleEntry.COLUMN_NAME_STATUS + " = ? "; + selectionArgList.add(status); + } + if (key != null) { // Define 'where' part of query. if (key.equals("SIM1") || key.equals("SIM2")) {