Skip to content

Commit 9137cfb

Browse files
Support iOS version 13
1 parent 3be6d88 commit 9137cfb

25 files changed

+134
-102
lines changed

Framework/Quickblox.framework/Headers/QBASession.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import <Quickblox/QBCEntity.h>
9+
#if __has_include("QBCEntity.h")
10+
#import "QBCEntity.h"
11+
#else
12+
#import <QBCEntity.h>
13+
#endif
1014

1115

1216
NS_ASSUME_NONNULL_BEGIN

Framework/Quickblox.framework/Headers/QBCBlob.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import <Quickblox/QBCEntity.h>
10-
#import <Quickblox/QBContentEnums.h>
9+
#if __has_include("QBCEntity.h")
10+
#import "QBCEntity.h"
11+
#import "QBContentEnums.h"
12+
#else
13+
#import <QBCEntity.h>
14+
#import <QBContentEnums.h>
15+
#endif
1116

1217
@class QBCBlobObjectAccess;
1318

Framework/Quickblox.framework/Headers/QBCBlobObjectAccess.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
// Copyright (c) 2017 QuickBlox. All rights reserved.
66
//
77
#import <Foundation/Foundation.h>
8-
#import <Quickblox/QBCEntity.h>
9-
#import <Quickblox/QBContentEnums.h>
8+
#if __has_include("QBCEntity.h")
9+
#import "QBCEntity.h"
10+
#import "QBContentEnums.h"
11+
#else
12+
#import <QBCEntity.h>
13+
#import <QBContentEnums.h>
14+
#endif
1015

1116
/**
1217
* QBCBlobObjectAccess class interface.

Framework/Quickblox.framework/Headers/QBCOPermissions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import <Quickblox/QBCustomObjectsEnums.h>
9+
#import "QBCustomObjectsEnums.h"
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

Framework/Quickblox.framework/Headers/QBChat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import <Quickblox/QBChatTypes.h>
9+
#import "QBChatTypes.h"
1010

1111
@protocol QBChatDelegate;
1212

Framework/Quickblox.framework/Headers/QBConnection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Created by QuickBlox team
55
// Copyright (c) 2017 QuickBlox. All rights reserved.
66

7-
#import <Quickblox/QBSettings.h>
7+
#import "QBSettings.h"
88

99
NS_ASSUME_NONNULL_BEGIN
1010

Framework/Quickblox.framework/Headers/QBContactList.h

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
//
77

88
#import <Foundation/Foundation.h>
9+
#import "QBContactListItem.h"
910

1011
NS_ASSUME_NONNULL_BEGIN
1112

12-
@class QBContactListItem;
13-
1413
/**
15-
* QBContactList class interface.
16-
* Represents user's contact list.
14+
QBContactList class interface.
15+
Represents user's contact list.
1716
*/
1817
@interface QBContactList : NSObject
1918

2019
/**
21-
* Current contacts.
20+
Current contacts.
2221
*/
2322
@property (nonatomic, readonly, nullable) NSArray<QBContactListItem *> *contacts;
2423

@@ -27,6 +26,25 @@ NS_ASSUME_NONNULL_BEGIN
2726
*/
2827
@property (nonatomic, readonly, nullable) NSArray<QBContactListItem *> *pendingApproval;
2928

29+
30+
/**
31+
How to use:
32+
QBContactListItem *item = QBChat.instance.contactList[userID];
33+
34+
@param userID userID.
35+
@return QBContactListItem isnstance if exist.
36+
*/
37+
- (nullable QBContactListItem *)objectAtIndexedSubscript:(NSUInteger)userID;
38+
39+
/**
40+
Sorted by state
41+
42+
@param state @see QBPresenseSubscriptionState
43+
@return Array of QBContactListItem items
44+
*/
45+
- (NSArray<QBContactListItem *> *)itemsSortedByState:(QBPresenseSubscriptionState)state;
46+
47+
3048
@end
3149

