chore: Migrate some obj-c code to Swift in WireImages - WPB-15697

wire-ios-images/Sources/Image Processing/ImageProperties.swift

@@ -0,0 +1,38 @@
+//
+// 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 CoreGraphics
+import Foundation
+
+@objc
+public class ZMIImageProperties: NSObject {
+    @objc public let size: CGSize
+    @objc public let length: UInt
+    @objc public let mimeType: String
+
+    @objc
+    public init(size: CGSize, length: UInt, mimeType: String) {
+        self.size = size
+        self.length = length
+        self.mimeType = mimeType
+    }
+
+    public override var description: String {
+        "{ length: \(length), type: \(mimeType), size: (\(size.width), \(size.height)}"
+    }
+}

wire-ios-images/Sources/Image Processing/ZMAssetsPreprocessor.h

@@ -22,6 +22,7 @@
 #import <WireImages/ZMImageDownsampleOperation.h>
 
 @protocol ZMAssetsPreprocessorDelegate;
+@protocol ZMImageOwner;
 
 
 @protocol ZMAssetsPreprocessor <NSObject>

wire-ios-images/Sources/Image Processing/ZMAssetsPreprocessor.m

@@ -22,7 +22,7 @@
 #import "ZMImageLoadOperation.h"
 #import "ZMImageOwner.h"
 #import "ZMImageDownsampleOperation.h"
-
+#import <WireImages/WireImages-Swift.h>
 
 @implementation ZMAssetsPreprocessor
 

wire-ios-images/Sources/Image Processing/ZMImageDownsampleOperation.h

@@ -19,9 +19,9 @@
 @import Foundation;
 
 #import <WireImages/ZMImageOwner.h>
-#import <WireImages/ZMIImageProperties.h>
 
 @class ZMImageLoadOperation;
