From 44afddbca4a5907e35cf3eb9990d3c285ff1b755 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 17 Feb 2016 22:20:58 -0500 Subject: [PATCH] Option to view sent timestamps instead of received --- .../java/com/moez/QKSMS/enums/QKPreference.java | 1 + .../moez/QKSMS/ui/messagelist/MessageItem.java | 16 ++++++++++------ QKSMS/src/main/res/values/strings.xml | 2 ++ QKSMS/src/main/res/xml/settings_general.xml | 7 +++++++ 4 files changed, 20 insertions(+), 6 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 95b035f9..e143f84e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -54,6 +54,7 @@ public enum QKPreference { BLOCKED_FUTURE("pref_key_block_future", new HashSet()), MOBILE_ONLY("pref_key_mobile_only", false), ENTER_BUTTON("pref_key_enter_button", "0"), + SENT_TIMESTAMPS("pref_key_sent_timestamps", false), STARRED_CONTACTS("pref_key_compose_favorites", true), PROXIMITY_SENSOR("pref_key_prox_sensor_calling", false), YAPPY_INTEGRATION("pref_key_endlessjabber", false), diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java index 0ca5d421..bf119f12 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java @@ -20,14 +20,15 @@ package com.moez.QKSMS.ui.messagelist; import android.annotation.SuppressLint; import android.content.ContentUris; import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; import android.net.Uri; +import android.preference.PreferenceManager; import android.provider.Telephony.Mms; import android.provider.Telephony.MmsSms; import android.provider.Telephony.Sms; import android.text.TextUtils; import android.util.Log; - import com.android.mms.util.DownloadManager; import com.google.android.mms.MmsException; import com.google.android.mms.pdu_alt.EncodedStringValue; @@ -39,15 +40,16 @@ import com.google.android.mms.pdu_alt.RetrieveConf; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; import com.moez.QKSMS.common.formatter.FormatterFactory; -import com.moez.QKSMS.data.Contact; -import com.moez.QKSMS.model.SlideModel; -import com.moez.QKSMS.model.SlideshowModel; -import com.moez.QKSMS.model.TextModel; import com.moez.QKSMS.common.google.ItemLoadedCallback; import com.moez.QKSMS.common.google.ItemLoadedFuture; import com.moez.QKSMS.common.google.PduLoaderManager; import com.moez.QKSMS.common.utils.AddressUtils; import com.moez.QKSMS.common.utils.DateFormatter; +import com.moez.QKSMS.data.Contact; +import com.moez.QKSMS.enums.QKPreference; +import com.moez.QKSMS.model.SlideModel; +import com.moez.QKSMS.model.SlideshowModel; +import com.moez.QKSMS.model.TextModel; import com.moez.QKSMS.transaction.SmsHelper; import java.util.regex.Pattern; @@ -119,6 +121,7 @@ public class MessageItem { mHighlight = highlight; mType = type; mColumnsMap = columnsMap; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext); if ("sms".equals(type)) { mReadReport = false; // No read reports in sms @@ -157,7 +160,8 @@ public class MessageItem { // Unless the message is currently in the progress of being sent, it gets a time stamp. if (!isOutgoingMessage()) { // Set "received" or "sent" time stamp - mDate = cursor.getLong(columnsMap.mColumnSmsDate); + boolean sent = prefs.getBoolean(QKPreference.SENT_TIMESTAMPS.getKey(), false); + mDate = cursor.getLong(sent ? columnsMap.mColumnSmsDateSent : columnsMap.mColumnSmsDate); mTimestamp = DateFormatter.getMessageTimestamp(context, mDate); } diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 580b9b43..7b085cff 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -155,6 +155,8 @@ Sliding panel tab Sliding tab that allows you to quickly view your last conversation + Sent timestamps + Show the timestamp for when a message was sent, not received Starred contacts Show your starred contacts in the QK Compose window, making them only a tap away Proximity sensor diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index f23b33bb..31e8204a 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -130,6 +130,13 @@ android:layout="@layout/list_item_preference" android:summary="@string/pref_enter_button_summary" android:title="@string/pref_enter_button" /> +