wireapp · caldrian · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025
diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m
@@ -25,6 +25,7 @@
 #import "ZMManagedObject.h"
 #import "ZMUser+Internal.h"
 #import "ZMConversation+Internal.h"
+#import "ZMSLogging.h"
 
 #import <objc/runtime.h>
 #import <libkern/OSAtomic.h>

diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation.m b/wire-ios-data-model/Source/Model/Conversation/ZMConversation.m
@@ -38,6 +38,7 @@
 #import "ZMConversationListDirectory.h"
 #import <WireDataModel/WireDataModel-Swift.h>
 #import "NSPredicate+ZMSearch.h"
+#import "ZMSLogging.h"
 
 static NSString* ZMLogTag ZM_UNUSED = @"Conversations";
 
@@ -583,6 +584,7 @@ - (void)markAsUnread
     ZMMessage *lastMessageCanBeMarkedUnread = [self lastMessageCanBeMarkedUnread];
 
     if (lastMessageCanBeMarkedUnread == nil) {
+TODO: get rid of everything around ZM(S)Log, in production code log to WireLogger, in tests use printing to console, make sure that tests still fail (see hook)
         ZMLogError(@"Cannot mark as read: no message to mark in %@", self);
         return;
     }

diff --git a/wire-ios-data-model/Source/Model/Message/ZMMessage.m b/wire-ios-data-model/Source/Model/Message/ZMMessage.m
@@ -29,6 +29,7 @@
 
 #import "ZMConversation+UnreadCount.h"
 #import "ZMUpdateEvent+WireDataModel.h"
+#import "ZMSLogging.h"
 
 #import <WireDataModel/WireDataModel-Swift.h>
 #import <WireCryptobox/cbox.h>

diff --git a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage.m b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage.m
@@ -19,7 +19,7 @@
 #import "ZMOTRMessage.h"
 #import "ZMConversation+Internal.h"
 #import <WireDataModel/WireDataModel-Swift.h>
-
+#import "ZMSLogging.h"
 
 @import WireTransport;
 

diff --git a/wire-ios-data-model/Source/ZMSLogging.h b/wire-ios-data-model/Source/ZMSLogging.h
@@ -0,0 +1,37 @@
+//
+// 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/.
+//
+
+#define ZMLogError(format, ...) ZMLogWithLevel(ZMLogLevelError, format, ##__VA_ARGS__)
+#define ZMLogWarn(format, ...) ZMLogWithLevel(ZMLogLevelWarn, format, ##__VA_ARGS__)
+#define ZMLogDebug(format, ...) ZMLogWithLevelAndTag(ZMLogLevelDebug, ZMLogTag, format, ##__VA_ARGS__)
+
+#define ZMLogWithLevelAndTag(level, tag_, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:tag_ file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
+
+#define ZMLogWithLevel(level, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:0 file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj
@@ -254,6 +254,7 @@
 		5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0342E2EA1070051B07A /* GenericMessageProtocol */; };
 		5950B0372E2EA1220051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0362E2EA1220051B07A /* GenericMessageProtocol */; };
 		59537CDB2CFF8F2B00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLogging */; };
+		596224E22EB12B4600683C3F /* ZMSLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 596224E12EB12B4600683C3F /* ZMSLogging.h */; };
 		5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */; };
 		5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; };
 		5966D8342BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */; };
@@ -1019,6 +1020,7 @@
 		591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCaseTests.swift; sourceTree = "<group>"; };
 		5930D9C22D43BC33009E3514 /* zmessaging2.121.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.121.0.xcdatamodel; sourceTree = "<group>"; };
 		5947923C2EA7A576006BEC0A /* store2-131-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-131-0.wiredatabase"; sourceTree = "<group>"; };
+		596224E12EB12B4600683C3F /* ZMSLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMSLogging.h; sourceTree = "<group>"; };
 		5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalization.swift; sourceTree = "<group>"; };
 		5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizer.swift; sourceTree = "<group>"; };
 		5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizerTests.swift; sourceTree = "<group>"; };
@@ -2999,6 +3001,7 @@
 				F9A7061B1CAEE01D00C2F5FE /* Notifications */,
 				F9A706421CAEE01D00C2F5FE /* Utilis */,
 				F9C9A60C1CAD76A50039E10C /* WireDataModel.h */,
+				596224E12EB12B4600683C3F /* ZMSLogging.h */,
 				F9C9A7371CAE6D890039E10C /* ConversationList */,
 				599EA3D12C246897009319D4 /* ConversationSearch */,
 				F9C9A6A01CAD7C7F0039E10C /* Public */,
