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" />