Merge branch 'charlesmchen/cleanup'

src/Security/OWSFingerprint.m

@@ -1,5 +1,6 @@
-//  Created by Michael Kirk on 9/14/16.
+//
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSFingerprint.h"
 #import "NSData+Base64.h"
@@ -97,7 +98,7 @@ static uint32_t const OWSFingerprintDefaultHashIterations = 5200;
             return NO;
         } else {
             // Sync log in case we bail.
-            NSLog(@"%@ parsing QRCode data failed with error: %@", self.tag, exception);
+            DDLogError(@"%@ parsing QRCode data failed with error: %@", self.tag, exception);
             @throw exception;
         }
     }