Re-enable multi device

Signal/src/Loki/Onboarding/SeedVC.swift

@@ -50,7 +50,7 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
     }()
     
     private lazy var linkButton1: OWSFlatButton = {
-        let result = createLinkButton(title: NSLocalizedString("Link Device (Coming Soon)", comment: ""), selector: #selector(handleSwitchModeButton2Tapped))
+        let result = createLinkButton(title: NSLocalizedString("Link Device", comment: ""), selector: #selector(handleSwitchModeButton2Tapped))
         result.accessibilityIdentifier = "onboarding.keyPairStep.linkButton1"
         result.setBackgroundColors(upColor: .clear, downColor: .clear)
         return result
@@ -111,7 +111,7 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
     }()
     
     private lazy var linkButton2: OWSFlatButton = {
-        let result = createLinkButton(title: NSLocalizedString("Link Device (Coming Soon)", comment: ""), selector: #selector(handleSwitchModeButton2Tapped))
+        let result = createLinkButton(title: NSLocalizedString("Link Device", comment: ""), selector: #selector(handleSwitchModeButton2Tapped))
         result.accessibilityIdentifier = "onboarding.keyPairStep.linkButton2"
         result.setBackgroundColors(upColor: .clear, downColor: .clear)
         return result
@@ -224,11 +224,6 @@ final class SeedVC : OnboardingBaseViewController, DeviceLinkingModalDelegate {
         restoreStackView.autoVCenterInSuperview()
         linkStackView.autoPinWidthToSuperview()
         linkStackView.autoVCenterInSuperview()
-        // TODO: Enable this again later
-        linkButton1.isUserInteractionEnabled = false
-        linkButton1.alpha = 0.24
-        linkButton2.isUserInteractionEnabled = false
-        linkButton2.alpha = 0.24
     }
     
     // MARK: General

Signal/src/ViewControllers/AppSettings/AppSettingsViewController.m

@@ -250,11 +250,7 @@
     [section addItem:[OWSTableItem itemWithTitle:NSLocalizedString(@"Show QR Code", @"") actionBlock:^{ [weakSelf showQRCode]; }]];
     if (isMasterDevice) {
         [section addItem:[OWSTableItem itemWithTitle:NSLocalizedString(@"Link Device", @"") actionBlock:^{
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Coming Soon" message:nil preferredStyle:UIAlertControllerStyleAlert];
+            [weakSelf linkDevice];
-            [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { }]];
-            [self presentViewController:alert animated:YES completion:nil];
-            // TODO: Enable this again later
-//            [weakSelf linkDevice];
         }]];
         [section addItem:[OWSTableItem itemWithTitle:NSLocalizedString(@"Show Seed", @"") actionBlock:^{ [weakSelf showSeed]; }]];
     }

Signal/translations/en.lproj/Localizable.strings

@@ -2624,7 +2624,6 @@
 "Loki Messenger is currently in beta. For development purposes the beta version collects basic usage statistics and crash logs. In addition, the beta version doesn't provide full privacy and shouldn't be used to transmit sensitive information." = "Loki Messenger is currently in beta. For development purposes the beta version collects basic usage statistics and crash logs. In addition, the beta version doesn't provide full privacy and shouldn't be used to transmit sensitive information.";
 "Copy Public Key" = "Copy Public Key";
 "Link Device" = "Link Device";
-"Link Device (Coming Soon)" = "Link Device (Coming Soon)";
 "Waiting for Device" = "Waiting for Device";
 "Waiting for Authorization" = "Waiting for Authorization";
 "Create a new account on your other device and click \"Link Device\" when you're at the \"Create Your Loki Messenger Account\" step to start the linking process" = "Create a new account on your other device and click \"Link Device\" when you're at the \"Create Your Loki Messenger Account\" step to start the linking process";