From 4f31f33aef844ef07096d37b337118234e6c3a30 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 23 Sep 2015 01:28:48 -0400 Subject: [PATCH] Added dialog to block phone numbers before they're received --- .../common/BlockedConversationHelper.java | 27 ++++++++ .../QKSMS/receiver/MessagingReceiver.java | 13 +++- .../QKSMS/ui/dialog/BlockedNumberDialog.java | 64 +++++++++++++++++++ .../QKSMS/ui/settings/SettingsFragment.java | 5 ++ QKSMS/src/main/res/values/strings.xml | 5 ++ QKSMS/src/main/res/xml/settings_general.xml | 7 ++ 6 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java index 1a6294a0..985f05e9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/BlockedConversationHelper.java @@ -9,6 +9,7 @@ import android.provider.Telephony; import android.util.Log; import android.view.MenuItem; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.transaction.SmsHelper; @@ -53,6 +54,32 @@ public class BlockedConversationHelper { return prefs.getStringSet(SettingsFragment.BLOCKED_SENDERS, new HashSet()); } + public static void blockFutureConversation(SharedPreferences prefs, String address) { + Set idStrings = prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + idStrings.add(address); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_FUTURE, idStrings).apply(); + } + + public static void unblockFutureConversation(SharedPreferences prefs, String address) { + Set idStrings2 = prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + idStrings2.remove(address); + prefs.edit().putStringSet(SettingsFragment.BLOCKED_FUTURE, idStrings2).apply(); + } + + public static Set getFutureBlockedConversations(SharedPreferences prefs) { + return prefs.getStringSet(SettingsFragment.BLOCKED_FUTURE, new HashSet()); + } + + public static boolean isFutureBlocked(SharedPreferences prefs, String address) { + for (String s : getFutureBlockedConversations(prefs)) { + if (PhoneNumberUtils.compareLoosely(s, address)) { + return true; + } + } + + return false; + } + public static String[] getBlockedConversationArray(SharedPreferences prefs) { Set idStrings = getBlockedConversations(prefs); return idStrings.toArray(new String[idStrings.size()]); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java index a77413a6..25fb08db 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MessagingReceiver.java @@ -3,6 +3,7 @@ package com.moez.QKSMS.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; import android.os.PowerManager; import android.preference.PreferenceManager; @@ -54,9 +55,15 @@ public class MessagingReceiver extends BroadcastReceiver { uri = SmsHelper.addMessageToInbox(context, address, body, date); Message message = new Message(context, uri); - ConversationPrefsHelper prefs = new ConversationPrefsHelper(context, message.getThreadId()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(context, message.getThreadId()); - if (prefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( + if (BlockedConversationHelper.isFutureBlocked(prefs, address)) { + BlockedConversationHelper.unblockFutureConversation(prefs, address); + BlockedConversationHelper.blockConversation(prefs, message.getThreadId()); + message.markSeen(); + + } else if (conversationPrefs.getNotificationsEnabled() && !BlockedConversationHelper.getBlockedConversationIds( PreferenceManager.getDefaultSharedPreferences(context)).contains(message.getThreadId())) { Intent messageHandlerIntent = new Intent(context, NotificationService.class); messageHandlerIntent.putExtra(NotificationService.EXTRA_POPUP, true); @@ -69,7 +76,7 @@ public class MessagingReceiver extends BroadcastReceiver { message.markSeen(); } - if (prefs.getWakePhoneEnabled()) { + if (conversationPrefs.getWakePhoneEnabled()) { PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager.WakeLock wakeLock = pm.newWakeLock((PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP), "MessagingReceiver"); wakeLock.acquire(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java new file mode 100644 index 00000000..93d1729a --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/BlockedNumberDialog.java @@ -0,0 +1,64 @@ +package com.moez.QKSMS.ui.dialog; + +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.view.View; +import android.widget.AdapterView; +import android.widget.TextView; +import com.moez.QKSMS.R; +import com.moez.QKSMS.common.BlockedConversationHelper; +import com.moez.QKSMS.ui.base.QKActivity; +import com.moez.QKSMS.ui.view.QKEditText; + +import java.util.Set; + +public class BlockedNumberDialog { + + public static void showDialog(final QKActivity context) { + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + Set addresses = BlockedConversationHelper.getFutureBlockedConversations(prefs); + + new QKDialog() + .setContext(context) + .setTitle(R.string.pref_block_future) + .setItems(addresses.toArray(new String[addresses.size()]), new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, final View view, int position, long id) { + new QKDialog() + .setContext(context) + .setTitle(R.string.title_unblock_address) + .setMessage(((TextView) view).getText().toString()) + .setPositiveButton(R.string.yes, new View.OnClickListener() { + @Override + public void onClick(View v) { + BlockedConversationHelper.unblockFutureConversation(prefs, ((TextView) view).getText().toString()); + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "remove from future blocked"); + } + }) + .setPositiveButton(R.string.add, new View.OnClickListener() { + @Override + public void onClick(View v) { + final QKEditText editText = new QKEditText(context); + new QKDialog() + .setContext(context) + .setTitle(R.string.title_block_address) + .setCustomView(editText) + .setPositiveButton(R.string.add, new View.OnClickListener() { + @Override + public void onClick(View v) { + if (editText.getText().length() > 0) { + BlockedConversationHelper.blockFutureConversation(prefs, editText.getText().toString()); + } + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "add to future blocked"); + } + }) + .setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), "future blocked conversations"); + } +} 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 1c279e4a..2105102f 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 @@ -35,6 +35,7 @@ import android.widget.Toast; import com.mariussoft.endlessjabber.sdk.EndlessJabberInterface; import com.moez.QKSMS.R; import com.moez.QKSMS.common.AnalyticsManager; +import com.moez.QKSMS.ui.dialog.BlockedNumberDialog; import com.moez.QKSMS.ui.dialog.BubblePreferenceDialog; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.receiver.NightModeAutoReceiver; @@ -113,6 +114,7 @@ public class SettingsFragment extends PreferenceFragment implements public static final String YAPPY = "pref_key_endlessjabber"; public static final String BLOCKED_ENABLED = "pref_key_blocked_enabled"; public static final String BLOCKED_SENDERS = "pref_key_blocked_senders"; + public static final String BLOCKED_FUTURE = "pref_key_block_future"; public static final String MOBILE_ONLY = "pref_key_mobile_only"; public static final String COMPOSE_GROUP = "pref_key_compose_group"; public static final String SPLIT_SMS = "pref_key_split"; @@ -551,6 +553,9 @@ public class SettingsFragment extends PreferenceFragment implements case ICON: ThemeManager.setIcon(mContext); break; + case BLOCKED_FUTURE: + BlockedNumberDialog.showDialog(mContext); + break; case NOTIFICATION_LED_COLOR: mLedColorPickerDialog.show(getActivity().getFragmentManager(), "colorpicker"); break; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 0e440f93..f9b4ec04 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -166,6 +166,8 @@ Enable full support for Yappy Blocked conversations Long-press on a conversation and block to move to blocked inbox and stop notifications + Block future messages + Add additional phone numbers to block Mobile numbers Only show mobile numbers in contact suggestions Automatic emoji @@ -304,6 +306,8 @@ Donate QK Responses + Block number + Unblock number Yes + Add Save diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 0ca65526..a65ceac4 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -96,6 +96,13 @@ android:summary="@string/pref_blocked_conversations_summary" android:title="@string/pref_blocked_conversations" android:widgetLayout="@layout/view_checkbox" /> +