Respond to CR.

// FREEBIE

Signal.xcodeproj/project.pbxproj

@@ -516,8 +516,8 @@
 		E197B62418BBF5BB00F073E5 /* SoundPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = E197B62318BBF5BB00F073E5 /* SoundPlayer.m */; };
 		E197B62718BBF63B00F073E5 /* SoundBoard.m in Sources */ = {isa = PBXBuildFile; fileRef = E197B62618BBF63B00F073E5 /* SoundBoard.m */; };
 		E1CD329618BCFF9900B1A496 /* SoundInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CD329518BCFF9900B1A496 /* SoundInstance.m */; };
-		E94066151DFC5B7B00B15392 /* ContactsPicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = E94066141DFC5B7B00B15392 /* ContactsPicker.xib */; };
 		E32B0699162419B7046BC643 /* libPods-Signal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DB8EE72F8522189E3E2CB45 /* libPods-Signal.a */; };
+		E94066151DFC5B7B00B15392 /* ContactsPicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = E94066141DFC5B7B00B15392 /* ContactsPicker.xib */; };
 		EF764C351DB67CC5000D9A87 /* UIViewController+CameraPermissions.m in Sources */ = {isa = PBXBuildFile; fileRef = EF764C341DB67CC5000D9A87 /* UIViewController+CameraPermissions.m */; };
 		FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */; };
 		FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962C1A06A2190094C78E /* FingerprintViewController.m */; };

Signal/src/view controllers/CallViewController.swift

@@ -271,10 +271,10 @@ class CallViewController: UIViewController, CallDelegate {
         let ongoingCallRows = [
             rowWithSubviews(subviews:[textMessageButton, videoButton],
                             fixedHeight:buttonSize),
-            rowWithSubviews(subviews:[muteButton, speakerPhoneButton, ],
+            rowWithSubviews(subviews:[muteButton, speakerPhoneButton ],
                             fixedHeight:buttonSize),
             rowWithSubviews(subviews:[hangUpButton],
-                            fixedHeight:buttonSize),
+                            fixedHeight:buttonSize)
             ]
         let ongoingCallRowSpacing = ScaleFromIPhone5To7Plus(20, 25)
         var lastRow: UIView?
@@ -318,7 +318,7 @@ class CallViewController: UIViewController, CallDelegate {
 
     // Creates a row view that evenly spaces its subviews horizontally.
     // If there is only a single subview, it is centered.
-    func rowWithSubviews(subviews: Array<UIButton>, fixedHeight: CGFloat) -> UIView {
+    func rowWithSubviews(subviews: [UIButton], fixedHeight: CGFloat) -> UIView {
         let row = UIView()
         row.setContentHuggingVerticalHigh()
         row.autoSetDimension(.height, toSize:fixedHeight)
@@ -362,7 +362,7 @@ class CallViewController: UIViewController, CallDelegate {
     }
 
     override func updateViewConstraints() {
-        if (!hasConstraints) {
+        if !hasConstraints {
             // We only want to create our constraints once.
             //
             // Note that constraints are also created elsewhere.
@@ -487,11 +487,11 @@ class CallViewController: UIViewController, CallDelegate {
 
     func incomingCallControls() -> [UIView] {
         // TODO: Should this include textMessageButton?
-        return [ acceptIncomingButton, declineIncomingButton, ]
+        return [ acceptIncomingButton, declineIncomingButton ]
     }
 
     func ongoingCallControls() -> [UIView] {
-        return [ muteButton, speakerPhoneButton, textMessageButton, hangUpButton, videoButton, ]
+        return [ muteButton, speakerPhoneButton, textMessageButton, hangUpButton, videoButton ]
     }
 
     // MARK: - Actions