From 6659b664d8da00cc51253978642e50e62d267135 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Tue, 20 May 2025 09:26:38 +0200
Subject: [PATCH] add meaningful names

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../java/com/nextcloud/talk/chat/ChatActivity.kt   | 14 ++++++++------
 .../conversationlist/ConversationsListActivity.kt  | 13 +++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index ea2294d04..13cb44156 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -669,7 +669,8 @@ class ChatActivity :
                             }
                         }
 
-                        if (currentConversation?.objectType == ConversationEnums.ObjectType.EVENT && hasSpreedFeatureCapability(
+                        if (currentConversation?.objectType == ConversationEnums.ObjectType.EVENT &&
+                            hasSpreedFeatureCapability(
                                 conversationUser?.capabilities!!.spreedCapability!!,
                                 SpreedFeatures.UNBIND_CONVERSATION
                             )
@@ -683,7 +684,8 @@ class ChatActivity :
                             }
                         }
 
-                        if (currentConversation?.objectType == ConversationEnums.ObjectType.PHONE && hasSpreedFeatureCapability(
+                        if (currentConversation?.objectType == ConversationEnums.ObjectType.PHONE &&
+                            hasSpreedFeatureCapability(
                                 conversationUser?.capabilities!!.spreedCapability!!,
                                 SpreedFeatures.UNBIND_CONVERSATION
                             )
@@ -699,7 +701,8 @@ class ChatActivity :
                             }
                         }
 
-                        if (currentConversation?.objectType == ConversationEnums.ObjectType.INSTANT_MEETING && hasSpreedFeatureCapability(
+                        if (currentConversation?.objectType == ConversationEnums.ObjectType.INSTANT_MEETING &&
+                            hasSpreedFeatureCapability(
                                 conversationUser?.capabilities!!.spreedCapability!!,
                                 SpreedFeatures.UNBIND_CONVERSATION
                             )
@@ -1231,19 +1234,18 @@ class ChatActivity :
         }
         val deleteNoticeText = binding.conversationDeleteNotice.findViewById<TextView>(R.id.deletion_message)
 
-        if(currentConversation?.objectType!= ConversationEnums.ObjectType.INSTANT_MEETING){
+        if (currentConversation?.objectType != ConversationEnums.ObjectType.INSTANT_MEETING) {
             deleteNoticeText.text = String.format(
                 resources.getString(R.string.nc_conversation_auto_delete_notice),
                 retentionPeriod
             )
-        }else{
+        } else {
             deleteNoticeText.text = String.format(
                 resources.getString(R.string.nc_conversation_auto_delete_warning),
                 retentionPeriod
             )
         }
 
-
         binding.conversationDeleteNotice.findViewById<MaterialButton>(R.id.delete_now_button).setOnClickListener {
             deleteConversationDialog(it.context)
         }
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index a7bd96431..f5fed2217 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -523,7 +523,7 @@ class ConversationsListActivity :
         nearFutureEventConversationItems.clear()
 
         for (conversation in list) {
-            if (!futureEvent(conversation)) {
+            if (!isFutureEvent(conversation)) {
                 addToNearFutureEventConversationItems(conversation)
             }
             addToConversationItems(conversation)
@@ -564,13 +564,14 @@ class ConversationsListActivity :
         return false
     }
 
-    private fun futureEvent(conversation: ConversationModel): Boolean {
+    private fun isFutureEvent(conversation: ConversationModel): Boolean {
         if (!conversation.objectId.contains("#")) {
             return false
         }
-        return conversation.objectType == ConversationEnums.ObjectType.EVENT &&
-            (conversation.objectId.split("#")[0].toLong() - (System.currentTimeMillis() / LONG_1000)) >
-            AGE_THRESHOLD_FOR_EVENT_CONVERSATIONS
+        val eventTimeStart = conversation.objectId.split("#")[0].toLong()
+        val currentTimeStampInSeconds = System.currentTimeMillis() / LONG_1000
+        val sixteenHoursAfterTimeStamp = (eventTimeStart - currentTimeStampInSeconds) > SIXTEEN_HOURS_IN_SECONDS
+        return conversation.objectType == ConversationEnums.ObjectType.EVENT && sixteenHoursAfterTimeStamp
     }
 
     fun showOnlyNearFutureEvents() {
@@ -2156,7 +2157,7 @@ class ConversationsListActivity :
         const val NOTIFICATION_WARNING_DATE_NOT_SET = 0L
         const val OFFSET_HEIGHT_DIVIDER: Int = 3
         const val ROOM_TYPE_ONE_ONE = "1"
-        private const val AGE_THRESHOLD_FOR_EVENT_CONVERSATIONS: Long = 57600
+        private const val SIXTEEN_HOURS_IN_SECONDS: Long = 57600
         const val LONG_1000: Long = 1000
     }
 }