feat: asset audit log metadata - WPB-20714

WireNetwork/Sources/WireNetwork/Models/Backend/BackendEnvironment2.swift

@@ -181,3 +181,23 @@ public struct BackendEnvironment2: Sendable, Equatable, Hashable {
     }
 
 }
+
+public extension BackendEnvironment2 {
+
+    var isCloudEnvironment: Bool {
+        config.endpoints.restAPIURL.host() == "prod-nginz-https.wire.com"
+    }
+
+    static func isCloudDomain(_ domain: String) -> Bool {
+        domain == "wire.com"
+    }
+
+    var isStagingEnvironment: Bool {
+        config.endpoints.restAPIURL.host() == "staging-nginz-https.zinfra.io"
+    }
+
+    static func isStagingDomain(_ domain: String) -> Bool {
+        domain == "staging.zinfra.io"
+    }
+
+}

wire-ios-data-model/Source/Model/Conversation/SendableImage.swift

@@ -0,0 +1,61 @@
+//
+// Wire
+// Copyright (C) 2025 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import UniformTypeIdentifiers
+
+public struct SendableImage {
+
+    public let name: String
+    public let utType: UTType?
+    public let data: Data
+
+    public init(
+        name: String?,
+        utType: UTType?,
+        data: Data
+    ) {
+        if let utType {
+            self.utType = utType
+        } else {
+            self.utType = Self.determineUTType(from: data)
+        }
+
+        if let name {
+            self.name = name
+        } else if let fileExtension = self.utType?.preferredFilenameExtension {
+            self.name = "picture.\(fileExtension)"
+        } else {
+            self.name = "picture"
+        }
+
+        self.data = data
+    }
+
+    private static func determineUTType(from data: Data) -> UTType? {
+        guard
+            !data.isEmpty,
+            let imageSource = CGImageSourceCreateWithData(data as CFData, nil),
+            let uti = CGImageSourceGetType(imageSource) as String?
+        else {
+            return nil
+        }
+
+        return UTType(uti)
+    }
+
+}

wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift

