Merge pull request #1978 from ably/fix/1977-xcode16-analyzer-issues

[ECO-4999] Preparing for use with Xcode 16
ably · Sep 30, 2024 · 63e6f00 · 63e6f00
2 parents cb3f23d + afe1262
commit 63e6f00
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/Source/ARTDataEncoder.m b/Source/ARTDataEncoder.m
@@ -97,6 +97,9 @@ - (ARTDataEncoderOutput *)encode:(id)data {
             encoded = [data dataUsingEncoding:NSUTF8StringEncoding];
             encoding = [NSString artAddEncoding:@"utf-8" toString:encoding];
         }
+        if (encoded == nil) {
+            return [[ARTDataEncoderOutput alloc] initWithData:data encoding:nil errorInfo:[ARTErrorInfo createWithCode:0 message:@"must be NSString, NSData, NSArray or NSDictionary."]];
+        }
         ARTStatus *status = [_cipher encrypt:encoded output:&toBase64];
         if (status.state != ARTStateOk) {
             ARTErrorInfo *errorInfo = status.errorInfo ? status.errorInfo : [ARTErrorInfo createWithCode:0 message:@"encrypt failed"];
@@ -181,7 +184,7 @@ - (ARTDataEncoderOutput *)decode:(id)data identifier:(NSString *)identifier enco
             if (status.state != ARTStateOk) {
                 errorInfo = status.errorInfo ? status.errorInfo : [ARTErrorInfo createWithCode:ARTErrorInvalidMessageDataOrEncoding message:@"decrypt failed"];
             }
-        } else if ([encoding isEqualToString:@"vcdiff"] && _deltaCodec) {
+        } else if ([encoding isEqualToString:@"vcdiff"] && _deltaCodec && [data isKindOfClass:[NSData class]]) {
             NSError *decodeError;
             data = [_deltaCodec applyDelta:data deltaId:identifier baseId:_baseId error:&decodeError];
 

diff --git a/Test/Test Utilities/TestUtilities.swift b/Test/Test Utilities/TestUtilities.swift
@@ -1777,6 +1777,44 @@ extension ARTMessage {
     }
 
 }
+#if hasFeature(RetroactiveAttribute)
+extension ARTRealtimeConnectionState : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTRealtimeConnectionStateToStr(self)
+    }
+}
+
+extension ARTRealtimeConnectionEvent : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTRealtimeConnectionEventToStr(self)
+    }
+}
+
+extension ARTProtocolMessageAction : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTProtocolMessageActionToStr(self)
+    }
+}
+
+extension ARTRealtimeChannelState : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTRealtimeChannelStateToStr(self)
+    }
+}
+
+extension ARTChannelEvent : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTChannelEventToStr(self)
+    }
+}
+
+extension ARTPresenceAction : @retroactive CustomStringConvertible {
+    public var description : String {
+        return ARTPresenceActionToStr(self)
+    }
+}
+
+#else
 
 extension ARTRealtimeConnectionState : CustomStringConvertible {
     public var description : String {
@@ -1814,6 +1852,8 @@ extension ARTPresenceAction : CustomStringConvertible {
     }
 }
 
+#endif
+
 // MARK: - Custom Nimble Matchers
 
 /// A Nimble matcher that succeeds when two dates are quite the same.

diff --git a/Test/Tests/RealtimeClientChannelsTests.swift b/Test/Tests/RealtimeClientChannelsTests.swift
@@ -2,12 +2,21 @@ import Ably
 import Nimble
 import XCTest
 
+#if hasFeature(RetroactiveAttribute)
+// Swift isn't yet smart enough to do this automatically when bridging Objective-C APIs
+extension ARTRealtimeChannels: @retroactive Sequence {
+    public func makeIterator() -> NSFastEnumerationIterator {
+        return NSFastEnumerationIterator(iterate())
+    }
+}
+#else
 // Swift isn't yet smart enough to do this automatically when bridging Objective-C APIs
 extension ARTRealtimeChannels: Sequence {
     public func makeIterator() -> NSFastEnumerationIterator {
         return NSFastEnumerationIterator(iterate())
     }
 }
+#endif
 
 class RealtimeClientChannelsTests: XCTestCase {
     // RTS2

diff --git a/Test/Tests/RestClientChannelsTests.swift b/Test/Tests/RestClientChannelsTests.swift
@@ -2,12 +2,20 @@ import Ably
 import Nimble
 import XCTest
 
+#if hasFeature(RetroactiveAttribute)
 // Swift isn't yet smart enough to do this automatically when bridging Objective-C APIs
+extension ARTRestChannels: @retroactive Sequence {
+    public func makeIterator() -> NSFastEnumerationIterator {
+        return NSFastEnumerationIterator(iterate())
+    }
+}
+#else
 extension ARTRestChannels: Sequence {
     public func makeIterator() -> NSFastEnumerationIterator {
         return NSFastEnumerationIterator(iterate())
     }
 }
+#endif
 
 private func beAChannel(named expectedValue: String) -> Nimble.Predicate<ARTChannel> {
     return Predicate.define("be a channel with name \"\(expectedValue)\"") { actualExpression, msg -> PredicateResult in