From 016c01e79667a81cb40d31bcf5c2790ba32c83b2 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 9 Jan 2020 11:36:01 +1100 Subject: [PATCH] Don't show recovery phrase screen on slave devices --- Signal/src/Loki/View Controllers/HomeVC.swift | 5 +++-- Signal/src/Loki/View Controllers/RegisterVC.swift | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/Loki/View Controllers/HomeVC.swift b/Signal/src/Loki/View Controllers/HomeVC.swift index 56e727754..4d000f48e 100644 --- a/Signal/src/Loki/View Controllers/HomeVC.swift +++ b/Signal/src/Loki/View Controllers/HomeVC.swift @@ -89,7 +89,8 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat navigationItem.titleView = titleLabel // Set up seed reminder view if needed let hasViewedSeed = UserDefaults.standard.bool(forKey: "hasViewedSeed") - if !hasViewedSeed { + let isMasterDevice = (UserDefaults.standard.string(forKey: "masterDeviceHexEncodedPublicKey") == nil) + if !hasViewedSeed && isMasterDevice { view.addSubview(seedReminderView) seedReminderView.pin(.leading, to: .leading, of: view) seedReminderView.pin(.top, to: .top, of: view) @@ -100,7 +101,7 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat tableView.delegate = self view.addSubview(tableView) tableView.pin(.leading, to: .leading, of: view) - if !hasViewedSeed { + if !hasViewedSeed && isMasterDevice { tableViewTopConstraint = tableView.pin(.top, to: .bottom, of: seedReminderView) } else { tableViewTopConstraint = tableView.pin(.top, to: .top, of: view) diff --git a/Signal/src/Loki/View Controllers/RegisterVC.swift b/Signal/src/Loki/View Controllers/RegisterVC.swift index 61c40a430..6c465c372 100644 --- a/Signal/src/Loki/View Controllers/RegisterVC.swift +++ b/Signal/src/Loki/View Controllers/RegisterVC.swift @@ -9,7 +9,6 @@ final class RegisterVC : UIViewController { result.textColor = Colors.text result.font = Fonts.spaceMono(ofSize: Values.largeFontSize) result.numberOfLines = 0 - result.textAlignment = .center result.lineBreakMode = .byCharWrapping return result }()