Fix timestamps

app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -21,13 +21,21 @@
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.thoughtcrime.securesms.conversation.v2.WindowUtil;
 import org.thoughtcrime.securesms.util.ActivityUtilitiesKt;
+import org.thoughtcrime.securesms.util.DateUtil;
 import org.thoughtcrime.securesms.util.ThemeState;
 import org.thoughtcrime.securesms.util.UiModeUtilities;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
 import network.loki.messenger.R;
 
+@AndroidEntryPoint
 public abstract class BaseActionBarActivity extends AppCompatActivity {
   private static final String TAG = BaseActionBarActivity.class.getSimpleName();
+
+  @Inject DateUtil dateUtil;
+
   public ThemeState currentThemeState;
 
   private TextSecurePreferences getPreferences() {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -77,12 +77,10 @@
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
-import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 
 import java.io.IOException;
-import java.util.Locale;
 import java.util.WeakHashMap;
 
 import network.loki.messenger.R;
@@ -243,7 +241,7 @@ private void updateActionBar() {
       CharSequence relativeTimeSpan;
 
       if (mediaItem.date > 0) {
-        relativeTimeSpan = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), mediaItem.date);
+        relativeTimeSpan = dateUtil.format(mediaItem.date);
       } else {
         relativeTimeSpan = getString(R.string.MediaPreviewActivity_draft);
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -153,6 +153,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     @Inject lateinit var storage: Storage
     @Inject lateinit var reactionDb: ReactionDatabase
     @Inject lateinit var viewModelFactory: ConversationViewModel.AssistedFactory
+    @Inject lateinit var dateUtil: DateUtil
 
     private val screenshotObserver by lazy {
         ScreenshotObserver(this, Handler(Looper.getMainLooper())) {
@@ -1727,7 +1728,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             val body = MentionUtilities.highlightMentions(message.body, viewModel.threadId, this)
             if (TextUtils.isEmpty(body)) { continue }
             if (messageSize > 1) {
-                val formattedTimestamp = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), message.timestamp)
+                val formattedTimestamp = dateUtil.format(message.timestamp)
                 builder.append("$formattedTimestamp: ")
             }
             builder.append(body)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.java

@@ -43,18 +43,21 @@
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
 import org.thoughtcrime.securesms.util.AnimationCompleteListener;
-import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.DateUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
 import kotlin.Unit;
 import network.loki.messenger.R;
 
+@AndroidEntryPoint
 public final class ConversationReactionOverlay extends FrameLayout {
-
+  @Inject DateUtil dateUtil;
   public  static final float LONG_PRESS_SCALE_FACTOR    = 0.95f;
   private static final Interpolator INTERPOLATOR = new DecelerateInterpolator();
 
@@ -169,7 +172,7 @@ public void show(@NonNull Activity activity,
     conversationBubble.setLayoutParams(new LinearLayout.LayoutParams(conversationItemSnapshot.getWidth(), conversationItemSnapshot.getHeight()));
     conversationBubble.setBackground(new BitmapDrawable(getResources(), conversationItemSnapshot));
     TextView conversationTimestamp = conversationItem.findViewById(R.id.conversation_item_timestamp);
-    conversationTimestamp.setText(DateUtils.getDisplayFormattedTimeSpanString(getContext(), Locale.getDefault(), messageRecord.getTimestamp()));
+    conversationTimestamp.setText(dateUtil.format(messageRecord.getTimestamp()));
 
     updateConversationTimestamp(messageRecord);
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt

@@ -7,12 +7,18 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewControlMessageBinding
 import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.util.DateUtil
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class ControlMessageView : LinearLayout {
 
+    @Inject lateinit var dateUtil: DateUtil
+
     private lateinit var binding: ViewControlMessageBinding
 
     // region Lifecycle
@@ -28,7 +34,7 @@ class ControlMessageView : LinearLayout {
 
     // region Updating
     fun bind(message: MessageRecord, previous: MessageRecord?) {
-        binding.dateBreakTextView.showDateBreak(message, previous)
+        binding.dateBreakTextView.showDateBreak(dateUtil, message, previous)
         binding.iconImageView.visibility = View.GONE
         var messageBody: CharSequence = message.getDisplayBody(context)
         binding.root.contentDescription= null

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageUtilities.kt

@@ -3,13 +3,12 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.widget.TextView
 import androidx.core.view.isVisible
 import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.util.DateUtils
-import java.util.Locale
+import org.thoughtcrime.securesms.util.DateUtil
 
 private const val maxTimeBetweenBreaks = 5 * 60 * 1000L // 5 minutes
 
-fun TextView.showDateBreak(message: MessageRecord, previous: MessageRecord?) {
+fun TextView.showDateBreak(dateUtil: DateUtil, message: MessageRecord, previous: MessageRecord?) {
     val showDateBreak = (previous == null || message.timestamp - previous.timestamp > maxTimeBetweenBreaks)
     isVisible = showDateBreak
-    text = if (showDateBreak) DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp) else ""
+    text = if (showDateBreak) dateUtil.format(message.timestamp) else ""
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -47,12 +47,8 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.home.UserDetailsBottomSheet
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.util.DateUtils
-import org.thoughtcrime.securesms.util.disableClipping
-import org.thoughtcrime.securesms.util.toDp
-import org.thoughtcrime.securesms.util.toPx
+import org.thoughtcrime.securesms.util.*
 import java.util.Date
-import java.util.Locale
 import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.min
@@ -62,6 +58,7 @@ import kotlin.math.sqrt
 @AndroidEntryPoint
 class VisibleMessageView : LinearLayout {
 
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var threadDb: ThreadDatabase
     @Inject lateinit var lokiThreadDb: LokiThreadDatabase
     @Inject lateinit var lokiApiDb: LokiAPIDatabase
@@ -193,7 +190,7 @@ class VisibleMessageView : LinearLayout {
         binding.senderNameTextView.text = contact?.displayName(contactContext) ?: senderSessionID
         // Date break
         val showDateBreak = isStartOfMessageCluster || snIsSelected
-        binding.dateBreakTextView.text = if (showDateBreak) DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp) else null
+        binding.dateBreakTextView.text = if (showDateBreak) dateUtil.format(message.timestamp) else null
         binding.dateBreakTextView.isVisible = showDateBreak
         // Message status indicator
         if (message.isOutgoing) {

app/src/main/java/org/thoughtcrime/securesms/dependencies/AppModule.kt

@@ -8,6 +8,8 @@ import org.session.libsession.utilities.AppTextSecurePreferences
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.repository.DefaultConversationRepository
+import org.thoughtcrime.securesms.util.AndroidClock
+import org.thoughtcrime.securesms.util.Clock
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -19,4 +21,7 @@ abstract class AppModule {
     @Binds
     abstract fun bindConversationRepository(repository: DefaultConversationRepository): ConversationRepository
 
+    @Binds
+    abstract fun bindAndroidClock(androidClock: AndroidClock): Clock
+
 }

app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt

@@ -6,7 +6,6 @@ import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
@@ -20,11 +19,13 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.NOTIFY_TYPE_ALL
 import org.thoughtcrime.securesms.database.RecipientDatabase.NOTIFY_TYPE_NONE
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.DateUtil
 import org.thoughtcrime.securesms.util.getAccentColor
-import java.util.Locale
+import javax.inject.Inject
 
 class ConversationView : LinearLayout {
+    @Inject lateinit var dateUtil: DateUtil
+
     private val binding: ViewConversationBinding by lazy { ViewConversationBinding.bind(this) }
     private val screenWidth = Resources.getSystem().displayMetrics.widthPixels
     var thread: ThreadRecord? = null
@@ -85,7 +86,7 @@ class ConversationView : LinearLayout {
         val senderDisplayName = getUserDisplayName(thread.recipient)
                 ?: thread.recipient.address.toString()
         binding.conversationViewDisplayNameTextView.text = senderDisplayName
-        binding.timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), thread.date)
+        binding.timestampTextView.text = dateUtil.format(thread.date)
         val recipient = thread.recipient
         binding.muteIndicatorImageView.isVisible = recipient.isMuted || recipient.notifyType != NOTIFY_TYPE_ALL
         val drawableRes = if (recipient.isMuted || recipient.notifyType == NOTIFY_TYPE_NONE) {

app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt

@@ -63,15 +63,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.onboarding.SeedActivity
 import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.preferences.SettingsActivity
-import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
-import org.thoughtcrime.securesms.util.DateUtils
-import org.thoughtcrime.securesms.util.IP2Country
-import org.thoughtcrime.securesms.util.disableClipping
-import org.thoughtcrime.securesms.util.push
-import org.thoughtcrime.securesms.util.show
-import org.thoughtcrime.securesms.util.themeState
+import org.thoughtcrime.securesms.util.*
 import java.io.IOException
-import java.util.Locale
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -84,6 +77,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     private lateinit var glide: GlideRequests
     private var broadcastReceiver: BroadcastReceiver? = null
 
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var threadDb: ThreadDatabase
     @Inject lateinit var mmsSmsDatabase: MmsSmsDatabase
     @Inject lateinit var recipientDatabase: RecipientDatabase
@@ -100,7 +94,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         HomeAdapter(context = this, listener = this)
     }
 
-    private val globalSearchAdapter = GlobalSearchAdapter { model ->
+    private val globalSearchAdapter = GlobalSearchAdapter(dateUtil) { model ->
         when (model) {
             is GlobalSearchAdapter.Model.Message -> {
                 val threadId = model.messageResult.threadId
@@ -290,11 +284,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         if (messageRequestCount > 0 && !textSecurePreferences.hasHiddenMessageRequests()) {
             with(ViewMessageRequestBannerBinding.inflate(layoutInflater)) {
                 unreadCountTextView.text = messageRequestCount.toString()
-                timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(
-                    this@HomeActivity,
-                    Locale.getDefault(),
-                    threadDb.latestUnapprovedConversationTimestamp
-                )
+                timestampTextView.text = dateUtil.format(threadDb.latestUnapprovedConversationTimestamp)
                 root.setOnClickListener { showMessageRequests() }
                 root.setOnLongClickListener { hideMessageRequests(); true }
                 root.layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)

app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchAdapter.kt

@@ -6,17 +6,22 @@ import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewGlobalSearchHeaderBinding
 import network.loki.messenger.databinding.ViewGlobalSearchResultBinding
 import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.search.model.MessageResult
+import org.thoughtcrime.securesms.util.DateUtil
 import java.security.InvalidParameterException
 import org.session.libsession.messaging.contacts.Contact as ContactModel
 
-class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GlobalSearchAdapter(
+    private val dateUtil: DateUtil,
+    private val modelCallback: (Model) -> Unit
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     companion object {
         const val HEADER_VIEW_TYPE = 0
@@ -47,8 +52,10 @@ class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerVi
         } else {
             ContentView(
                 LayoutInflater.from(parent.context)
-                    .inflate(R.layout.view_global_search_result, parent, false)
-            , modelCallback)
+                    .inflate(R.layout.view_global_search_result, parent, false),
+                dateUtil,
+                modelCallback
+            )
         }
 
     override fun onBindViewHolder(
@@ -69,7 +76,7 @@ class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerVi
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        onBindViewHolder(holder,position, mutableListOf())
+        onBindViewHolder(holder, position, mutableListOf())
     }
 
     class HeaderView(view: View) : RecyclerView.ViewHolder(view) {
@@ -87,8 +94,11 @@ class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerVi
         }
     }
 
-    class ContentView(view: View, private val modelCallback: (Model) -> Unit) : RecyclerView.ViewHolder(view) {
-
+    class ContentView(
+        view: View,
+        private val dateUtil: DateUtil,
+        private val modelCallback: (Model) -> Unit
+    ) : RecyclerView.ViewHolder(view) {
         val binding = ViewGlobalSearchResultBinding.bind(view).apply {
             searchResultProfilePicture.root.glide = GlideApp.with(root)
         }
@@ -102,7 +112,7 @@ class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerVi
             when (model) {
                 is Model.GroupConversation -> bindModel(query, model)
                 is Model.Contact -> bindModel(query, model)
-                is Model.Message -> bindModel(query, model)
+                is Model.Message -> bindModel(dateUtil, query, model)
                 is Model.SavedMessages -> bindModel(model)
                 is Model.Header -> throw InvalidParameterException("Can't display Model.Header as ContentView")
             }
@@ -112,14 +122,14 @@ class GlobalSearchAdapter (private val modelCallback: (Model)->Unit): RecyclerVi
     }
 
     data class MessageModel(
-            val threadRecipient: Recipient,
-            val messageRecipient: Recipient,
-            val messageSnippet: String
+        val threadRecipient: Recipient,
+        val messageRecipient: Recipient,
+        val messageSnippet: String
     )
 
     sealed class Model {
         data class Header(@StringRes val title: Int) : Model()
-        data class SavedMessages(val currentUserPublicKey: String): Model()
+        data class SavedMessages(val currentUserPublicKey: String) : Model()
         data class Contact(val contact: ContactModel) : Model()
         data class GroupConversation(val groupRecord: GroupRecord) : Model()
         data class Message(val messageResult: MessageResult, val unread: Int) : Model()

app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchAdapterUtils.kt

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.home.search.GlobalSearchAdapter.ContentView
 import org.thoughtcrime.securesms.home.search.GlobalSearchAdapter.Model.GroupConversation
 import org.thoughtcrime.securesms.home.search.GlobalSearchAdapter.Model.Message
 import org.thoughtcrime.securesms.home.search.GlobalSearchAdapter.Model.SavedMessages
-import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.DateUtil
 import org.thoughtcrime.securesms.util.SearchUtil
 import java.util.Locale
 import org.thoughtcrime.securesms.home.search.GlobalSearchAdapter.Model.Contact as ContactModel
@@ -125,7 +125,7 @@ fun ContentView.bindModel(model: SavedMessages) {
     binding.searchResultSavedMessages.isVisible = true
 }
 
-fun ContentView.bindModel(query: String?, model: Message) {
+fun ContentView.bindModel(dateUtil: DateUtil, query: String?, model: Message) {
     binding.searchResultProfilePicture.root.isVisible = true
     binding.searchResultSavedMessages.isVisible = false
     binding.searchResultTimestamp.isVisible = true
@@ -134,7 +134,7 @@ fun ContentView.bindModel(query: String?, model: Message) {
 //    if (hasUnreads) {
 //        binding.unreadCountTextView.text = model.unread.toString()
 //    }
-    binding.searchResultTimestamp.text = DateUtils.getDisplayFormattedTimeSpanString(binding.root.context, Locale.getDefault(), model.messageResult.sentTimestampMs)
+    binding.searchResultTimestamp.text = dateUtil.format(model.messageResult.sentTimestampMs)
     binding.searchResultProfilePicture.root.update(model.messageResult.conversationRecipient)
     val textSpannable = SpannableStringBuilder()
     if (model.messageResult.conversationRecipient != model.messageResult.messageRecipient) {