From 32b79c4cbf17a0c5eead6c902b3256e7dfd58bdc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 25 Jun 2016 17:17:03 -0400 Subject: [PATCH 1/9] Added preferences for auto-delete feature --- .../com/moez/QKSMS/enums/QKPreference.java | 4 +++ .../QKSMS/ui/settings/SettingsFragment.java | 18 +++++++++++ QKSMS/src/main/res/values/strings.xml | 6 ++++ QKSMS/src/main/res/xml/settings.xml | 12 +++++-- QKSMS/src/main/res/xml/settings_general.xml | 31 +++++++++++++++++-- 5 files changed, 67 insertions(+), 4 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index 8c4c0601..8e549802 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -43,6 +43,10 @@ public enum QKPreference { DELIVERY_TOAST("pref_key_delivery_toast", true), DELIVERY_VIBRATE("pref_key_delivery_vibrate", true), + DELETE_OLD_MESSAGES("pref_key_delete_old_messages", false), + DELETE_UNREAD_MESSAGES("pref_key_delete_old_unread_messages", "7"), // This type of preference only accepts strings + DELETE_READ_MESSAGES("pref_key_delete_old_read_messages", "7"), + AUTO_EMOJI("pref_key_auto_emoji", false), TEXT_FORMATTING("pref_key_markdown_enabled", false), STRIP_UNICODE("pref_key_strip_unicode", false), 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 13eb28e3..2552ca1a 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 @@ -105,6 +105,8 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String DELIVERY_REPORTS = "pref_key_delivery"; public static final String DELIVERY_TOAST = "pref_key_delivery_toast"; public static final String DELIVERY_VIBRATE = "pref_key_delivery_vibrate"; + public static final String DELETE_UNREAD_MESSAGES = "pref_key_delete_old_unread_messages"; + public static final String DELETE_READ_MESSAGES = "pref_key_delete_old_read_messages"; 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"; @@ -284,6 +286,16 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O font_weight.setSummary(mFontWeights[i == 2 ? 0 : 1]); } + EditTextPreference deleteUnread = (EditTextPreference) findPreference(DELETE_UNREAD_MESSAGES); + if (deleteUnread != null) { + deleteUnread.setSummary(mContext.getString(R.string.pref_delete_old_messages_unread_summary, mContext.getString(QKPreference.DELETE_UNREAD_MESSAGES))); + } + + EditTextPreference deleteRead = (EditTextPreference) findPreference(DELETE_READ_MESSAGES); + if (deleteRead != null) { + deleteRead.setSummary(mContext.getString(R.string.pref_delete_old_messages_read_summary, mContext.getString(QKPreference.DELETE_READ_MESSAGES))); + } + Preference day_start = findPreference(DAY_START); if (day_start != null) { day_start.setSummary(DateFormatter.getSummaryTimestamp(mContext, mPrefs.getString(DAY_START, "6:00"))); @@ -440,6 +452,12 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case NIGHT_START: updateAlarmManager(mContext, true); break; + case DELETE_UNREAD_MESSAGES: + preference.setSummary(mContext.getString(R.string.pref_delete_old_messages_unread_summary, newValue)); + break; + case DELETE_READ_MESSAGES: + preference.setSummary(mContext.getString(R.string.pref_delete_old_messages_read_summary, newValue)); + break; case YAPPY: if ((Boolean) newValue) { try { diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index b60fddf2..d6cd3981 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -169,6 +169,12 @@ Show a short toast to indicate a message being delivered Vibrate Vibrate on message delivery + Delete old messages + Automatically delete messages once they\'re old enough + Unread messages + Automatically delete unread messages after %s days + Read messages + Automatically delete read messages after %s days Yappy integration Enable full support for Yappy Blocked conversations diff --git a/QKSMS/src/main/res/xml/settings.xml b/QKSMS/src/main/res/xml/settings.xml index d4547efe..36085a35 100644 --- a/QKSMS/src/main/res/xml/settings.xml +++ b/QKSMS/src/main/res/xml/settings.xml @@ -3,8 +3,7 @@ - + @@ -73,6 +72,15 @@ + + + diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index c968353f..14fba766 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -47,6 +47,33 @@ android:title="@string/pref_delivery_vibrate" android:widgetLayout="@layout/view_switch" /> + + + + + @@ -147,12 +174,12 @@ android:title="@string/pref_key_timestamp_delay" /> + android:widgetLayout="@layout/view_switch" /> Date: Mon, 27 Jun 2016 23:17:06 -0400 Subject: [PATCH 2/9] Set up alarm to run every day and delete old messages --- QKSMS/src/main/AndroidManifest.xml | 1 + .../java/com/moez/QKSMS/QKSMSAppBase.java | 2 + .../com/moez/QKSMS/common/QKPreferences.java | 47 +++++++++++++++++ .../com/moez/QKSMS/enums/QKPreference.java | 9 ++-- .../QKSMS/receiver/AutoDeleteReceiver.java | 50 +++++++++++++++++++ .../com/moez/QKSMS/receiver/BootReceiver.java | 2 + .../java/com/moez/QKSMS/ui/MainActivity.java | 3 ++ .../com/moez/QKSMS/ui/base/QKActivity.java | 30 ++--------- .../ConversationListAdapter.java | 3 +- .../ui/messagelist/MessageListFragment.java | 5 +- .../QKSMS/ui/settings/SettingsFragment.java | 5 +- 11 files changed, 121 insertions(+), 36 deletions(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/QKPreferences.java create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 2706bbc3..4d023563 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -450,6 +450,7 @@ + diff --git a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java index d13bcbba..19a1a49b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java @@ -36,6 +36,7 @@ import com.android.volley.toolbox.Volley; import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.common.LifecycleHandler; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.common.google.DraftCache; import com.moez.QKSMS.common.google.PduLoaderManager; import com.moez.QKSMS.common.google.ThumbnailManager; @@ -102,6 +103,7 @@ public class QKSMSAppBase extends MultiDexApplication { LayoutManager.init(this); NotificationManager.init(this); LiveViewManager.init(this); + QKPreferences.init(this); activePendingMessages(); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/QKPreferences.java b/QKSMS/src/main/java/com/moez/QKSMS/common/QKPreferences.java new file mode 100644 index 00000000..7bd45bb7 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/QKPreferences.java @@ -0,0 +1,47 @@ +package com.moez.QKSMS.common; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import com.moez.QKSMS.enums.QKPreference; + +public abstract class QKPreferences { + + private static SharedPreferences sPrefs; + + public static void init(Context context) { + sPrefs = PreferenceManager.getDefaultSharedPreferences(context); + } + + public static boolean getBoolean(QKPreference preference) { + return sPrefs.getBoolean(preference.getKey(), (boolean) preference.getDefaultValue()); + } + + public static void setBoolean(QKPreference preference, boolean newValue) { + sPrefs.edit().putBoolean(preference.getKey(), newValue).apply(); + } + + public static int getInt(QKPreference preference) { + return sPrefs.getInt(preference.getKey(), (int) preference.getDefaultValue()); + } + + public static void setInt(QKPreference preference, int newValue) { + sPrefs.edit().putInt(preference.getKey(), newValue).apply(); + } + + public static long getLong(QKPreference preference) { + return sPrefs.getLong(preference.getKey(), (int) preference.getDefaultValue()); + } + + public static void setLong(QKPreference preference, long newValue) { + sPrefs.edit().putLong(preference.getKey(), newValue).apply(); + } + + public static String getString(QKPreference preference) { + return sPrefs.getString(preference.getKey(), (String) preference.getDefaultValue()); + } + + public static void setString(QKPreference preference, String newValue) { + sPrefs.edit().putString(preference.getKey(), newValue).apply(); + } +} \ No newline at end of file diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index 8e549802..32b53c70 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -43,9 +43,9 @@ public enum QKPreference { DELIVERY_TOAST("pref_key_delivery_toast", true), DELIVERY_VIBRATE("pref_key_delivery_vibrate", true), - DELETE_OLD_MESSAGES("pref_key_delete_old_messages", false), - DELETE_UNREAD_MESSAGES("pref_key_delete_old_unread_messages", "7"), // This type of preference only accepts strings - DELETE_READ_MESSAGES("pref_key_delete_old_read_messages", "7"), + AUTO_DELETE("pref_key_delete_old_messages", false), + AUTO_DELETE_UNREAD("pref_key_delete_old_unread_messages", "7"), // This type of preference only accepts strings + AUTO_DELETE_READ("pref_key_delete_old_read_messages", "7"), AUTO_EMOJI("pref_key_auto_emoji", false), TEXT_FORMATTING("pref_key_markdown_enabled", false), @@ -100,7 +100,8 @@ public enum QKPreference { CONVERSATION_THEME("conversation_theme"), // Storage - COMPOSE_DRAFT("compose_draft", ""); + COMPOSE_DRAFT("compose_draft", ""), + LAST_AUTO_DELETE_CHECK("last_auto_delete_check", 0); private String mKey; private Object mDefaultValue; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java new file mode 100644 index 00000000..aa5a9450 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java @@ -0,0 +1,50 @@ +package com.moez.QKSMS.receiver; + +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; +import com.moez.QKSMS.common.QKPreferences; +import com.moez.QKSMS.enums.QKPreference; + +import java.util.Calendar; + +import static android.content.Context.ALARM_SERVICE; + +public class AutoDeleteReceiver extends BroadcastReceiver { + private static final String TAG = "AutoDeleteService"; + + @Override + public void onReceive(Context context, Intent intent) { + Log.i(TAG, "onReceive"); + + Calendar last = Calendar.getInstance(); + last.setTimeInMillis(QKPreferences.getLong(QKPreference.LAST_AUTO_DELETE_CHECK)); + + Calendar current = Calendar.getInstance(); + + // Continue if the auto delete setting is enabled, and we haven't done a purge today + if (QKPreferences.getBoolean(QKPreference.AUTO_DELETE) && (last.getTimeInMillis() == 0 || + current.get(Calendar.DAY_OF_YEAR) != last.get(Calendar.DAY_OF_YEAR) || + current.get(Calendar.YEAR) != last.get(Calendar.YEAR))) { + Log.i(TAG, "Ready to delete old messages"); + QKPreferences.setLong(QKPreference.LAST_AUTO_DELETE_CHECK, System.currentTimeMillis()); + } else { + Log.i(TAG, "Not going to delete old messages"); + } + } + + public static void setupAutoDeleteAlarm(Context context) { + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(System.currentTimeMillis()); + calendar.set(Calendar.HOUR_OF_DAY, 3); // We want this service to run when the phone is not likely being used + + Intent intent = new Intent(context, AutoDeleteReceiver.class); + PendingIntent pIntent = PendingIntent.getBroadcast(context, 9237, intent, PendingIntent.FLAG_UPDATE_CURRENT); + + AlarmManager alarm = (AlarmManager) context.getSystemService(ALARM_SERVICE); + alarm.setInexactRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pIntent); + } +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/BootReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/BootReceiver.java index 77e11c7c..6d64e683 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/BootReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/BootReceiver.java @@ -15,5 +15,7 @@ public class BootReceiver extends BroadcastReceiver { NotificationManager.create(context); SettingsFragment.updateAlarmManager(context, PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SettingsFragment.NIGHT_AUTO, false)); + + AutoDeleteReceiver.setupAutoDeleteAlarm(context); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index b4567f94..8b5658c9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -30,6 +30,7 @@ import com.moez.QKSMS.common.google.DraftCache; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.enums.QKPreference; +import com.moez.QKSMS.receiver.AutoDeleteReceiver; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; @@ -100,6 +101,8 @@ public class MainActivity extends QKActivity { //Adds a small/non intrusive snackbar that asks the user to rate the app SnackEngage.from(this).withSnack(new QKRateSnack().withDuration(BaseSnack.DURATION_LONG)) .build().engageWhenAppropriate(); + + AutoDeleteReceiver.setupAutoDeleteAlarm(this); } /** diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index 814241c9..2bed240f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -27,10 +27,10 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.common.utils.ColorUtils; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.search.SearchFragment; import com.moez.QKSMS.ui.settings.SettingsActivity; import com.moez.QKSMS.ui.view.QKTextView; @@ -62,12 +62,12 @@ public abstract class QKActivity extends AppCompatActivity { mProgressDialog.setCancelable(false); LiveViewManager.registerView(QKPreference.TINTED_STATUS, this, key -> { - mStatusTintEnabled = getBoolean(QKPreference.TINTED_STATUS) && + mStatusTintEnabled = QKPreferences.getBoolean(QKPreference.TINTED_STATUS) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; }); LiveViewManager.registerView(QKPreference.TINTED_NAV, this, key -> { - mNavigationTintEnabled = getBoolean(QKPreference.TINTED_NAV) && + mNavigationTintEnabled = QKPreferences.getBoolean(QKPreference.TINTED_NAV) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; }); } @@ -296,28 +296,4 @@ public abstract class QKActivity extends AppCompatActivity { public RequestQueue getRequestQueue() { return ((QKSMSApp) getApplication()).getRequestQueue(); } - - public boolean getBoolean(QKPreference preference) { - return getPrefs().getBoolean(preference.getKey(), (boolean) preference.getDefaultValue()); - } - - public void setBoolean(QKPreference preference, boolean newValue) { - getPrefs().edit().putBoolean(preference.getKey(), newValue).apply(); - } - - public int getInt(QKPreference preference) { - return getPrefs().getInt(preference.getKey(), (int) preference.getDefaultValue()); - } - - public void setInt(QKPreference preference, int newValue) { - getPrefs().edit().putInt(preference.getKey(), newValue).apply(); - } - - public String getString(QKPreference preference) { - return getPrefs().getString(preference.getKey(), (String) preference.getDefaultValue()); - } - - public void setString(QKPreference preference, String newValue) { - getPrefs().edit().putString(preference.getKey(), newValue).apply(); - } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 31a2f740..37dbfef7 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -8,6 +8,7 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.common.emoji.EmojiRegistry; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.data.Contact; @@ -105,7 +106,7 @@ public class ConversationListAdapter extends RecyclerCursorAdapter - holder.mAvatarView.setVisibility(mContext.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE)); + holder.mAvatarView.setVisibility(QKPreferences.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE)); // Date holder.dateView.setText(DateFormatter.getConversationTimestamp(mContext, conversation.getDate())); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index e01db50c..4a0cfdf3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -46,6 +46,7 @@ import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.common.vcard.ContactOperations; @@ -188,7 +189,7 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mProxSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); - if (mContext.getBoolean(QKPreference.PROXIMITY_SENSOR)) { + if (QKPreferences.getBoolean(QKPreference.PROXIMITY_SENSOR)) { mSensorManager.registerListener(this, mProxSensor, SensorManager.SENSOR_DELAY_NORMAL); } @@ -247,7 +248,7 @@ public class MessageListFragment extends QKFragment implements ActivityLauncher, public void onResume() { super.onResume(); - if (mContext.getBoolean(QKPreference.PROXIMITY_SENSOR)) { + if (QKPreferences.getBoolean(QKPreference.PROXIMITY_SENSOR)) { mSensorManager.registerListener(this, mProxSensor, SensorManager.SENSOR_DELAY_NORMAL); } 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 2552ca1a..311a2e98 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 com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.ListviewHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.PackageUtils; @@ -288,12 +289,12 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O EditTextPreference deleteUnread = (EditTextPreference) findPreference(DELETE_UNREAD_MESSAGES); if (deleteUnread != null) { - deleteUnread.setSummary(mContext.getString(R.string.pref_delete_old_messages_unread_summary, mContext.getString(QKPreference.DELETE_UNREAD_MESSAGES))); + deleteUnread.setSummary(mContext.getString(R.string.pref_delete_old_messages_unread_summary, QKPreferences.getString(QKPreference.AUTO_DELETE_UNREAD))); } EditTextPreference deleteRead = (EditTextPreference) findPreference(DELETE_READ_MESSAGES); if (deleteRead != null) { - deleteRead.setSummary(mContext.getString(R.string.pref_delete_old_messages_read_summary, mContext.getString(QKPreference.DELETE_READ_MESSAGES))); + deleteRead.setSummary(mContext.getString(R.string.pref_delete_old_messages_read_summary, QKPreferences.getString(QKPreference.AUTO_DELETE_READ))); } Preference day_start = findPreference(DAY_START); From 42bb829a6e661b597fba2e5dbd0fec0ec93c4961 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 27 Jun 2016 23:53:01 -0400 Subject: [PATCH 3/9] Query all messages before a given date --- .../QKSMS/receiver/AutoDeleteReceiver.java | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java index aa5a9450..f2f1186e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/AutoDeleteReceiver.java @@ -5,21 +5,19 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.database.Cursor; import android.util.Log; import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.enums.QKPreference; +import com.moez.QKSMS.transaction.SmsHelper; import java.util.Calendar; -import static android.content.Context.ALARM_SERVICE; - public class AutoDeleteReceiver extends BroadcastReceiver { private static final String TAG = "AutoDeleteService"; @Override public void onReceive(Context context, Intent intent) { - Log.i(TAG, "onReceive"); - Calendar last = Calendar.getInstance(); last.setTimeInMillis(QKPreferences.getLong(QKPreference.LAST_AUTO_DELETE_CHECK)); @@ -31,6 +29,8 @@ public class AutoDeleteReceiver extends BroadcastReceiver { current.get(Calendar.YEAR) != last.get(Calendar.YEAR))) { Log.i(TAG, "Ready to delete old messages"); QKPreferences.setLong(QKPreference.LAST_AUTO_DELETE_CHECK, System.currentTimeMillis()); + + getAutoDeleteCount(context); } else { Log.i(TAG, "Not going to delete old messages"); } @@ -44,7 +44,35 @@ public class AutoDeleteReceiver extends BroadcastReceiver { Intent intent = new Intent(context, AutoDeleteReceiver.class); PendingIntent pIntent = PendingIntent.getBroadcast(context, 9237, intent, PendingIntent.FLAG_UPDATE_CURRENT); - AlarmManager alarm = (AlarmManager) context.getSystemService(ALARM_SERVICE); + AlarmManager alarm = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); alarm.setInexactRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pIntent); } + + private int getAutoDeleteCount(Context context) { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_READ))); + + Cursor cursor = null; + int count = 0; + String selection = SmsHelper.COLUMN_DATE + "<=?"; + + try { + cursor = context.getContentResolver().query( + SmsHelper.SMS_CONTENT_PROVIDER, + new String[]{SmsHelper.COLUMN_ID, SmsHelper.COLUMN_DATE}, + selection, + new String[]{String.valueOf(calendar.getTimeInMillis())}, + null); + + count = cursor.getCount(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (cursor != null) { + cursor.close(); + } + } + + return count; + } } From 092730729921c73ca78414624ef2eae39c0c9ead Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Jun 2016 01:49:13 -0400 Subject: [PATCH 4/9] Use IntentService instead of BroadcastReceiver --- QKSMS/src/main/AndroidManifest.xml | 2 +- .../com/moez/QKSMS/receiver/BootReceiver.java | 3 +- .../DeleteOldMessagesService.java} | 71 +++++++++++++------ .../java/com/moez/QKSMS/ui/MainActivity.java | 4 +- 4 files changed, 53 insertions(+), 27 deletions(-) rename QKSMS/src/main/java/com/moez/QKSMS/{receiver/AutoDeleteReceiver.java => service/DeleteOldMessagesService.java} (61%) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 4d023563..152d35ac 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -450,9 +450,9 @@ - + Date: Tue, 28 Jun 2016 02:11:15 -0400 Subject: [PATCH 5/9] Separate calls for read and unread messages --- .../service/DeleteOldMessagesService.java | 33 +++++++------------ .../com/moez/QKSMS/transaction/SmsHelper.java | 1 + .../QKSMS/ui/settings/SettingsFragment.java | 14 +++++++- QKSMS/src/main/res/values/strings.xml | 1 + QKSMS/src/main/res/xml/settings_general.xml | 2 -- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java index 213b9a5f..d6ca1643 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java @@ -44,42 +44,29 @@ public class DeleteOldMessagesService extends IntentService { private void deleteOldUnreadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_UNREAD))); - - Cursor cursor = null; - String selection = SmsHelper.COLUMN_DATE + "<=?"; - - try { - cursor = context.getContentResolver().query( - SmsHelper.SMS_CONTENT_PROVIDER, - new String[]{SmsHelper.COLUMN_ID, SmsHelper.COLUMN_DATE}, - selection, - new String[]{String.valueOf(calendar.getTimeInMillis())}, - null); - - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (cursor != null) { - cursor.close(); - } - } + int count = deleteOldMessages(context, SmsHelper.UNREAD_SELECTION, calendar.getTimeInMillis()); + Log.i(TAG, "Deleted unread messages: " + count); } private void deleteOldReadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_READ))); + int count = deleteOldMessages(context, SmsHelper.READ_SELECTION + "=" + SmsHelper.READ, calendar.getTimeInMillis()); + Log.i(TAG, "Deleted read messages: " + count); + } + private int deleteOldMessages(Context context, String selection, long before) { Cursor cursor = null; - String selection = SmsHelper.COLUMN_DATE + "<=?"; + selection += " AND " + SmsHelper.COLUMN_DATE + "<=?"; try { cursor = context.getContentResolver().query( SmsHelper.SMS_CONTENT_PROVIDER, new String[]{SmsHelper.COLUMN_ID, SmsHelper.COLUMN_DATE}, selection, - new String[]{String.valueOf(calendar.getTimeInMillis())}, + new String[]{String.valueOf(before)}, null); - + return cursor.getCount(); } catch (Exception e) { e.printStackTrace(); } finally { @@ -87,6 +74,8 @@ public class DeleteOldMessagesService extends IntentService { cursor.close(); } } + + return 0; } public static void setupAutoDeleteAlarm(Context context) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java index 78ddb2bb..f758a116 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java @@ -86,6 +86,7 @@ public class SmsHelper { public static final String COLUMN_BODY = "body"; public static final String COLUMN_SEEN = "seen"; + public static final String READ_SELECTION = COLUMN_READ + " = " + READ; public static final String UNREAD_SELECTION = COLUMN_READ + " = " + UNREAD; public static final String UNSEEN_SELECTION = COLUMN_SEEN + " = " + UNREAD; public static final String FAILED_SELECTION = COLUMN_TYPE + " = " + Message.FAILED; 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 311a2e98..01602b30 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 @@ -41,6 +41,7 @@ import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.PackageUtils; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.receiver.NightModeAutoReceiver; +import com.moez.QKSMS.service.DeleteOldMessagesService; import com.moez.QKSMS.transaction.EndlessJabber; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; @@ -106,6 +107,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String DELIVERY_REPORTS = "pref_key_delivery"; public static final String DELIVERY_TOAST = "pref_key_delivery_toast"; public static final String DELIVERY_VIBRATE = "pref_key_delivery_vibrate"; + public static final String DELETE_OLD_MESSAGES = "pref_key_delete_old_messages"; public static final String DELETE_UNREAD_MESSAGES = "pref_key_delete_old_unread_messages"; public static final String DELETE_READ_MESSAGES = "pref_key_delete_old_read_messages"; public static final String YAPPY = "pref_key_endlessjabber"; @@ -453,12 +455,22 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case NIGHT_START: updateAlarmManager(mContext, true); break; + + case DELETE_OLD_MESSAGES: + DeleteOldMessagesService.setupAutoDeleteAlarm(mContext); + if ((Boolean) newValue) { + mContext.makeToast(R.string.toast_deleting_old_messages); + } + break; + case DELETE_UNREAD_MESSAGES: preference.setSummary(mContext.getString(R.string.pref_delete_old_messages_unread_summary, newValue)); break; + case DELETE_READ_MESSAGES: preference.setSummary(mContext.getString(R.string.pref_delete_old_messages_read_summary, newValue)); break; + case YAPPY: if ((Boolean) newValue) { try { @@ -566,7 +578,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O case SHOULD_I_ANSWER: final String packageName = "org.mistergroup.muzutozvednout"; if (!PackageUtils.isAppInstalled(mContext, packageName)) { - String referrer="referrer=utm_source%3Dqksms%26utm_medium%3Dapp%26utm_campaign%3Dqksmssettings"; + String referrer = "referrer=utm_source%3Dqksms%26utm_medium%3Dapp%26utm_campaign%3Dqksmssettings"; new QKDialog() .setContext(mContext) .setTitle(R.string.dialog_should_i_answer_title) diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index d6cd3981..78e21277 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -641,6 +641,7 @@ EndlessJabber is not installed, opening Google Play Couldn\'t load the changelog. Please try again later Couldn\'t open conversation + Your old messages will be deleted shortly Thank you for donating! You\'re my new best friend. diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 14fba766..e470f93b 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -59,7 +59,6 @@ android:widgetLayout="@layout/view_switch" /> Date: Tue, 28 Jun 2016 02:25:13 -0400 Subject: [PATCH 6/9] Upgrade gradle build tools --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 29049ffa..f4add3ee 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,6 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-alpha3' + classpath 'com.android.tools.build:gradle:2.2.0-alpha4' } } From 1d86059469c070e9b7369920816076be5342775c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 28 Jun 2016 02:33:34 -0400 Subject: [PATCH 7/9] Delete messages --- .../QKSMS/service/DeleteOldMessagesService.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java index d6ca1643..4432348e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java @@ -5,7 +5,6 @@ import android.app.IntentService; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.database.Cursor; import android.util.Log; import com.moez.QKSMS.common.QKPreferences; import com.moez.QKSMS.enums.QKPreference; @@ -56,23 +55,12 @@ public class DeleteOldMessagesService extends IntentService { } private int deleteOldMessages(Context context, String selection, long before) { - Cursor cursor = null; selection += " AND " + SmsHelper.COLUMN_DATE + "<=?"; try { - cursor = context.getContentResolver().query( - SmsHelper.SMS_CONTENT_PROVIDER, - new String[]{SmsHelper.COLUMN_ID, SmsHelper.COLUMN_DATE}, - selection, - new String[]{String.valueOf(before)}, - null); - return cursor.getCount(); + return context.getContentResolver().delete(SmsHelper.SMS_CONTENT_PROVIDER, selection, new String[]{String.valueOf(before)}); } catch (Exception e) { e.printStackTrace(); - } finally { - if (cursor != null) { - cursor.close(); - } } return 0; From bf8f5590a96dfcb5acc179415eb0c6940771c68f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jul 2016 20:03:56 -1000 Subject: [PATCH 8/9] Fixed issue with certain messages not being deleted on the first day they should be --- .../com/moez/QKSMS/service/DeleteOldMessagesService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java index 4432348e..f6441b83 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java @@ -43,6 +43,9 @@ public class DeleteOldMessagesService extends IntentService { private void deleteOldUnreadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_UNREAD))); + calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY)); + calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE)); + calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND)); int count = deleteOldMessages(context, SmsHelper.UNREAD_SELECTION, calendar.getTimeInMillis()); Log.i(TAG, "Deleted unread messages: " + count); } @@ -50,6 +53,9 @@ public class DeleteOldMessagesService extends IntentService { private void deleteOldReadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_READ))); + calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY)); + calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE)); + calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND)); int count = deleteOldMessages(context, SmsHelper.READ_SELECTION + "=" + SmsHelper.READ, calendar.getTimeInMillis()); Log.i(TAG, "Deleted read messages: " + count); } From f1788610a32f070d869c5fa205ab580adc4e4e21 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jul 2016 20:59:04 -1000 Subject: [PATCH 9/9] Added confirmation for delete old messages feature --- .../moez/QKSMS/ui/settings/SettingsFragment.java | 15 +++++++++++++-- QKSMS/src/main/res/values/strings.xml | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) 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 3a40f5b8..06238cfd 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 @@ -459,9 +459,20 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O break; case DELETE_OLD_MESSAGES: - DeleteOldMessagesService.setupAutoDeleteAlarm(mContext); if ((Boolean) newValue) { - mContext.makeToast(R.string.toast_deleting_old_messages); + new QKDialog() + .setContext(mContext) + .setTitle(R.string.pref_delete_old_messages) + .setMessage(R.string.dialog_delete_old_messages) + .setPositiveButton(R.string.yes, v -> { + QKPreferences.setBoolean(QKPreference.AUTO_DELETE, true); + ((CheckBoxPreference) preference).setChecked(true); + DeleteOldMessagesService.setupAutoDeleteAlarm(mContext); + mContext.makeToast(R.string.toast_deleting_old_messages); + }) + .setNegativeButton(R.string.cancel, null) + .show(); + return false; } break; diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index dbf79bca..38f7eb15 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -597,6 +597,7 @@ Recipients (%s) Should I Answer? not installed Would you like to download the app from Google Play now? + Are you sure you want to automatically delete old messages? Choose audio