From 9581d88f0947c1665c820ee6b347d69cd76d872b Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 12 May 2022 14:19:52 +0200 Subject: [PATCH] Fix Conference invitation sometime not displaying in chat thread --- Classes/LinphoneUI/UIChatBubbleTextCell.h | 1 + Classes/LinphoneUI/UIChatBubbleTextCell.m | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.h b/Classes/LinphoneUI/UIChatBubbleTextCell.h index 941d44364..604af74d5 100644 --- a/Classes/LinphoneUI/UIChatBubbleTextCell.h +++ b/Classes/LinphoneUI/UIChatBubbleTextCell.h @@ -69,6 +69,7 @@ @property (weak, nonatomic) IBOutlet UIImageView *replyTransferIcon; @property (weak, nonatomic) IBOutlet UILabel *replyTransferLabel; @property (weak, nonatomic) IBOutlet UIView *photoCellContentView; +@property UIView *icsBubbleView; @property(nonatomic) BOOL isFirst; diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m index da123c580..973461edc 100644 --- a/Classes/LinphoneUI/UIChatBubbleTextCell.m +++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m @@ -30,7 +30,6 @@ @implementation UIChatBubbleTextCell -ICSBubbleView *icsBubbleView; #pragma mark - Lifecycle Functions @@ -47,10 +46,10 @@ ICSBubbleView *icsBubbleView; UIView *sub = ((UIView *)[arrayOfViews objectAtIndex:arrayOfViews.count - 1]); [self setFrame:CGRectMake(0, 0, sub.frame.size.width, sub.frame.size.height)]; [self addSubview:sub]; - icsBubbleView = [[ICSBubbleView alloc] init]; - icsBubbleView.frame = CGRectMake(_messageText.frame.origin.x, _messageText.frame.origin.y+25, CONFERENCE_INVITATION_WIDTH-80, CONFERENCE_INVITATION_HEIGHT-20); - [self.innerView addSubview:icsBubbleView]; - [icsBubbleView setLayoutConstraintsWithView:self.backgroundColorImage]; + self.icsBubbleView = [[ICSBubbleView alloc] init]; + self.icsBubbleView.frame = CGRectMake(_messageText.frame.origin.x, _messageText.frame.origin.y+25, CONFERENCE_INVITATION_WIDTH-80, CONFERENCE_INVITATION_HEIGHT-20); + [self.innerView addSubview:self.icsBubbleView]; + [(ICSBubbleView*)self.icsBubbleView setLayoutConstraintsWithView:self.backgroundColorImage]; } } @@ -287,11 +286,11 @@ ICSBubbleView *icsBubbleView; // ICS for conference invitations if ([ICSBubbleView isConferenceInvitationMessageWithCmessage:self.message]) { - [icsBubbleView setFromChatMessageWithCmessage:self.message]; - icsBubbleView.hidden = false; + [(ICSBubbleView*)self.icsBubbleView setFromChatMessageWithCmessage:self.message]; + self.icsBubbleView.hidden = false; _messageText.hidden = true; } else { - icsBubbleView.hidden = true; + self.icsBubbleView.hidden = true; _messageText.hidden = false; }