From 1f75928ac3aab30118032097ccc49c4505b5aef7 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sat, 22 Jan 2022 21:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/idormy/sms/forwarder/sender/SendUtil.java   | 2 +-
 .../java/com/idormy/sms/forwarder/utils/RuleUtil.java    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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<RuleModel> ruleList = RuleUtil.getRule(null, key, type);
+        List<RuleModel> 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<RuleModel> getRule(Long id, String key, String type) {
+        return getRule(id, key, type, null);
+    }
+
+    public static List<RuleModel> 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")) {