ui: deletable field (#4019)

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -667,7 +667,7 @@ struct ChatView: View {
                     Button("Delete for me", role: .destructive) {
                         deleteMessage(.cidmInternal)
                     }
-                    if let di = deletingItem, di.meta.editable && !di.localNote {
+                    if let di = deletingItem, di.meta.deletable && !di.localNote {
                         Button(broadcastDeleteButtonText, role: .destructive) {
                             deleteMessage(.cidmBroadcast)
                         }

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2372,10 +2372,10 @@ public struct ChatItem: Identifiable, Decodable {
         }
     }
 
-    public static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, quotedItem: CIQuote? = nil, file: CIFile? = nil, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, editable: Bool = true) -> ChatItem {
+    public static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, quotedItem: CIQuote? = nil, file: CIFile? = nil, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, deletable: Bool = true, editable: Bool = true) -> ChatItem {
         ChatItem(
             chatDir: dir,
-            meta: CIMeta.getSample(id, ts, text, status, itemDeleted: itemDeleted, itemEdited: itemEdited, itemLive: itemLive, editable: editable),
+            meta: CIMeta.getSample(id, ts, text, status, itemDeleted: itemDeleted, itemEdited: itemEdited, itemLive: itemLive, deletable: deletable, editable: editable),
             content: .sndMsgContent(msgContent: .text(text)),
             quotedItem: quotedItem,
             file: file
@@ -2466,6 +2466,7 @@ public struct ChatItem: Identifiable, Decodable {
                 itemDeleted: nil,
                 itemEdited: false,
                 itemLive: false,
+                deletable: false,
                 editable: false
             ),
             content: .rcvDeleted(deleteMode: .cidmBroadcast),
@@ -2487,6 +2488,7 @@ public struct ChatItem: Identifiable, Decodable {
                 itemDeleted: nil,
                 itemEdited: false,
                 itemLive: true,
+                deletable: false,
                 editable: false
             ),
             content: .sndMsgContent(msgContent: .text("")),
@@ -2551,6 +2553,7 @@ public struct CIMeta: Decodable {
     public var itemEdited: Bool
     public var itemTimed: CITimed?
     public var itemLive: Bool?
+    public var deletable: Bool
     public var editable: Bool
 
     public var timestampText: Text { get { formatTimestampText(itemTs) } }
@@ -2567,7 +2570,7 @@ public struct CIMeta: Decodable {
         itemStatus.statusIcon(metaColor)
     }
 
-    public static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, editable: Bool = true) -> CIMeta {
+    public static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, deletable: Bool = true, editable: Bool = true) -> CIMeta {
         CIMeta(
             itemId: id,
             itemTs: ts,
@@ -2578,6 +2581,7 @@ public struct CIMeta: Decodable {
             itemDeleted: itemDeleted,
             itemEdited: itemEdited,
             itemLive: itemLive,
+            deletable: deletable,
             editable: editable
         )
     }
@@ -2593,6 +2597,7 @@ public struct CIMeta: Decodable {
             itemDeleted: nil,
             itemEdited: false,
             itemLive: false,
+            deletable: false,
             editable: false
         )
     }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -1888,11 +1888,12 @@ data class ChatItem (
       itemDeleted: CIDeleted? = null,
       itemEdited: Boolean = false,
       itemTimed: CITimed? = null,
+      deletable: Boolean = true,
       editable: Boolean = true
     ) =
       ChatItem(
         chatDir = dir,
-        meta = CIMeta.getSample(id, ts, text, status, itemForwarded, itemDeleted, itemEdited, itemTimed, editable),
+        meta = CIMeta.getSample(id, ts, text, status, itemForwarded, itemDeleted, itemEdited, itemTimed, deletable, editable),
         content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
         quotedItem = quotedItem,
         reactions = listOf(),
@@ -1981,6 +1982,7 @@ data class ChatItem (
           itemEdited = false,
           itemTimed = null,
           itemLive = false,
+          deletable = false,
           editable = false
         ),
         content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
@@ -2003,6 +2005,7 @@ data class ChatItem (
           itemEdited = false,
           itemTimed = null,
           itemLive = true,
+          deletable = false,
           editable = false
         ),
         content = CIContent.SndMsgContent(MsgContent.MCText("")),
@@ -2104,6 +2107,7 @@ data class CIMeta (
   val itemEdited: Boolean,
   val itemTimed: CITimed?,
   val itemLive: Boolean?,
+  val deletable: Boolean,
   val editable: Boolean
 ) {
   val timestampText: String get() = getTimestampText(itemTs)
@@ -2123,7 +2127,8 @@ data class CIMeta (
   companion object {
     fun getSample(
       id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(),
-      itemForwarded: CIForwardedFrom? = null, itemDeleted: CIDeleted? = null, itemEdited: Boolean = false, itemTimed: CITimed? = null, itemLive: Boolean = false, editable: Boolean = true
+      itemForwarded: CIForwardedFrom? = null, itemDeleted: CIDeleted? = null, itemEdited: Boolean = false,
+      itemTimed: CITimed? = null, itemLive: Boolean = false, deletable: Boolean = true, editable: Boolean = true
     ): CIMeta =
       CIMeta(
         itemId = id,
@@ -2137,6 +2142,7 @@ data class CIMeta (
         itemEdited = itemEdited,
         itemTimed = itemTimed,
         itemLive = itemLive,
+        deletable = deletable,
         editable = editable
       )
 
@@ -2154,6 +2160,7 @@ data class CIMeta (
         itemEdited = false,
         itemTimed = null,
         itemLive = false,
+        deletable = false,
         editable = false
       )
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -724,7 +724,7 @@ fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMes
           deleteMessage(chatItem.id, CIDeleteMode.cidmInternal)
           AlertManager.shared.hideAlert()
         }) { Text(stringResource(MR.strings.for_me_only), color = MaterialTheme.colors.error) }
-        if (chatItem.meta.editable && !chatItem.localNote) {
+        if (chatItem.meta.deletable && !chatItem.localNote) {
           Spacer(Modifier.padding(horizontal = 4.dp))
           TextButton(onClick = {
             deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)