@@ -258,7 +258,7 @@ public extension ZMConversation {
     /// Append an image message.
     ///
     /// - Parameters:
-    ///     - url: A url locating some image data.
+    ///     - image: The image to append.
     ///     - nonce: The nonce of the message.
     ///
     /// - Throws:
@@ -268,55 +268,42 @@ public extension ZMConversation {
     ///     The appended message.
 
     @discardableResult
-    func appendImage(at URL: URL, nonce: UUID = UUID()) throws -> ZMConversationMessage {
-        guard
-            URL.isFileURL,
-            ZMImagePreprocessor.sizeOfPrerotatedImage(at: URL) != .zero,
-            let imageData = try? Data(contentsOf: URL, options: [])
-        else {
-            throw AppendMessageError.invalidImageUrl
-        }
-
-        return try appendImage(from: imageData)
-    }
-
-    /// Append an image message.
-    ///
-    /// - Parameters:
-    ///     - imageData: Data representing an image.
-    ///     - nonce: The nonce of the message.
-    ///
-    /// - Throws:
-    ///     - `AppendMessageError` if the message couldn't be appended.
-    ///
-    /// - Returns:
-    ///     The appended message.
-
-    @discardableResult
-    func appendImage(from imageData: Data, nonce: UUID = UUID()) throws -> ZMConversationMessage {
+    func appendImage(
+        _ image: SendableImage,
+        nonce: UUID
+    ) throws -> ZMConversationMessage {
         guard let moc = managedObjectContext else {
             throw AppendMessageError.missingManagedObjectContext
         }
 
-        guard let imageData = try? imageData.wr_removingImageMetadata() else {
+        guard let imageData = try? image.data.wr_removingImageMetadata() else {
             throw AppendMessageError.failedToRemoveImageMetadata
         }
 
         // mimeType is assigned first, to make sure UI can handle animated GIF file correctly.
-        let mimeType = imageData.mimeType ?? ""
+        let mimeType = image.utType?.preferredMIMEType
 
         // We update the size again when the the preprocessing is done.
         let imageSize = ZMImagePreprocessor.sizeOfPrerotatedImage(with: imageData)
 
         let asset = GenericMessageProtocol.Asset(
+            name: image.name,
+            mimeType: mimeType ?? "",
             imageSize: imageSize,
-            mimeType: mimeType,
             size: UInt64(imageData.count)
         )
 
-        return try append(asset: asset, nonce: nonce, expires: true, prepareMessage: { message in
-            moc.zm_fileAssetCache.storeOriginalImage(data: imageData, for: message)
-        })
+        return try append(
+            asset: asset,
+            nonce: nonce,
+            expires: true,
+            prepareMessage: { message in
+                moc.zm_fileAssetCache.storeOriginalImage(
+                    data: imageData,
+                    for: message
+                )
+            }
+        )
     }
 
     /// Append a file message.
@@ -563,21 +550,6 @@ public extension ZMConversation {
         try? appendLocation(with: locationData)
     }
 
-    @discardableResult @objc(appendMessageWithImageData:)
-    func _appendImage(from imageData: Data) -> ZMConversationMessage? {
-        try? appendImage(from: imageData)
-    }
-
-    @discardableResult @objc(appendImageFromData:nonce:)
-    func _appendImage(from imageData: Data, nonce: UUID) -> ZMConversationMessage? {
-        try? appendImage(from: imageData, nonce: nonce)
-    }
-
-    @discardableResult @objc(appendImageAtURL:nonce:)
-    func _appendImage(at URL: URL, nonce: UUID) -> ZMConversationMessage? {
-        try? appendImage(at: URL, nonce: nonce)
-    }
-
     @discardableResult @objc(appendMessageWithFileMetadata:)
     func _appendFile(with fileMetadata: ZMFileMetadata) -> ZMConversationMessage? {
         try? appendFile(with: fileMetadata)

wire-ios-data-model/Source/Model/Message/V2Asset.swift

@@ -22,6 +22,17 @@ import MobileCoreServices
 @objcMembers
 public class V2Asset: NSObject, ZMImageMessageData {
 
+    public var name: String? {
+        guard
+            let message = assetClientMessage.underlyingMessage,
+            let original = message.assetData?.original
+        else {
+            return nil
+        }
+
+        return original.name
+    }
+
     public var isDownloaded: Bool {
         hasDownloadedFile
     }

wire-ios-data-model/Source/Model/Message/V3Asset.swift

@@ -98,6 +98,17 @@ public class V3Asset: NSObject, ZMImageMessageData {
         }
     }
 
+    public var name: String? {
+        guard
+            let message = assetClientMessage.underlyingMessage,
+            let original = message.assetData?.original
+        else {
+            return nil
+        }
+
+        return original.name
+    }
+
     public var isDownloaded: Bool {
         hasDownloadedFile
     }

wire-ios-data-model/Source/Model/Message/ZMFileMetadata.swift

@@ -38,7 +38,14 @@ open class ZMFileMetadata: NSObject {
         } else {
             nil
         }
-        let endName = name ?? (fileURL.lastPathComponent.isEmpty ? "unnamed" : fileURL.lastPathComponent)
+
+        let endName: String = if let name {
+            name
+        } else if !fileURL.lastPathComponent.isEmpty {
+            fileURL.lastPathComponent
+        } else {
+            "file"
+        }
 
         self.filename = endName.removingExtremeCombiningCharacters
         super.init()

wire-ios-data-model/Source/Public/ZMMessage.h

@@ -39,6 +39,7 @@
 
 @protocol ZMImageMessageData <NSObject>
 
+@property (nonatomic, readonly, nullable) NSString *name;
 @property (nonatomic, readonly, nullable) NSData *imageData; ///< This will either returns the mediumData or the original image data. Useful only for newly inserted messages.
 @property (nonatomic, readonly, nullable) NSString *imageDataIdentifier; /// This can be used as a cache key for @c -imageData
 

wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift

@@ -51,6 +51,7 @@ public protocol LegacyFeatureRepositoryInterface {
     func storeConsumableNotifications(_ consumableNotifications: Feature.ConsumableNotifications)
     func fetchChatBubblesSimple() -> Feature.ChatBubblesSimple
     func storeChatBubblesSimple(_ chatBubblesSimple: Feature.ChatBubblesSimple)
+    func fetchAssetAuditLog() -> Feature.AssetAuditLog
 }
 
 /// **Do not use it for new code, use FeatureConfigRepository instead**
@@ -536,6 +537,16 @@ public class LegacyFeatureRepository: LegacyFeatureRepositoryInterface {
         }
     }
 
+    // MARK: - Asset audit log
+
+    public func fetchAssetAuditLog() -> Feature.AssetAuditLog {
+        guard let feature = Feature.fetch(name: .assetAuditLog, context: context) else {
+            return .init()
+        }
+
+        return .init(status: feature.status)
+    }
+
     // MARK: - Methods
 
     func createDefaultConfigsIfNeeded() {

wire-ios-data-model/Source/Utilis/Protos/GenericMessage+Assets.swift

@@ -60,11 +60,17 @@ public extension GenericMessageProtocol.Asset {
         }
     }
 
-    init(imageSize: CGSize, mimeType: String, size: UInt64) {
+    init(
+        name: String,
+        mimeType: String,
+        imageSize: CGSize,
+        size: UInt64
+    ) {
         self = GenericMessageProtocol.Asset.with {
             $0.original = GenericMessageProtocol.Asset.Original.with {
-                $0.size = size
+                $0.name = name
                 $0.mimeType = mimeType
+                $0.size = size
                 $0.image = GenericMessageProtocol.Asset.ImageMetaData.with {
                     $0.width = Int32(imageSize.width)
                     $0.height = Int32(imageSize.height)
@@ -228,12 +234,14 @@ public extension GenericMessageProtocol.Asset.RemoteData {
 
 extension GenericMessage {
     mutating func updateAssetOriginal(withImageProperties imageProperties: ZMIImageProperties) {
-        let asset = GenericMessageProtocol.Asset(
-            imageSize: imageProperties.size,
-            mimeType: imageProperties.mimeType,
-            size: UInt64(imageProperties.length)
-        )
-        update(asset: asset)
+        updateAsset { existingAsset in
+            existingAsset.original.mimeType = imageProperties.mimeType
+            existingAsset.original.size = UInt64(imageProperties.length)
+            existingAsset.original.image = GenericMessageProtocol.Asset.ImageMetaData.with {
+                $0.width = Int32(imageProperties.size.width)
+                $0.height = Int32(imageProperties.size.height)
+            }
+        }
     }
 
     mutating func updateAssetPreview(withUploadedOTRKey otrKey: Data, sha256: Data) {

wire-ios-data-model/Source/Utilis/Protos/GenericMessage+Helper.swift

@@ -546,7 +546,7 @@
             return self
         }
         do {
             let data = try serializedData()
             var updatedText = try Text(serializedData: data)
             updatedText.linkPreview = text.linkPreview
             return updatedText
@@ -774,8 +774,9 @@
             $0.summary = articleMetadata.summary ?? ""
             if let imageData = articleMetadata.imageData.first {
                 $0.image = GenericMessageProtocol.Asset(
-                    imageSize: CGSize(width: 0, height: 0),
+                    name: "picture.jpeg",
                     mimeType: "image/jpeg",
+                    imageSize: CGSize(width: 0, height: 0),
                     size: UInt64(imageData.count)
                 )
             }
@@ -791,8 +792,9 @@
             $0.title = twitterMetadata.message ?? ""
             if let imageData = twitterMetadata.imageData.first {
                 $0.image = GenericMessageProtocol.Asset(
-                    imageSize: CGSize(width: 0, height: 0),
+                    name: "picture.jpeg",
                     mimeType: "image/jpeg",
+                    imageSize: CGSize(width: 0, height: 0),
                     size: UInt64(imageData.count)
                 )
             }