From 2ae0885c4db1274b3fe4eb02412379988ca10dba Mon Sep 17 00:00:00 2001 From: l3d00m Date: Mon, 24 Aug 2015 14:48:06 +0200 Subject: [PATCH] Added option for #130 --- .../com/moez/QKSMS/common/ConversationPrefsHelper.java | 4 ++++ .../com/moez/QKSMS/transaction/NotificationManager.java | 1 + .../java/com/moez/QKSMS/ui/settings/SettingsFragment.java | 1 + QKSMS/src/main/res/values/strings.xml | 2 ++ QKSMS/src/main/res/xml/settings.xml | 3 +++ QKSMS/src/main/res/xml/settings_notifications.xml | 8 ++++++++ 6 files changed, 19 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java index 1d12d079..5c303238 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java @@ -61,6 +61,10 @@ public class ConversationPrefsHelper { return getBoolean(SettingsFragment.NOTIFICATION_CALL_BUTTON, false); } + public boolean getDimissedReadEnabled() { + return getBoolean(SettingsFragment.DISMISSED_READ, false); + } + public void putString(String key, String value) { mConversationPrefs.edit().putString(key, value).apply(); } 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 8a623a95..a2167250 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/NotificationManager.java @@ -474,6 +474,7 @@ public class NotificationManager { .addAction(R.drawable.ic_accept, sRes.getString(R.string.read), readPI) .extend(WearableIntentReceiver.getSingleConversationExtender(context, message.mContact, message.mAddress, threadId)) .setDeleteIntent(seenPI); + if (conversationPrefs.getDimissedReadEnabled()){builder.setDeleteIntent(readPI);} if (conversationPrefs.getCallButtonEnabled()) { Intent callIntent = new Intent(Intent.ACTION_CALL); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 831a3f69..467f4aea 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -142,6 +142,7 @@ public class SettingsFragment extends PreferenceFragment implements public static final String MMS_CONTACT_SUPPORT = "pref_key_mms_contact_support"; public static final String SIMPLE_PREFS = "pref_key_simple"; public static final String DONATE = "pref_key_donate"; + public static final String DISMISSED_READ = "pref_key_dismiss_read"; /** * @deprecated */ diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index fbe109d5..f6e72cfe 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -207,6 +207,8 @@ Vibrate when new messages are received Call button Call the sender of a message right from the notification + Mark as read + Mark as read when notification has been cleared Delayed messaging Wait before sending your messages, so you have a chance to review them diff --git a/QKSMS/src/main/res/xml/settings.xml b/QKSMS/src/main/res/xml/settings.xml index 2514dd89..ea71779e 100644 --- a/QKSMS/src/main/res/xml/settings.xml +++ b/QKSMS/src/main/res/xml/settings.xml @@ -117,6 +117,9 @@ + + \ No newline at end of file