From 59c1946c8b1764540856d7ae2a1f56ddc3c0acaf Mon Sep 17 00:00:00 2001 From: Coldice Ray Esedra Date: Tue, 21 Feb 2017 15:39:28 +0800 Subject: [PATCH 1/3] fixed issue#645 that notification will show again when dismissed if the app is not the default message app. --- .../java/com/moez/QKSMS/transaction/NotificationManager.java | 4 +++- .../main/java/com/moez/QKSMS/ui/dialog/DefaultSmsHelper.java | 4 ++++ build.gradle | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java index 3fa981ce..9a3037a5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -36,6 +36,7 @@ import com.moez.QKSMS.model.SlideshowModel; import com.moez.QKSMS.receiver.RemoteMessagingReceiver; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; +import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.messagelist.MessageItem; import com.moez.QKSMS.ui.messagelist.MessageListActivity; import com.moez.QKSMS.ui.popup.QKComposeActivity; @@ -244,7 +245,8 @@ public class NotificationManager { dismissOld(context, conversations); // If there are no messages, don't try to create a notification - if (conversations.size() == 0) { + // If this app is not default message app, don't try to create a notification either + if (conversations.size() == 0||!(new DefaultSmsHelper(context, 0).isDefault())) { return; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/DefaultSmsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/DefaultSmsHelper.java index 0f92a9f3..ba8f45d5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/DefaultSmsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/DefaultSmsHelper.java @@ -84,4 +84,8 @@ public class DefaultSmsHelper implements ActionClickListener { return snackbarType; } + + public boolean isDefault() { + return mIsDefault; + } } diff --git a/build.gradle b/build.gradle index 4179ad65..3c9a7b1d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,6 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.3' } } From 45c1796953e58db4aff82fef8d044c9e83b63d63 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 1 May 2017 22:16:47 -0400 Subject: [PATCH 2/3] Update NotificationManager.java --- .../java/com/moez/QKSMS/transaction/NotificationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java index 9a3037a5..7dfc1058 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -246,7 +246,7 @@ public class NotificationManager { // If there are no messages, don't try to create a notification // If this app is not default message app, don't try to create a notification either - if (conversations.size() == 0||!(new DefaultSmsHelper(context, 0).isDefault())) { + if (conversations.size() == 0 || !new DefaultSmsHelper(context, 0).isDefault()) { return; } From 5fe8181da91048da9439794c613cefe1664c5273 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 1 May 2017 22:17:07 -0400 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3c9a7b1d..4179ad65 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,6 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.1.3' } }