3250
NS_ASSUME_NONNULL_END

Framework/Quickblox.framework/Headers/QBContactListItem.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,44 @@
99

1010
NS_ASSUME_NONNULL_BEGIN
1111

12-
extern NSString * const kPresenceSubscriptionStateNone;
13-
extern NSString * const kPresenceSubscriptionStateTo;
14-
extern NSString * const kPresenceSubscriptionStateFrom;
15-
extern NSString * const kPresenceSubscriptionStateBoth;
1612

1713
typedef NS_ENUM(NSUInteger, QBPresenseSubscriptionState) {
18-
19-
QBPresenceSubscriptionStateNone = 1, // the user does not have a subscription to the contact's presence information, and the contact does not have a subscription to the user's presence information
20-
QBPresenceSubscriptionStateTo = 2, // the user has a subscription to the contact's presence information, but the contact does not have a subscription to the user's presence information
21-
QBPresenceSubscriptionStateFrom = 3, // the contact has a subscription to the user's presence information, but the user does not have a subscription to the contact's presence information
22-
QBPresenceSubscriptionStateBoth = 4, // both the user and the contact have subscriptions to each other's presence information
14+
//The user does not have a subscription to the contact's presence information, and the contact does not have a subscription to the user's presence information
15+
QBPresenceSubscriptionStateNone = 1,
16+
//The user has a subscription to the contact's presence information, but the contact does not have a subscription to the user's presence information
17+
QBPresenceSubscriptionStateTo = 2,
18+
//The contact has a subscription to the user's presence information, but the user does not have a subscription to the contact's presence information
19+
QBPresenceSubscriptionStateFrom = 3,
20+
//Both the user and the contact have subscriptions to each other's presence information
21+
QBPresenceSubscriptionStateBoth = 4,
2322
};
2423

2524
/**
26-
* QBContactListItem class interface.
27-
* Represents user's contact list item.
25+
QBContactListItem class interface.
26+
Represents user's contact list item.
2827
*/
2928
@interface QBContactListItem : NSObject
3029

3130
/**
32-
* Unique identifier of user.
31+
Unique identifier of user.
3332
*/
3433
@property (nonatomic, assign) NSUInteger userID;
3534

3635
/**
37-
* User status (online/offline).
36+
User status (online/offline).
3837
*/
3938
@property (nonatomic, assign, getter=isOnline) BOOL online;
4039

4140
/**
42-
* User subscription state. Read more about states http://xmpp.org/rfcs/rfc3921.html#roster
41+
User subscription state. Read more about states http://xmpp.org/rfcs/rfc3921.html#roster
4342
*/
4443
@property (nonatomic, assign) QBPresenseSubscriptionState subscriptionState;
4544

45+
@end
46+
47+
@interface QBContactListItem(Internal)
4648
// Helpers: translate subscriptionState to and from string to and from enum
4749
+ (QBPresenseSubscriptionState)subscriptionStateFromString:(nullable NSString *)subscriptionState;
48-
+ (nullable NSString *)subscriptionStateToString:(QBPresenseSubscriptionState)subscriptionState;
49-
5050
@end
5151

5252
NS_ASSUME_NONNULL_END

Framework/Quickblox.framework/Headers/QBMEvent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import <Quickblox/QBCEntity.h>
10-
#import <Quickblox/QBPushNotificationsEnums.h>
9+
#import "QBCEntity.h"
10+
#import "QBPushNotificationsEnums.h"
1111

1212
NS_ASSUME_NONNULL_BEGIN
1313

Framework/Quickblox.framework/Headers/QBMPushMessage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Copyright (c) 2017 QuickBlox. All rights reserved.
66
//
77

8-
#import <Quickblox/QBMPushMessageBase.h>
8+
#import "QBMPushMessageBase.h"
99

1010
NS_ASSUME_NONNULL_BEGIN
1111

0 commit comments

Comments
 (0)