Merge pull request #4122 from nextcloud/edit_note_to_self

No Edit Time limit on Note to Self Messages
nextcloud · Aug 29, 2024 · 23eb15f · 23eb15f
2 parents 401ded4 + 2636979
commit 23eb15f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
@@ -87,12 +87,18 @@ class MessageActionsDialog(
         .before(Date(System.currentTimeMillis() - AGE_THRESHOLD_FOR_EDIT_MESSAGE))
 
     private val isUserAllowedToEdit = chatActivity.userAllowedByPrivilages(message)
-
-    private val isMessageEditable = hasSpreedFeatureCapability(
+    private var isNoTimeLimitOnNoteToSelf = hasSpreedFeatureCapability(
+        spreedCapabilities,
+        SpreedFeatures
+            .EDIT_MESSAGES_NOTE_TO_SELF
+    ) && currentConversation?.type == ConversationEnums.ConversationType.NOTE_TO_SELF
+    private var messageIsEditable = hasSpreedFeatureCapability(
         spreedCapabilities,
         SpreedFeatures.EDIT_MESSAGES
     ) && messageHasRegularText && !isOlderThanTwentyFourHours && isUserAllowedToEdit
 
+    private val isMessageEditable = isNoTimeLimitOnNoteToSelf || messageIsEditable
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication?.componentApplication?.inject(this)

diff --git a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt
@@ -54,7 +54,8 @@ enum class SpreedFeatures(val value: String) {
     CONVERSATION_PERMISSION("conversation-permissions"),
     FEDERATION_V1("federation-v1"),
     DELETE_MESSAGES_UNLIMITED("delete-messages-unlimited"),
-    BAN_V1("ban-v1")
+    BAN_V1("ban-v1"),
+    EDIT_MESSAGES_NOTE_TO_SELF("edit-messages-note-to-self")
 }
 
 @Suppress("TooManyFunctions")