@@ -3219,6 +3222,7 @@
 			files = (
 				F9A706C81CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h in Headers */,
 				F9331C871CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h in Headers */,
+				596224E22EB12B4600683C3F /* ZMSLogging.h in Headers */,
 				F9A706561CAEE01D00C2F5FE /* NSNotification+ManagedObjectContextSave.h in Headers */,
 				59EC73F72C20B03100E5C036 /* NSManagedObjectContext+executeFetchRequestOrAssert.h in Headers */,
 				F9A706801CAEE01D00C2F5FE /* ZMMessage+Internal.h in Headers */,

diff --git a/wire-ios-mocktransport/Source/MockTransportSession.m b/wire-ios-mocktransport/Source/MockTransportSession.m
@@ -30,6 +30,7 @@
 #import "MockReachability.h"
 #import "WireMockTransport/WireMockTransport-Swift.h"
 #import "NSManagedObjectContext+executeFetchRequestOrAssert.h"
+#import "ZMSLogging.h"
 
 NSString * const ZMPushChannelStateChangeNotificationName = @"ZMPushChannelStateChangeNotification";
 NSString * const ZMPushChannelIsOpenKey = @"pushChannelIsOpen";

diff --git a/wire-ios-mocktransport/Source/ZMSLogging.h b/wire-ios-mocktransport/Source/ZMSLogging.h
@@ -0,0 +1,36 @@
+//
+// 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/.
+//
+
+#define ZMLogError(format, ...) ZMLogWithLevel(ZMLogLevelError, format, ##__VA_ARGS__)
+#define ZMLogDebug(format, ...) ZMLogWithLevelAndTag(ZMLogLevelDebug, ZMLogTag, format, ##__VA_ARGS__)
+
+#define ZMLogWithLevelAndTag(level, tag_, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:tag_ file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
+
+#define ZMLogWithLevel(level, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:0 file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
diff --git a/wire-ios-mocktransport/Tests/Source/MockTransportSessionTests.m b/wire-ios-mocktransport/Tests/Source/MockTransportSessionTests.m
@@ -26,6 +26,7 @@
 #import "MockTransportSessionTests.h"
 #import <libkern/OSAtomic.h>
 #import <WireMockTransport/WireMockTransport-Swift.h>
+#import "ZMSLogging.h"
 
 @interface TestPushChannelEvent()
 

diff --git a/wire-ios-request-strategy/Sources/Object Syncs/Upstream/ZMUpstreamInsertedObjectSync.m b/wire-ios-request-strategy/Sources/Object Syncs/Upstream/ZMUpstreamInsertedObjectSync.m
@@ -26,6 +26,7 @@
 #import "ZMLocallyModifiedObjectSet.h"
 #import "ZMUpstreamTranscoder.h"
 #import "ZMUpstreamRequest.h"
+#import "ZMSLogging.h"
 
 @interface ZMUpstreamInsertedObjectSync ()
 

diff --git a/...s-request-strategy/Sources/Request Strategies/Base Strategies/ZMAbstractRequestStrategy.m b/...s-request-strategy/Sources/Request Strategies/Base Strategies/ZMAbstractRequestStrategy.m
@@ -19,6 +19,7 @@
 #import <Foundation/Foundation.h>
 #import <WireRequestStrategy/WireRequestStrategy-Swift.h>
 #import "ZMAbstractRequestStrategy.h"
+#import "ZMSLogging.h"
 
 static NSString* ZMLogTag ZM_UNUSED = @"Request Configuration";
 

diff --git a/wire-ios-request-strategy/Sources/ZMSLogging.h b/wire-ios-request-strategy/Sources/ZMSLogging.h
@@ -0,0 +1,28 @@
+//
+// 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/.
+//
+
+#define ZMLogInfo(format, ...) ZMLogWithLevelAndTag(ZMLogLevelInfo, ZMLogTag, format, ##__VA_ARGS__)
+#define ZMLogDebug(format, ...) ZMLogWithLevelAndTag(ZMLogLevelDebug, ZMLogTag, format, ##__VA_ARGS__)
+
+#define ZMLogWithLevelAndTag(level, tag_, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:tag_ file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj
@@ -195,6 +195,7 @@
 		59271BF02B90D2510019B726 /* MockOTREntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BEE2B90D24A0019B726 /* MockOTREntity.swift */; };
 		59537D852CFF9D1600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLogging */; };
 		59537D872CFF9DF600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLogging */; };
+		596224E42EB12C0800683C3F /* ZMSLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 596224E32EB12C0800683C3F /* ZMSLogging.h */; };
 		597B70C92B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */; };
 		597B70CC2B03CC83006C2121 /* UpdateConversationProtocolActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */; };
 		598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042F2C89C67E00B64D71 /* WireFoundation */; };
@@ -700,6 +701,7 @@
 		547E664C1F7512FE008CB1FA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		59271BEC2B90D2140019B726 /* ClientRegistrationDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClientRegistrationDelegate.swift; sourceTree = "<group>"; };
 		59271BEE2B90D24A0019B726 /* MockOTREntity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockOTREntity.swift; sourceTree = "<group>"; };
+		596224E32EB12C0800683C3F /* ZMSLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMSLogging.h; sourceTree = "<group>"; };
 		597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandler.swift; sourceTree = "<group>"; };
 		597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandlerTests.swift; sourceTree = "<group>"; };
 		598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1356,6 +1358,7 @@
 				F1CD5D822024C1A0008C574E /* Request Syncs */,
 				E69A021F2B85095F00126FF6 /* Services */,
 				06474D4824AF6825002C695D /* Synchronization */,
