From e8c090587fb6a31265a02007d69656f4a8439da5 Mon Sep 17 00:00:00 2001 From: Alessio Date: Wed, 1 Apr 2020 16:53:33 +0200 Subject: [PATCH] Add _Nullable to XMPPRoster Add _Nullable to method of XMPPRoster: `(NSArray *)jidsForXMPPStream:(XMPPStream * _Nullable)stream` to be able to call this from swift with a nil stream reference. This is especially useful when user wants to retrieve roster from swift code and stream is not yet connected. --- Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m | 2 +- Extensions/Roster/MemoryStorage/XMPPRosterMemoryStorage.m | 2 +- Extensions/Roster/XMPPRoster.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m b/Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m index 8101757b20..dfa30306dc 100644 --- a/Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m +++ b/Extensions/Roster/CoreDataStorage/XMPPRosterCoreDataStorage.m @@ -487,7 +487,7 @@ - (void)clearAllUsersAndResourcesForXMPPStream:(XMPPStream *)stream }]; } -- (NSArray *)jidsForXMPPStream:(XMPPStream *)stream{ +- (NSArray *)jidsForXMPPStream:(XMPPStream * _Nullable)stream { XMPPLogTrace(); diff --git a/Extensions/Roster/MemoryStorage/XMPPRosterMemoryStorage.m b/Extensions/Roster/MemoryStorage/XMPPRosterMemoryStorage.m index 40ef0c181f..5cc2296ebe 100644 --- a/Extensions/Roster/MemoryStorage/XMPPRosterMemoryStorage.m +++ b/Extensions/Roster/MemoryStorage/XMPPRosterMemoryStorage.m @@ -804,7 +804,7 @@ - (void)clearAllUsersAndResourcesForXMPPStream:(XMPPStream *)stream [[self multicastDelegate] xmppRosterDidChange:self]; } -- (NSArray *)jidsForXMPPStream:(XMPPStream *)stream +- (NSArray *)jidsForXMPPStream:(XMPPStream * _Nullable)stream { XMPPLogTrace(); AssertParentQueue(); diff --git a/Extensions/Roster/XMPPRoster.h b/Extensions/Roster/XMPPRoster.h index 70d0b7f770..e038a9e729 100644 --- a/Extensions/Roster/XMPPRoster.h +++ b/Extensions/Roster/XMPPRoster.h @@ -337,7 +337,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)clearAllResourcesForXMPPStream:(XMPPStream *)stream; - (void)clearAllUsersAndResourcesForXMPPStream:(XMPPStream *)stream; -- (NSArray *)jidsForXMPPStream:(XMPPStream *)stream; +- (NSArray *)jidsForXMPPStream:(XMPPStream * _Nullable)stream; - (void)getSubscription:(NSString * _Nullable * _Nullable)subscription ask:(NSString * _Nullable * _Nullable)ask