+@class ZMIImageProperties;
 
 
 typedef NS_ENUM (int16_t, ZMImageDownsampleType) {

wire-ios-images/Sources/Image Processing/ZMImageLoadOperation.h

@@ -19,7 +19,7 @@
 @import Foundation;
 @import CoreGraphics;
 
-#import <WireImages/ZMIImageProperties.h>
+@class ZMIImageProperties;
 
 @interface ZMImageLoadOperation : NSOperation
 

wire-ios-images/Sources/Image Processing/ZMImageLoadOperation.m

@@ -21,7 +21,7 @@
 @import WireSystem;
 
 #import "ZMImageLoadOperation.h"
-
+#import <WireImages/WireImages-Swift.h>
 
 @interface ZMImageLoadOperation ()
 {
@@ -108,11 +108,7 @@ - (void)main;
     CGSize size = [self imageSizeFromSourceImage];
     NSUInteger length = (NSUInteger) [(NSNumber *)self.sourceImageProperties[(__bridge id) kCGImagePropertyFileSize] intValue];
     NSString *mimeType = (__bridge id) CGImageSourceGetType(_source);
-    self.computedImageProperties = [ZMIImageProperties
-                                    imagePropertiesWithSize:size
-                                    length:length
-                                    mimeType:mimeType
-                                    ];
+    self.computedImageProperties = [[ZMIImageProperties alloc] initWithSize:size length:length mimeType:mimeType];
 }
 
 - (int)tiffOrientation;

wire-ios-images/Sources/Image Processing/ZMImageOwner.h

@@ -18,7 +18,6 @@
 
 @import Foundation;
 @import CoreGraphics;
-#import "ZMIImageProperties.h"
 
 typedef NS_ENUM(NSUInteger, ZMImageFormat) {
     ZMImageFormatInvalid = 0,
@@ -27,13 +26,3 @@ typedef NS_ENUM(NSUInteger, ZMImageFormat) {
     ZMImageFormatOriginal,
     ZMImageFormatProfile
 };
-
-@protocol ZMImageOwner <NSObject>
-
-/// The image formats that this @c ZMImageOwner wants preprocessed. Order of formats determines order in which data is preprocessed
-- (nonnull NSOrderedSet *)requiredImageFormats;
-
-- (nullable NSData *)originalImageData;
-
-@end
-

wire-ios-images/Sources/Image Processing/ZMIImageProperties.h → wire-ios-images/Sources/Image Processing/ZMImageOwner.swift

@@ -16,15 +16,18 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
-@import CoreGraphics;
-@import Foundation;
+import Foundation
 
-@interface ZMIImageProperties : NSObject
+@objc
+public protocol ZMImageOwner: NSObjectProtocol {
 
-@property (nonatomic, readonly) CGSize size;
-@property (nonatomic, readonly) NSUInteger length;
-@property (nonatomic, readonly, copy) NSString *mimeType;
+    /// The image formats that this ``ZMImageOwner`` wants preprocessed. Order of formats determines order in which data
+    /// is preprocessed
 
-+ (instancetype)imagePropertiesWithSize:(CGSize)size length:(NSUInteger)length mimeType:(NSString *)type;
+    @objc
+    func requiredImageFormats() -> NSOrderedSet
 
-@end
+    @objc
+    func originalImageData() -> Data?
+
+}

wire-ios-images/Sources/WireImages.h

@@ -32,4 +32,3 @@ FOUNDATION_EXPORT const unsigned char WireImagesVersionString[];
 #import <WireImages/ZMImageLoadOperation.h>
 #import <WireImages/ZMAssetsPreprocessor.h>
 #import <WireImages/ZMImagePreprocessor.h>
-#import <WireImages/ZMIImageProperties.h>

wire-ios-images/Tests/ImageLoadOperationTests.swift

@@ -0,0 +1,79 @@
+//
+// 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
+import WireTesting
+import XCTest
+
+@testable import WireImages
+
+final class ImageLoadOperationTests: ZMTBaseTest {
+
+    func testThatItLoadsJPEGData() throws {
+        // given
+        let imageData = try XCTUnwrap(data(forResource: "unsplash_medium_exif_2", extension: "jpg"))
+        let sut = try XCTUnwrap(ZMImageLoadOperation(imageData: imageData))
+        expectation(for: NSPredicate(format: "isFinished == YES"), evaluatedWith: sut, handler: nil)
+
+        // when
+        sut.start()
+        waitForExpectations(timeout: 5)
+
+        // then
+        let tiffDictionary = try XCTUnwrap(
+            sut.sourceImageProperties[kCGImagePropertyTIFFDictionary] as? [AnyHashable: Any]
+        )
+        XCTAssertNotNil(sut.cgImage)
+        XCTAssertEqual(tiffDictionary[kCGImagePropertyTIFFOrientation] as? Int, 2)
+        XCTAssertEqual(sut.sourceImageProperties[kCGImagePropertyOrientation] as? Int, 2)
+        XCTAssertEqual(sut.sourceImageProperties[kCGImagePropertyPixelHeight] as? Double, 346)
+        XCTAssertEqual(sut.sourceImageProperties[kCGImagePropertyPixelWidth] as? Double, 531)
+        XCTAssertEqual(sut.originalImageData, imageData)
+        XCTAssertEqual(sut.computedImageProperties.mimeType, UTType.jpeg.identifier)
+        XCTAssertEqual(sut.tiffOrientation, 2)
+        XCTAssertEqual(sut.computedImageProperties.size, CGSize(width: 531, height: 346))
+    }
+
+    func testThatItDoesNotLoadWhenCancelled() throws {
+        // given
+        let imageData = try XCTUnwrap(data(forResource: "unsplash_medium", extension: "jpg"))
+        let sut = try XCTUnwrap(ZMImageLoadOperation(imageData: imageData))
+        sut.cancel()
+        expectation(for: NSPredicate(format: "isFinished == YES"), evaluatedWith: sut, handler: nil)
+
+        // when
+        sut.start()
+        waitForExpectations(timeout: 5)
+
+        // then
+        XCTAssertNil(sut.cgImage)
+        XCTAssertNil(sut.sourceImageProperties)
+    }
+
+    func testThatItDoesNotCrashOnInvalidData() throws {
+        // given
+        let imageData = try XCTUnwrap(data(forResource: "Lorem Ipsum", extension: "txt"))
+        let sut = try XCTUnwrap(ZMImageLoadOperation(imageData: imageData))
+        expectation(for: NSPredicate(format: "isFinished == YES"), evaluatedWith: sut, handler: nil)
+
+        // when
+        sut.start()
+        waitForExpectations(timeout: 5)
+    }
+
+}