diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2020-03-11 12:12:32 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2020-03-11 12:12:32 -0400 |
commit | 8509481ddac038bbb481b1a818c46fea6812348f (patch) | |
tree | b5b371becb0ed6337c423a2e451370b5c5bf55fb | |
parent | 1eda911c3d4afbf89829ba943bff0f29c212aee7 (diff) | |
download | sdl_ios-8509481ddac038bbb481b1a818c46fea6812348f.tar.gz |
Fix major change -> minor change
-rw-r--r-- | SmartDeviceLink/SDLDisplayCapability.h | 6 | ||||
-rw-r--r-- | SmartDeviceLink/SDLDisplayCapability.m | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/SmartDeviceLink/SDLDisplayCapability.h b/SmartDeviceLink/SDLDisplayCapability.h index 247ec5c8c..7be6a589e 100644 --- a/SmartDeviceLink/SDLDisplayCapability.h +++ b/SmartDeviceLink/SDLDisplayCapability.h @@ -23,15 +23,17 @@ NS_ASSUME_NONNULL_BEGIN */ - (instancetype)initWithDisplayName:(NSString *)displayName; +/// This method is broken (the types don't match the parameter names) and will always return nil. Use initWithDisplayName:windowCapabilities:windowTypeSupported: instead. +- (instancetype)initWithDisplayName:(NSString *)displayName windowTypeSupported:(nullable NSArray<SDLWindowCapability *> *)windowTypeSupported windowCapabilities:(nullable NSArray<SDLWindowTypeCapabilities *> *)windowCapabilities __deprecated_msg("This method is broken and will return nil every time. Use initWithDisplayName:windowCapabilities:windowTypeSupported: instead"); /** Init with all the properities @param displayName Name of the display. - @param windowTypeSupported Informs the application how many windows the app is allowed to create per type. @param windowCapabilities Contains a list of capabilities of all windows related to the app. @see windowCapabilities + @param windowTypeSupported Informs the application how many windows the app is allowed to create per type. */ -- (instancetype)initWithDisplayName:(NSString *)displayName windowTypeSupported:(nullable NSArray<SDLWindowTypeCapabilities *> *)windowTypeSupported windowCapabilities:(nullable NSArray<SDLWindowCapability *> *)windowCapabilities; +- (instancetype)initWithDisplayName:(NSString *)displayName windowCapabilities:(nullable NSArray<SDLWindowCapability *> *)windowCapabilities windowTypeSupported:(nullable NSArray<SDLWindowTypeCapabilities *> *)windowTypeSupported; /** diff --git a/SmartDeviceLink/SDLDisplayCapability.m b/SmartDeviceLink/SDLDisplayCapability.m index b4d8b319a..04c23cca2 100644 --- a/SmartDeviceLink/SDLDisplayCapability.m +++ b/SmartDeviceLink/SDLDisplayCapability.m @@ -28,7 +28,13 @@ return self; } -- (instancetype)initWithDisplayName:(NSString *)displayName windowTypeSupported:(nullable NSArray<SDLWindowTypeCapabilities *> *)windowTypeSupported windowCapabilities:(nullable NSArray<SDLWindowCapability *> *)windowCapabilities{ +- (instancetype)initWithDisplayName:(NSString *)displayName windowTypeSupported:(NSArray<SDLWindowCapability *> *)windowTypeSupported windowCapabilities:(NSArray<SDLWindowTypeCapabilities *> *)windowCapabilities { + SDLLogE(@"This method is broken (the types don't match the parameter names) and will always return nil. Use initWithDisplayName:windowCapabilities:windowTypeSupported: instead."); + + return nil; +} + +- (instancetype)initWithDisplayName:(NSString *)displayName windowCapabilities:(nullable NSArray<SDLWindowCapability *> *)windowCapabilities windowTypeSupported:(nullable NSArray<SDLWindowTypeCapabilities *> *)windowTypeSupported { self = [self initWithDisplayName:displayName]; if (!self) { return nil; |