Merge branch 'charlesmchen/bubbleViewsAssert'

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;

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);
+    if (!self.maskLayer) {
-    OWSAssert(self.shapeLayer);
+        return;
+    }
+    if (!self.shapeLayer) {
+        return;
+    }
 
     UIBezierPath *bezierPath = [self maskPath];