From bf2db32f853807c29c80e27274f3471d70d4a373 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 15 Mar 2017 12:05:10 -0300
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 Signal/src/Models/TSMessageAdapaters/AttachmentUploadView.m | 3 ++-
 Signal/src/views/OWSProgressView.h                          | 6 ++++--
 Signal/src/views/OWSProgressView.m                          | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Signal/src/Models/TSMessageAdapaters/AttachmentUploadView.m b/Signal/src/Models/TSMessageAdapaters/AttachmentUploadView.m
index ef80e6c20..14e9944b7 100644
--- a/Signal/src/Models/TSMessageAdapaters/AttachmentUploadView.m
+++ b/Signal/src/Models/TSMessageAdapaters/AttachmentUploadView.m
@@ -109,9 +109,10 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *attachmentID = [userinfo objectForKey:kAttachmentUploadAttachmentIDKey];
     if ([self.attachment.uniqueId isEqualToString:attachmentID]) {
         if (!isnan(progress)) {
-            [_progressView setProgress:(float)progress];
+            [_progressView setProgress:progress];
             self.isAttachmentReady = self.attachment.isUploaded;
         } else {
+            OWSAssert(0);
             self.isAttachmentReady = YES;
         }
     }
diff --git a/Signal/src/views/OWSProgressView.h b/Signal/src/views/OWSProgressView.h
index f94a4d2d5..768a8a942 100644
--- a/Signal/src/views/OWSProgressView.h
+++ b/Signal/src/views/OWSProgressView.h
@@ -2,13 +2,15 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
-#pragma once
-
 #import <UIKit/UIKit.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface OWSProgressView : UIView
 
 @property (nonatomic) UIColor *color;
 @property (nonatomic) CGFloat progress;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Signal/src/views/OWSProgressView.m b/Signal/src/views/OWSProgressView.m
index 9e7ca977e..63cfe4caf 100644
--- a/Signal/src/views/OWSProgressView.m
+++ b/Signal/src/views/OWSProgressView.m
@@ -4,6 +4,8 @@
 
 #import "OWSProgressView.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface OWSProgressView ()
 
 @property (nonatomic) CAShapeLayer *borderLayer;
@@ -118,3 +120,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END