From abb514df8c1bf999fbdad0459e6e469e09136234 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 8 Jun 2022 09:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=85=A8=E9=83=A8=E9=80=9A=E7=9F=A5=EF=BC=88?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=96=B9=E6=A1=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/idormy/sms/forwarder/service/NotifyService.kt     | 8 ++++++++
 .../java/com/idormy/sms/forwarder/workers/SendWorker.kt   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt b/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt
index 753ccea0..9ec6ffcf 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/service/NotifyService.kt
@@ -105,6 +105,14 @@ class NotifyService : NotificationListenerService()/*, LifecycleOwner*/ {
                         }
                     }
                 }*/
+            //自动消除全部通知（临时方案）
+            if (SettingUtils.enableCancelAppNotify) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    cancelNotification(sbn.key)
+                } else {
+                    cancelNotification(sbn.packageName, sbn.tag, sbn.id)
+                }
+            }
 
         } catch (e: Exception) {
             Log.e(TAG, "Parsing Notification failed: " + e.message.toString())
diff --git a/app/src/main/java/com/idormy/sms/forwarder/workers/SendWorker.kt b/app/src/main/java/com/idormy/sms/forwarder/workers/SendWorker.kt
index 306e46b8..8e0c3aa4 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/workers/SendWorker.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/workers/SendWorker.kt
@@ -30,7 +30,7 @@ class SendWorker(
                 val msgInfoJson = inputData.getString(Worker.sendMsgInfo)
                 val msgInfo = Gson().fromJson(msgInfoJson, MsgInfo::class.java)
 
-                //TODO:过滤重复消息机制
+                // 过滤重复消息机制
                 if (SettingUtils.duplicateMessagesLimits > 0) {
                     val key = CipherUtils.md5(msgInfo.type + msgInfo.from + msgInfo.content)
                     val timestamp: Long = System.currentTimeMillis() / 1000L