+				596224E32EB12C0800683C3F /* ZMSLogging.h */,
 				1669016D1D707509000FE4AF /* WireRequestStrategy.h */,
 			);
 			path = Sources;
@@ -2135,6 +2138,7 @@
 				166901DF1D7081C7000FE4AF /* ZMRemoteIdentifierObjectSync.h in Headers */,
 				166901F61D7081C7000FE4AF /* ZMUpstreamTranscoder.h in Headers */,
 				166901E51D7081C7000FE4AF /* ZMSyncOperationSet.h in Headers */,
+				596224E42EB12C0800683C3F /* ZMSLogging.h in Headers */,
 				166901F31D7081C7000FE4AF /* ZMUpstreamModifiedObjectSync+Testing.h in Headers */,
 				166901D01D7081C7000FE4AF /* ZMContextChangeTracker.h in Headers */,
 				166901E31D7081C7000FE4AF /* ZMSingleRequestSync.h in Headers */,

diff --git a/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m b/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m
@@ -23,7 +23,7 @@
 #import "ZMMissingUpdateEventsTranscoder+Internal.h"
 #import <WireSyncEngine/WireSyncEngine-Swift.h>
 #import "WireSyncEngineLogs.h"
-
+#import "ZMSLogging.h"
 
 static NSString * const LastUpdateEventIDStoreKey = @"LastUpdateEventID";
 static NSString * const NotificationsKey = @"notifications";

diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy+ManagedObjectChanges.m b/wire-ios-sync-engine/Source/Synchronization/ZMSyncStrategy+ManagedObjectChanges.m
@@ -20,6 +20,7 @@
 #import "ZMSyncStrategy+ManagedObjectChanges.h"
 #import "WireSyncEngineLogs.h"
 #import <WireSyncEngine/WireSyncEngine-Swift.h>
+#import "ZMSLogging.h"
 
 @implementation ZMSyncStrategy (ManagedObjectChanges)
 

diff --git a/wire-ios-sync-engine/Source/UnauthenticatedSession/ZMAuthenticationStatus.m b/wire-ios-sync-engine/Source/UnauthenticatedSession/ZMAuthenticationStatus.m
@@ -27,6 +27,7 @@
 #import "ZMUserSessionRegistrationNotification.h"
 #import <WireSyncEngine/WireSyncEngine-Swift.h>
 #import "ZMAuthenticationStatus_Internal.h"
+#import "ZMSLogging.h"
 
 static NSString *const TimerInfoOriginalCredentialsKey = @"credentials";
 static NSString *const AuthenticationCenterDataChangeNotificationName = @"ZMAuthenticationStatusDataChangeNotificationName";

diff --git a/wire-ios-sync-engine/Source/UserSession/ZMBlacklistDownloader.m b/wire-ios-sync-engine/Source/UserSession/ZMBlacklistDownloader.m
@@ -23,6 +23,7 @@
 
 #import "ZMBlacklistDownloader+Testing.h"
 #import <WireSyncEngine/WireSyncEngine-Swift.h>
+#import "ZMSLogging.h"
 
 static NSString *ZMLogTag ZM_UNUSED = @"Blacklist";
 

diff --git a/wire-ios-sync-engine/Source/ZMSLogging.h b/wire-ios-sync-engine/Source/ZMSLogging.h
@@ -0,0 +1,37 @@
+//
+// 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/.
+//
+
+#define ZMLogError(format, ...) ZMLogWithLevel(ZMLogLevelError, format, ##__VA_ARGS__)
+#define ZMLogInfo(format, ...) ZMLogWithLevelAndTag(ZMLogLevelInfo, ZMLogTag, format, ##__VA_ARGS__)
+#define ZMLogDebug(format, ...) ZMLogWithLevelAndTag(ZMLogLevelDebug, ZMLogTag, format, ##__VA_ARGS__)
+
+#define ZMLogWithLevelAndTag(level, tag_, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:tag_ file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
+
+#define ZMLogWithLevel(level, format, ...) \
+    do { \
+        NSString *message = [[NSString alloc] initWithFormat:format, ##__VA_ARGS__]; \
+        [ZMSLog logWithLevel:level message:^NSString * _Nonnull { \
+            return message; \
+        } tag:0 file:[NSString stringWithUTF8String:__FILE__] line:(NSUInteger)__LINE__]; \
+    } while (0)
diff --git a/wire-ios-sync-engine/Tests/Source/MessagingTest.m b/wire-ios-sync-engine/Tests/Source/MessagingTest.m
@@ -38,6 +38,7 @@
 #import "ZMLastUpdateEventIDTranscoder.h"
 #import "ZMLoginTranscoder.h"
 #import "ZMLoginCodeRequestTranscoder.h"
+#import "ZMSLogging.h"
 #import <WireSyncEngine/WireSyncEngine-Swift.h>
 #import "Tests-Swift.h"