Skip to content

Commit 6ddf3a3

Browse files
committed
Merge branch 'release/v7.2.1' into 'master'
Release 7.2.1 See merge request megachat/MEGAchat!2023
2 parents eec36bb + 991c8df commit 6ddf3a3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

bindings/Objective-C/Private/DelegateMEGAChatCallListener.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
MegaChatCall *tempCall = call->copy();
2323
MEGAChatSdk *tempMEGAChatSdk = this->megaChatSdk;
2424
id<MEGAChatCallDelegate>tempListener = this->listener;
25-
dispatch_async(dispatch_get_main_queue(), ^{
25+
dispatch(this->queueType, ^{
2626
[tempListener onChatCallUpdate:tempMEGAChatSdk call:[[MEGAChatCall alloc] initWithMegaChatCall:tempCall cMemoryOwn:YES]];
2727
});
2828
}
@@ -33,7 +33,7 @@
3333
MegaChatSession *tempSession = session->copy();
3434
MEGAChatSdk *tempMEGAChatSdk = this->megaChatSdk;
3535
id<MEGAChatCallDelegate>tempListener = this->listener;
36-
dispatch_async(dispatch_get_main_queue(), ^{
36+
dispatch(this->queueType, ^{
3737
[tempListener onChatSessionUpdate:tempMEGAChatSdk chatId:chatid callId:callid session:[MEGAChatSession.alloc initWithMegaChatSession:tempSession cMemoryOwn:YES]];
3838
});
3939
}

bindings/Objective-C/include/MEGAChatCall.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ typedef NS_ENUM (NSInteger, MEGAChatCallNotificationType) {
116116
@property (nonatomic, readonly) uint64_t peeridCallCompositionChange;
117117
@property (nonatomic, readonly) MEGAChatCallCompositionChange callCompositionChange;
118118
@property (nonatomic, readonly) NSInteger numParticipants;
119-
@property (nonatomic, readonly) MEGAHandleList *participants;
120-
@property (nonatomic, readonly) MEGAHandleList *sessionsClientId;
119+
@property (nonatomic, readonly, nullable) MEGAHandleList *participants;
120+
@property (nonatomic, readonly, nullable) MEGAHandleList *sessionsClientId;
121121

122122
@property (nonatomic, readonly, getter=hasLocalAudio) BOOL localAudio;
123123
@property (nonatomic, readonly, getter=hasLocalVideo) BOOL localVideo;
@@ -132,19 +132,19 @@ typedef NS_ENUM (NSInteger, MEGAChatCallNotificationType) {
132132
@property (nonatomic, readonly, getter=isOwnClientCaller) BOOL ownClientCaller;
133133
@property (nonatomic, readonly, getter=isSpeakPermissionFlagEnabled) BOOL speakPermissionFlagEnabled;
134134

135-
@property (nonatomic, readonly) MEGAHandleList *moderators;
135+
@property (nonatomic, readonly, nullable) MEGAHandleList *moderators;
136136

137137
@property (nonatomic, readonly) MEGAChatWaitingRoomStatus waitingRoomJoiningStatus;
138-
@property (nonatomic, readonly) MEGAChatWaitingRoom *waitingRoom;
139-
@property (nonatomic, readonly) MEGAHandleList *waitingRoomHandleList;
138+
@property (nonatomic, readonly, nullable) MEGAChatWaitingRoom *waitingRoom;
139+
@property (nonatomic, readonly, nullable) MEGAHandleList *waitingRoomHandleList;
140140

141-
@property (nonatomic, readonly) MEGAHandleList *speakersList;
142-
@property (nonatomic, readonly) MEGAHandleList *speakRequestsList;
143-
@property (nonatomic, readonly) MEGAHandleList *raiseHandsList;
141+
@property (nonatomic, readonly, nullable) MEGAHandleList *speakersList;
142+
@property (nonatomic, readonly, nullable) MEGAHandleList *speakRequestsList;
143+
@property (nonatomic, readonly, nullable) MEGAHandleList *raiseHandsList;
144144

145145
- (BOOL)hasChangedForType:(MEGAChatCallChangeType)changeType;
146146

147-
- (MEGAHandleList *)sessionsClientIdByUserHandle:(uint64_t)userHandle;
147+
- (nullable MEGAHandleList *)sessionsClientIdByUserHandle:(uint64_t)userHandle;
148148

149149
- (BOOL)hasUserSpeakPermission:(uint64_t)userHandle;
150150
- (BOOL)hasUserPendingSpeakRequest:(uint64_t)userHandle;

0 commit comments

Comments
 (0)