From 867183fd282b13eebd74b2dd3abe3775f7725f81 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Jan 2021 10:12:35 +0100
Subject: [PATCH] Fixed date with previous year in chat

---
 .../activities/main/history/adapters/CallLogsListAdapter.kt  | 2 +-
 .../activities/main/history/viewmodels/CallLogViewModel.kt   | 2 +-
 .../main/recordings/adapters/RecordingsListAdapter.kt        | 2 +-
 app/src/main/java/org/linphone/utils/TimestampUtils.kt       | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
index a09483d2f..d18047c33 100644
--- a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
@@ -135,7 +135,7 @@ class CallLogsListAdapter(
         } else if (TimestampUtils.isYesterday(date)) {
             return context.getString(R.string.yesterday)
         }
-        return TimestampUtils.toString(date, onlyDate = true, shortDate = false)
+        return TimestampUtils.toString(date, onlyDate = true, shortDate = false, hideYear = false)
     }
 }
 
diff --git a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
index a2ca9a0ce..19417a808 100644
--- a/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/viewmodels/CallLogViewModel.kt
@@ -93,7 +93,7 @@ class CallLogViewModel(val callLog: CallLog) : GenericContactViewModel(callLog.r
     }
 
     val date: String by lazy {
-        TimestampUtils.toString(callLog.startDate, shortDate = false)
+        TimestampUtils.toString(callLog.startDate, shortDate = false, hideYear = false)
     }
 
     val startCallEvent: MutableLiveData<Event<Address>> by lazy {
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
index ae2d7c74f..cd457cccf 100644
--- a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
@@ -131,7 +131,7 @@ class RecordingsListAdapter(
         } else if (TimestampUtils.isYesterday(date, false)) {
             return context.getString(R.string.yesterday)
         }
-        return TimestampUtils.toString(date, onlyDate = true, timestampInSecs = false, shortDate = false)
+        return TimestampUtils.toString(date, onlyDate = true, timestampInSecs = false, shortDate = false, hideYear = false)
     }
 }
 
diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
index 4fc6c43db..359a360af 100644
--- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt
+++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
@@ -64,7 +64,8 @@ class TimestampUtils {
             timestamp: Long,
             onlyDate: Boolean = false,
             timestampInSecs: Boolean = true,
-            shortDate: Boolean = true
+            shortDate: Boolean = true,
+            hideYear: Boolean = true
         ): String {
             val dateFormat = if (isToday(timestamp, timestampInSecs)) {
                 DateFormat.getTimeInstance(DateFormat.SHORT)
@@ -76,7 +77,7 @@ class TimestampUtils {
                 }
             } as SimpleDateFormat
 
-            if (isSameYear(timestamp, timestampInSecs)) {
+            if (hideYear || isSameYear(timestamp, timestampInSecs)) {
                 // Remove the year part of the format
                 dateFormat.applyPattern(
                     dateFormat.toPattern().replace("/?y+/?|,?\\s?y+\\s?".toRegex(), if (shortDate) "" else " ")