TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 02:03:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable multi-device

Browse Source
This commit is contained in:
Mikunj 2019-10-23 11:53:38 +11:00
parent 21e529c6c9
commit f24b191164
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/activity_seed.xml
View File

@ -123,8 +123,7 @@
android:layout_height="50dp" android:layout_height="50dp"
android:background="@color/transparent" android:background="@color/transparent"
android:textColor="@color/signal_primary" android:textColor="@color/signal_primary"
android:text="Link Device (Coming Soon)" android:text="Link Device"
android:alpha="0.24"
android:elevation="0dp" android:elevation="0dp"
android:stateListAnimator="@null" /> android:stateListAnimator="@null" />

2
res/xml/preferences.xml
View File

@ -42,7 +42,7 @@
android:icon="@drawable/icon_qr_code"/> android:icon="@drawable/icon_qr_code"/>
<Preference android:key="preference_category_link_device" <Preference android:key="preference_category_link_device"
android:title="Link Device (Coming Soon)" android:title="Link Device"
android:icon="@drawable/icon_link"/> android:icon="@drawable/icon_link"/>
<Preference android:key="preference_category_seed" <Preference android:key="preference_category_seed"

4
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@ -188,13 +188,11 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
this.findPreference(PREFERENCE_CATEGORY_QR_CODE) this.findPreference(PREFERENCE_CATEGORY_QR_CODE)
.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE)); .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_QR_CODE));
// TODO: Enable this again later
/*
Preference linkDevicePreference = this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE); Preference linkDevicePreference = this.findPreference(PREFERENCE_CATEGORY_LINK_DEVICE);
// Hide if this is a slave device // Hide if this is a slave device
linkDevicePreference.setVisible(isMasterDevice); linkDevicePreference.setVisible(isMasterDevice);
linkDevicePreference.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_LINK_DEVICE)); linkDevicePreference.setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_LINK_DEVICE));
*/
Preference seedPreference = this.findPreference(PREFERENCE_CATEGORY_SEED); Preference seedPreference = this.findPreference(PREFERENCE_CATEGORY_SEED);
// Hide if this is a slave device // Hide if this is a slave device
seedPreference.setVisible(isMasterDevice); seedPreference.setVisible(isMasterDevice);

3
src/org/thoughtcrime/securesms/loki/SeedActivity.kt
View File

@ -54,8 +54,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate {
copyButton.setOnClickListener { copy() } copyButton.setOnClickListener { copy() }
toggleRegisterModeButton.setOnClickListener { mode = Mode.Register } toggleRegisterModeButton.setOnClickListener { mode = Mode.Register }
toggleRestoreModeButton.setOnClickListener { mode = Mode.Restore } toggleRestoreModeButton.setOnClickListener { mode = Mode.Restore }
// TODO: Enable this again later toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
// toggleLinkModeButton.setOnClickListener { mode = Mode.Link }
mainButton.setOnClickListener { handleMainButtonTapped() } mainButton.setOnClickListener { handleMainButtonTapped() }
Analytics.shared.track("Seed Screen Viewed") Analytics.shared.track("Seed Screen Viewed")
} }