From f24b191164b9b7755f5afe4d90095a132222a064 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Wed, 23 Oct 2019 11:53:38 +1100
Subject: [PATCH] Re-enable multi-device

---
 res/layout/activity_seed.xml                                  | 3 +--
 res/xml/preferences.xml                                       | 2 +-
 .../securesms/ApplicationPreferencesActivity.java             | 4 +---
 src/org/thoughtcrime/securesms/loki/SeedActivity.kt           | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index cd79c01125..1ac6b7e57a 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -123,8 +123,7 @@
             android:layout_height="50dp"
             android:background="@color/transparent"
             android:textColor="@color/signal_primary"
-            android:text="Link Device (Coming Soon)"
-            android:alpha="0.24"
+            android:text="Link Device"
             android:elevation="0dp"
             android:stateListAnimator="@null" />
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 666ee32098..270c9254d3 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -42,7 +42,7 @@
                 android:icon="@drawable/icon_qr_code"/>
 
     <Preference android:key="preference_category_link_device"
-                android:title="Link Device (Coming Soon)"
+                android:title="Link Device"
                 android:icon="@drawable/icon_link"/>
 
     <Preference android:key="preference_category_seed"
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 840029356e..57330e0685 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -188,13 +188,11 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       this.findPreference(PREFERENCE_CATEGORY_QR_CODE)
         .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE));
 
-      // TODO: Enable this again later
-      /*
       Preference linkDevicePreference = this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE);
       // Hide if this is a slave device
       linkDevicePreference.setVisible(isMasterDevice);
       linkDevicePreference.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_LINK_DEVICE));
-       */
+
       Preference seedPreference = this.findPreference(PREFERENCE_CATEGORY_SEED);
       // Hide if this is a slave device
       seedPreference.setVisible(isMasterDevice);
diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
index 33dd27e62c..a98b6c5a46 100644
--- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
@@ -54,8 +54,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate {
         copyButton.setOnClickListener { copy() }
         toggleRegisterModeButton.setOnClickListener { mode = Mode.Register }
         toggleRestoreModeButton.setOnClickListener { mode = Mode.Restore }
-        // TODO: Enable this again later
-//        toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
+        toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
         mainButton.setOnClickListener { handleMainButtonTapped() }
         Analytics.shared.track("Seed Screen Viewed")
     }