Merge branch 'charlesmchen/unlinkDeviceName' into release/2.34.0

6 years ago · 4f0c26d5c7
parent 83309616be db30ffb75c
commit 4f0c26d5c7
1 changed files with 1 additions and 1 deletions
--- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
@ -386,7 +386,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
 {
    NSString *confirmationTitleFormat
        = NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_TITLE", @"Alert title for confirming device deletion");
-    NSString *confirmationTitle = [NSString stringWithFormat:confirmationTitleFormat, device.name];
+    NSString *confirmationTitle = [NSString stringWithFormat:confirmationTitleFormat, device.displayName];
    NSString *confirmationMessage
        = NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_BODY", @"Alert message to confirm unlinking a device");
    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:confirmationTitle