Don't include phone number in scannable safety number QR code

also fixes #1455

// FREEBIE

Podfile.lock

@@ -44,7 +44,7 @@ PODS:
   - Reachability (3.2)
   - SAMKeychain (1.5.2)
   - SCWaveformView (1.0.0)
-  - SignalServiceKit (0.6.0):
+  - SignalServiceKit (0.7.0):
     - '25519'
     - AFNetworking
     - AxolotlKit
@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 03cde781234ade464dd26914d87e6e95afde1119
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 70e536ca8f81fbd3e0e3b4be9954717d10768717
+    :commit: 60a39f93c6d86cde883e5e798b79db19f1d46636
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -164,7 +164,7 @@ SPEC CHECKSUMS:
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
-  SignalServiceKit: c580eb2197f87212fcba9f7faf56163f410225e9
+  SignalServiceKit: f32dd13f4bdc46276e2e090719f3a88288fd78ad
   SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
   SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c

Signal/src/Models/OWSMessagesBubblesSizeCalculator.m

@@ -121,7 +121,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     // Add an extra pixel per line to fit the emoji.
     // This is a crappy solution. Long messages with only one line of emoji will have an extra pixel per line.
-    return CGSizeMake(superSize.width, superSize.height + 1.5 * lines);
+    return CGSizeMake(superSize.width, superSize.height + (CGFloat)1.5 * lines);
 }
 
 

Signal/src/view controllers/FingerprintViewController.m

@@ -84,8 +84,11 @@ NS_ASSUME_NONNULL_BEGIN
         @"Paragraph(s) shown alongside keying material when verifying privacy with {{contact name}}");
     self.instructionsLabel.text = [NSString stringWithFormat:instructionsFormat, self.contactName];
 
-    self.scanButton.titleLabel.text = NSLocalizedString(@"SCAN_CODE_ACTION",
+    NSString *scanTitle = NSLocalizedString(@"SCAN_CODE_ACTION",
         @"Button label presented with camera icon while verifying privacy credentials. Shows the camera interface.");
+    [self.scanButton setTitle:scanTitle forState:UIControlStateNormal];
+    self.scanningInstructions.text
+        = NSLocalizedString(@"SCAN_CODE_INSTRUCTIONS", @"label presented once scanning (camera) view is visible.");
 
     // Safety numbers and QR Code
     self.privacyVerificationFingerprint.text = self.fingerprint.displayableText;
@@ -166,7 +169,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)verifyCombinedFingerprintData:(NSData *)combinedFingerprintData
 {
     NSError *error;
-    if ([self.fingerprint matchesCombinedFingerprintData:combinedFingerprintData error:&error]) {
+    if ([self.fingerprint matchesLogicalFingerprintsData:combinedFingerprintData error:&error]) {
         DDLogInfo(@"%@ Successfully verified privacy.", self.tag);
         NSString *successTitle = NSLocalizedString(@"SUCCESSFUL_VERIFICATION_TITLE", nil);
         NSString *dismissText = NSLocalizedString(@"DISMISS_BUTTON_TEXT", nil);

Signal/src/view controllers/MessagesViewController.m

@@ -600,7 +600,8 @@ typedef enum : NSUInteger {
 
 - (void)showFingerprintWithTheirIdentityKey:(NSData *)theirIdentityKey theirSignalId:(NSString *)theirSignalId
 {
-    OWSFingerprintBuilder *builder = [[OWSFingerprintBuilder alloc] initWithStorageManager:self.storageManager];
+    OWSFingerprintBuilder *builder =
+        [[OWSFingerprintBuilder alloc] initWithStorageManager:self.storageManager contactsManager:self.contactsManager];
     OWSFingerprint *fingerprint =
         [builder fingerprintWithTheirSignalId:self.thread.contactIdentifier theirIdentityKey:theirIdentityKey];
     [self markAllMessagesAsRead];

Signal/src/view controllers/OWSConversationSettingsTableViewController.m

@@ -451,7 +451,9 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
         FingerprintViewController *controller = (FingerprintViewController *)segue.destinationViewController;
 
         OWSFingerprintBuilder *fingerprintBuilder =
-            [[OWSFingerprintBuilder alloc] initWithStorageManager:self.storageManager];
+            [[OWSFingerprintBuilder alloc] initWithStorageManager:self.storageManager
+                                                  contactsManager:self.contactsManager];
+
         OWSFingerprint *fingerprint = [fingerprintBuilder fingerprintWithTheirSignalId:self.thread.contactIdentifier];
 
         [controller configureWithThread:self.thread fingerprint:fingerprint contactName:self.contactName];