From 1bea832faaaf0204cae6928504acfce493391162 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 2 Apr 2018 15:05:54 -0400
Subject: [PATCH] Fix assert in bubble views.
---
.../ConversationView/Cells/OWSBubbleStrokeView.m | 6 +++++-
.../ConversationView/Cells/OWSBubbleView.m | 10 ++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m
index 81feef6e4..368f44fef 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleStrokeView.m
@@ -31,6 +31,8 @@ NS_ASSUME_NONNULL_BEGIN
self.shapeLayer = [CAShapeLayer new];
[self.layer addSublayer:self.shapeLayer];
+ [self updateLayers];
+
return self;
}
@@ -79,7 +81,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)updateLayers
{
- OWSAssert(self.shapeLayer);
+ if (!self.shapeLayer) {
+ return;
+ }
// Don't fill the shape layer; we just want a stroke around the border.
self.shapeLayer.fillColor = [UIColor clearColor].CGColor;
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
index a020da0e1..33a74a10a 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
@@ -41,6 +41,8 @@ const CGFloat kBubbleTextVInset = 10.f;
self.maskLayer = [CAShapeLayer new];
self.layer.mask = self.maskLayer;
+ [self updateLayers];
+
return self;
}
@@ -132,8 +134,12 @@ const CGFloat kBubbleTextVInset = 10.f;
- (void)updateLayers
{
- OWSAssert(self.maskLayer);
- OWSAssert(self.shapeLayer);
+ if (!self.maskLayer) {
+ return;
+ }
+ if (!self.shapeLayer) {
+ return;
+ }
UIBezierPath *bezierPath = [self maskPath];