Reduce code duplication, clean & fix path re-building bug

Signal/src/Loki/Components/ConversationCell.swift

@@ -134,14 +134,14 @@ final class ConversationCell : UITableViewCell {
     
     // MARK: Updating
     private func update() {
-        MentionsManager.populateUserHexEncodedPublicKeyCacheIfNeeded(for: threadViewModel.threadRecord.uniqueId!) // FIXME: This is a terrible place to do this
+        MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadViewModel.threadRecord.uniqueId!) // FIXME: This is a terrible place to do this
         unreadMessagesIndicatorView.alpha = threadViewModel.hasUnreadMessages ? 1 : 0.0001 // Setting the alpha to exactly 0 causes an issue on iOS 12
         if threadViewModel.isGroupThread {
             if threadViewModel.name == "Session Public Chat" {
                 profilePictureView.hexEncodedPublicKey = ""
                 profilePictureView.isRSSFeed = true
             } else {
-                var users = MentionsManager.userHexEncodedPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
+                var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
                 users.remove(getUserHexEncodedPublicKey())
                 let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability
                 if !randomUsers.isEmpty {

Signal/src/Loki/Utilities/MentionUtilities.swift

@@ -18,7 +18,7 @@ public final class MentionUtilities : NSObject {
         }
         var string = string
         let regex = try! NSRegularExpression(pattern: "@[0-9a-fA-F]*", options: [])
-        let knownHexEncodedPublicKeys = MentionsManager.userHexEncodedPublicKeyCache[threadID] ?? [] // Should always be populated at this point
+        let knownHexEncodedPublicKeys = MentionsManager.userPublicKeyCache[threadID] ?? [] // Should always be populated at this point
         var mentions: [(range: NSRange, hexEncodedPublicKey: String)] = []
         var outerMatch = regex.firstMatch(in: string, options: .withoutAnchoringBounds, range: NSRange(location: 0, length: string.count))
         while let match = outerMatch {

Signal/src/Loki/View Controllers/BaseVC.swift

@@ -8,6 +8,37 @@ class BaseVC : UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(handleUnexpectedDeviceLinkRequestReceivedNotification), name: .unexpectedDeviceLinkRequestReceived, object: nil)
     }
 
+    internal func setUpGradientBackground() {
+        view.backgroundColor = .clear
+        let gradient = Gradients.defaultLokiBackground
+        view.setGradient(gradient)
+    }
+
+    internal func setUpNavBarStyle() {
+        let navigationBar = navigationController!.navigationBar
+        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
+        navigationBar.shadowImage = UIImage()
+        navigationBar.isTranslucent = false
+        navigationBar.barTintColor = Colors.navigationBarBackground
+    }
+
+    internal func setNavBarTitle(_ title: String, customFontSize: CGFloat? = nil) {
+        let titleLabel = UILabel()
+        titleLabel.text = title
+        titleLabel.textColor = Colors.text
+        titleLabel.font = .boldSystemFont(ofSize: customFontSize ?? Values.veryLargeFontSize)
+        navigationItem.titleView = titleLabel
+    }
+
+    internal func setUpNavBarSessionIcon() {
+        let logoImageView = UIImageView()
+        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
+        logoImageView.contentMode = .scaleAspectFit
+        logoImageView.set(.width, to: 32)
+        logoImageView.set(.height, to: 32)
+        navigationItem.titleView = logoImageView
+    }
+
     deinit {
         NotificationCenter.default.removeObserver(self)
     }

Signal/src/Loki/View Controllers/DeviceLinksVC.swift

@@ -38,22 +38,9 @@ final class DeviceLinksVC : BaseVC, UITableViewDataSource, UITableViewDelegate,
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Devices", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Devices", comment: ""))
         // Set up link new device button
         let linkNewDeviceButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(linkNewDevice))
         linkNewDeviceButton.tintColor = Colors.text

Signal/src/Loki/View Controllers/DisplayNameVC.swift

@@ -15,23 +15,9 @@ final class DisplayNameVC : BaseVC {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Set up logo image view
-        let logoImageView = UIImageView()
-        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
-        logoImageView.contentMode = .scaleAspectFit
-        logoImageView.set(.width, to: 32)
-        logoImageView.set(.height, to: 32)
-        navigationItem.titleView = logoImageView
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setUpNavBarSessionIcon()
         // Set up title label
         let titleLabel = UILabel()
         titleLabel.textColor = Colors.text

Signal/src/Loki/View Controllers/GroupMembersVC.swift

@@ -33,22 +33,9 @@ final class GroupMembersVC : BaseVC, UITableViewDataSource {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Group Members", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Group Members", comment: ""))
         // Set up explanation label
         let explanationLabel = UILabel()
         explanationLabel.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity)

Signal/src/Loki/View Controllers/HomeVC.swift

@@ -85,25 +85,12 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol
     override func viewDidLoad() {
         super.viewDidLoad()
         SignalApp.shared().homeViewController = self
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
-        if let navigationBar = navigationController?.navigationBar {
-            navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-            navigationBar.shadowImage = UIImage()
-            navigationBar.isTranslucent = false
-            navigationBar.barTintColor = Colors.navigationBarBackground
+        setUpGradientBackground()
+        if navigationController?.navigationBar != nil {
+            setUpNavBarStyle()
         }
-        // Set up navigation bar buttons
         updateNavigationBarButtons()
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Messages", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
+        setNavBarTitle(NSLocalizedString("Messages", comment: ""))
         // Set up seed reminder view if needed
         let userDefaults = UserDefaults.standard
         let hasViewedSeed = userDefaults[.hasViewedSeed]

Signal/src/Loki/View Controllers/JoinPublicChatVC.swift

@@ -42,26 +42,14 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Join Open Group", comment: ""))
         let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
         // Set up navigation bar buttons
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text
         navigationItem.leftBarButtonItem = closeButton
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Join Open Group", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
         // Set up page VC
         let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
         pages = [ enterChatURLVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ]

Signal/src/Loki/View Controllers/LandingVC.swift

@@ -36,23 +36,9 @@ final class LandingVC : BaseVC, LinkDeviceVCDelegate, DeviceLinkingModalDelegate
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Set up logo image view
-        let logoImageView = UIImageView()
-        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
-        logoImageView.contentMode = .scaleAspectFit
-        logoImageView.set(.width, to: 32)
-        logoImageView.set(.height, to: 32)
-        navigationItem.titleView = logoImageView
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setUpNavBarSessionIcon()
         // Set up title label
         let titleLabel = UILabel()
         titleLabel.textColor = Colors.text

Signal/src/Loki/View Controllers/LinkDeviceVC.swift

@@ -42,26 +42,14 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Link Device", comment: ""))
         let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
         // Set up navigation bar buttons
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text
         navigationItem.leftBarButtonItem = closeButton
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Link Device", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
         // Set up page VC
         let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
         pages = [ enterPublicKeyVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ]

Signal/src/Loki/View Controllers/NewClosedGroupVC.swift

@@ -45,16 +45,9 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("New Closed Group", comment: ""))
         // Set up navigation bar buttons
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text
@@ -62,13 +55,6 @@ final class NewClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelegat
         let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(createClosedGroup))
         doneButton.tintColor = Colors.text
         navigationItem.rightBarButtonItem = doneButton
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("New Closed Group", comment: "")
-        titleLabel.textColor = Colors.text
-        let titleLabelFontSize = isSmallScreen ? Values.mediumFontSize : Values.largeFontSize
-        titleLabel.font = .boldSystemFont(ofSize: titleLabelFontSize)
-        navigationItem.titleView = titleLabel
         // Set up content
         if !contacts.isEmpty {
             view.addSubview(nameTextField)

Signal/src/Loki/View Controllers/NewPrivateChatVC.swift

@@ -41,26 +41,14 @@ final class NewPrivateChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("New Session", comment: ""))
         let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
         // Set up navigation bar buttons
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text
         navigationItem.leftBarButtonItem = closeButton
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("New Session", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
         // Set up page VC
         let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
         pages = [ enterPublicKeyVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ]

Signal/src/Loki/View Controllers/PNModeVC.swift

@@ -17,23 +17,9 @@ final class PNModeVC : BaseVC, OptionViewDelegate {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Set up logo image view
-        let logoImageView = UIImageView()
-        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
-        logoImageView.contentMode = .scaleAspectFit
-        logoImageView.set(.width, to: 32)
-        logoImageView.set(.height, to: 32)
-        navigationItem.titleView = logoImageView
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setUpNavBarSessionIcon()
         // Set up title label
         let titleLabel = UILabel()
         titleLabel.textColor = Colors.text

Signal/src/Loki/View Controllers/PathVC.swift

@@ -26,25 +26,15 @@ final class PathVC : BaseVC {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        setUpBackground()
+        setUpGradientBackground()
         setUpNavBar()
         setUpViewHierarchy()
         registerObservers()
     }
 
-    private func setUpBackground() {
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-    }
-
     private func setUpNavBar() {
-        // Set up navigation bar style
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Path", comment: ""))
         // Set up close button
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text
@@ -52,12 +42,6 @@ final class PathVC : BaseVC {
         let learnMoreButton = UIBarButtonItem(image: #imageLiteral(resourceName: "QuestionMark").scaled(to: CGSize(width: 24, height: 24)), style: .plain, target: self, action: #selector(learnMore))
         learnMoreButton.tintColor = Colors.text
         navigationItem.rightBarButtonItem = learnMoreButton
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Path", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
     }
 
     private func setUpViewHierarchy() {
@@ -200,6 +184,13 @@ final class PathVC : BaseVC {
     }
 
     @objc private func rebuildPath() {
+        // Dispatch async on the main queue to avoid nested write transactions
+        DispatchQueue.main.async {
+            let storage = OWSPrimaryStorage.shared()
+            storage.dbReadWriteConnection.readWrite { transaction in
+                storage.clearOnionRequestPaths(in: transaction)
+            }
+        }
         OnionRequestAPI.guardSnodes = []
         OnionRequestAPI.paths = []
         let _ = OnionRequestAPI.buildPaths()

Signal/src/Loki/View Controllers/QRCodeVC.swift

@@ -42,22 +42,10 @@ final class QRCodeVC : BaseVC, UIPageViewControllerDataSource, UIPageViewControl
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("QR Code", comment: ""))
         let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("QR Code", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
         // Set up page VC
         let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
         pages = [ viewMyQRCodeVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ]

Signal/src/Loki/View Controllers/RegisterVC.swift

@@ -40,23 +40,9 @@ final class RegisterVC : BaseVC {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Set up logo image view
-        let logoImageView = UIImageView()
-        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
-        logoImageView.contentMode = .scaleAspectFit
-        logoImageView.set(.width, to: 32)
-        logoImageView.set(.height, to: 32)
-        navigationItem.titleView = logoImageView
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setUpNavBarSessionIcon()
         // Set up title label
         let titleLabel = UILabel()
         titleLabel.textColor = Colors.text

Signal/src/Loki/View Controllers/RestoreVC.swift

@@ -32,23 +32,9 @@ final class RestoreVC : BaseVC {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Set up logo image view
-        let logoImageView = UIImageView()
-        logoImageView.image = #imageLiteral(resourceName: "SessionGreen32")
-        logoImageView.contentMode = .scaleAspectFit
-        logoImageView.set(.width, to: 32)
-        logoImageView.set(.height, to: 32)
-        navigationItem.titleView = logoImageView
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setUpNavBarSessionIcon()
         // Set up title label
         let titleLabel = UILabel()
         titleLabel.textColor = Colors.text

Signal/src/Loki/View Controllers/ScanQRCodeWrapperVC.swift

@@ -28,10 +28,7 @@ final class ScanQRCodeWrapperVC : BaseVC {
         if isPresentedModally {
             navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(close))
         }
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
+        setUpGradientBackground()
         // Set up scan QR code VC
         scanQRCodeVC.scanDelegate = delegate
         let scanQRCodeVCView = scanQRCodeVC.view!

Signal/src/Loki/View Controllers/SeedVC.swift

@@ -55,23 +55,9 @@ final class SeedVC : BaseVC {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set up navigation bar
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
-        // Customize title
-        let navigationBarTitleLabel = UILabel()
-        navigationBarTitleLabel.text = NSLocalizedString("Your Recovery Phrase", comment: "")
-        navigationBarTitleLabel.textColor = Colors.text
-        let titleLabelFontSize = isSmallScreen ? Values.largeFontSize : Values.veryLargeFontSize
-        navigationBarTitleLabel.font = .boldSystemFont(ofSize: titleLabelFontSize)
-        navigationItem.titleView = navigationBarTitleLabel
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Your Recovery Phrase", comment: ""))
         // Set up navigation bar buttons
         let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
         closeButton.tintColor = Colors.text

Signal/src/Loki/View Controllers/SettingsVC.swift

@@ -53,27 +53,14 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Set gradient background
-        view.backgroundColor = .clear
-        let gradient = Gradients.defaultLokiBackground
-        view.setGradient(gradient)
-        // Set navigation bar background color
-        let navigationBar = navigationController!.navigationBar
-        navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
-        navigationBar.shadowImage = UIImage()
-        navigationBar.isTranslucent = false
-        navigationBar.barTintColor = Colors.navigationBarBackground
+        setUpGradientBackground()
+        setUpNavBarStyle()
+        setNavBarTitle(NSLocalizedString("Settings", comment: ""))
         // Set up navigation bar buttons
         let backButton = UIBarButtonItem(title: NSLocalizedString("Back", comment: ""), style: .plain, target: nil, action: nil)
         backButton.tintColor = Colors.text
         navigationItem.backBarButtonItem = backButton
         updateNavigationBarButtons()
-        // Customize title
-        let titleLabel = UILabel()
-        titleLabel.text = NSLocalizedString("Settings", comment: "")
-        titleLabel.textColor = Colors.text
-        titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
-        navigationItem.titleView = titleLabel
         // Set up profile picture view
         let profilePictureTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(showEditProfilePictureUI))
         profilePictureView.addGestureRecognizer(profilePictureTapGestureRecognizer)

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -605,7 +605,7 @@ typedef enum : NSUInteger {
                                                           userInfo:nil
                                                            repeats:YES];
 
-    [LKMentionsManager populateUserHexEncodedPublicKeyCacheIfNeededFor:thread.uniqueId in:nil];
+    [LKMentionsManager populateUserPublicKeyCacheIfNeededFor:thread.uniqueId in:nil];
 }
 
 - (void)dealloc

Signal/src/ViewControllers/HomeView/HomeViewCell.m

@@ -395,7 +395,7 @@ NS_ASSUME_NONNULL_BEGIN
         }
         NSString *displayableText = thread.lastMessageText;
         if (displayableText) {
-            [LKMentionsManager populateUserHexEncodedPublicKeyCacheIfNeededFor:thread.threadRecord.uniqueId in:nil]; // TODO: Terrible place to do this, but okay for now
+            [LKMentionsManager populateUserPublicKeyCacheIfNeededFor:thread.threadRecord.uniqueId in:nil]; // TODO: Terrible place to do this, but okay for now
             displayableText = [LKMentionUtilities highlightMentionsIn:displayableText threadID:thread.threadRecord.uniqueId];
             [snippetText appendAttributedString:[[NSAttributedString alloc]
                                                     initWithString:displayableText

SignalMessaging/Views/ContactCellView.m

@@ -213,7 +213,7 @@ const CGFloat kContactCellAvatarTextMargin = 12;
 {
     if (self.thread.isGroupThread) {
         NSMutableArray<NSString *> *sortedUsers = @[].mutableCopy;
-        NSSet<NSString *> *users = LKMentionsManager.userHexEncodedPublicKeyCache[self.thread.uniqueId];
+        NSSet<NSString *> *users = LKMentionsManager.userPublicKeyCache[self.thread.uniqueId];
         if (users != nil) {
             for (NSString *user in users) {
                 [sortedUsers addObject:user];

SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift

@@ -15,7 +15,7 @@ public extension LokiAPI {
     // MARK: Caching
     internal static var swarmCache: [String:[LokiAPITarget]] = [:]
     
-    internal static func dropIfNeeded(_ target: LokiAPITarget, hexEncodedPublicKey: String) {
+    internal static func dropSnodeIfNeeded(_ target: LokiAPITarget, hexEncodedPublicKey: String) {
         let swarm = LokiAPI.swarmCache[hexEncodedPublicKey]
         if var swarm = swarm, let index = swarm.firstIndex(of: target) {
             swarm.remove(at: index)
@@ -175,7 +175,7 @@ internal extension Promise {
                     print("[Loki] Couldn't reach snode at: \(target); setting failure count to \(newFailureCount).")
                     if newFailureCount >= LokiAPI.failureThreshold {
                         print("[Loki] Failure threshold reached for: \(target); dropping it.")
-                        LokiAPI.dropIfNeeded(target, hexEncodedPublicKey: hexEncodedPublicKey) // Remove it from the swarm cache associated with the given public key
+                        LokiAPI.dropSnodeIfNeeded(target, hexEncodedPublicKey: hexEncodedPublicKey) // Remove it from the swarm cache associated with the given public key
                         LokiAPI.snodePool.remove(target) // Remove it from the snode pool
                         // Dispatch async on the main queue to avoid nested write transactions
                         DispatchQueue.main.async {
@@ -192,7 +192,7 @@ internal extension Promise {
                 case 421:
                     // The snode isn't associated with the given public key anymore
                     print("[Loki] Invalidating swarm for: \(hexEncodedPublicKey).")
-                    LokiAPI.dropIfNeeded(target, hexEncodedPublicKey: hexEncodedPublicKey)
+                    LokiAPI.dropSnodeIfNeeded(target, hexEncodedPublicKey: hexEncodedPublicKey)
                 case 432:
                     // The PoW difficulty is too low
                     if case LokiHTTPClient.HTTPError.networkError(_, let result, _) = error, let json = result as? JSON, let powDifficulty = json["difficulty"] as? Int {

SignalServiceKit/src/Loki/API/LokiPoller.swift

@@ -84,7 +84,7 @@ public final class LokiPoller : NSObject {
                     self?.pollCount = 0
                 } else {
                     print("[Loki] Polling \(nextSnode) failed; dropping it and switching to next snode.")
-                    LokiAPI.dropIfNeeded(nextSnode, hexEncodedPublicKey: userHexEncodedPublicKey)
+                    LokiAPI.dropSnodeIfNeeded(nextSnode, hexEncodedPublicKey: userHexEncodedPublicKey)
                 }
                 self?.pollNextSnode(seal: seal)
             }

SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift

@@ -275,7 +275,7 @@ private extension Promise where T == JSON {
                 print("[Loki] Couldn't reach snode at: \(snode); setting failure count to \(newFailureCount).")
                 if newFailureCount >= LokiAPI.failureThreshold {
                     print("[Loki] Failure threshold reached for: \(snode); dropping it.")
-                    LokiAPI.dropIfNeeded(snode, hexEncodedPublicKey: hexEncodedPublicKey) // Remove it from the swarm cache associated with the given public key
+                    LokiAPI.dropSnodeIfNeeded(snode, hexEncodedPublicKey: hexEncodedPublicKey) // Remove it from the swarm cache associated with the given public key
                     LokiAPI.snodePool.remove(snode) // Remove it from the snode pool
                     // Dispatch async on the main queue to avoid nested write transactions
                     DispatchQueue.main.async {
@@ -292,7 +292,7 @@ private extension Promise where T == JSON {
             case 421:
                 // The snode isn't associated with the given public key anymore
                 print("[Loki] Invalidating swarm for: \(hexEncodedPublicKey).")
-                LokiAPI.dropIfNeeded(snode, hexEncodedPublicKey: hexEncodedPublicKey)
+                LokiAPI.dropSnodeIfNeeded(snode, hexEncodedPublicKey: hexEncodedPublicKey)
             case 432:
                 // The proof of work difficulty is too low
                 if let powDifficulty = json["difficulty"] as? Int {

SignalServiceKit/src/Loki/Database/LokiDatabaseUtilities.swift

@@ -3,8 +3,8 @@
 public final class LokiDatabaseUtilities : NSObject {
     
     private override init() { }
-    
-    // MARK: Quotes
+
+    // MARK: - Quotes
     @objc(getServerIDForQuoteWithID:quoteeHexEncodedPublicKey:threadID:transaction:)
     public static func getServerID(quoteID: UInt64, quoteeHexEncodedPublicKey: String, threadID: String, transaction: YapDatabaseReadTransaction) -> UInt64 {
         guard let message = TSInteraction.interactions(withTimestamp: quoteID, filter: { interaction in
@@ -20,8 +20,10 @@ public final class LokiDatabaseUtilities : NSObject {
         }, with: transaction).first as! TSMessage? else { return 0 }
         return message.openGroupServerMessageID
     }
-    
-    // MARK: Device Links
+
+
+
+    // MARK: - Device Links
     @objc(getLinkedDeviceHexEncodedPublicKeysFor:in:)
     public static func getLinkedDeviceHexEncodedPublicKeys(for hexEncodedPublicKey: String, in transaction: YapDatabaseReadTransaction) -> Set<String> {
         let storage = OWSPrimaryStorage.shared()
@@ -54,8 +56,10 @@ public final class LokiDatabaseUtilities : NSObject {
     public static func objc_getDeviceLinks(for masterHexEncodedPublicKey: String, in transaction: YapDatabaseReadTransaction) -> Set<DeviceLink> {
         return OWSPrimaryStorage.shared().getDeviceLinks(for: masterHexEncodedPublicKey, in: transaction)
     }
-    
-    // MARK: Public Chats
+
+
+
+    // MARK: - Open Groups
     private static let publicChatCollection = "LokiPublicChatCollection"
     
     @objc(getAllPublicChats:)

SignalServiceKit/src/Loki/Protocol/Mentions/MentionsManager.swift

@@ -4,7 +4,7 @@ public final class MentionsManager : NSObject {
 
     private static var _userHexEncodedPublicKeyCache: [String:Set<String>] = [:]
     /// A mapping from thread ID to set of user hex encoded public keys.
-    @objc public static var userHexEncodedPublicKeyCache: [String:Set<String>] {
+    @objc public static var userPublicKeyCache: [String:Set<String>] {
         get { LokiAPI.stateQueue.sync { _userHexEncodedPublicKeyCache } }
         set { LokiAPI.stateQueue.sync { _userHexEncodedPublicKeyCache = newValue } }
     }
@@ -21,16 +21,16 @@ public final class MentionsManager : NSObject {
 
     // MARK: Implementation
     @objc public static func cache(_ hexEncodedPublicKey: String, for threadID: String) {
-        if let cache = userHexEncodedPublicKeyCache[threadID] {
-            userHexEncodedPublicKeyCache[threadID] = cache.union([ hexEncodedPublicKey ])
+        if let cache = userPublicKeyCache[threadID] {
+            userPublicKeyCache[threadID] = cache.union([ hexEncodedPublicKey ])
         } else {
-            userHexEncodedPublicKeyCache[threadID] = [ hexEncodedPublicKey ]
+            userPublicKeyCache[threadID] = [ hexEncodedPublicKey ]
         }
     }
 
     @objc public static func getMentionCandidates(for query: String, in threadID: String) -> [Mention] {
         // Prepare
-        guard let cache = userHexEncodedPublicKeyCache[threadID] else { return [] }
+        guard let cache = userPublicKeyCache[threadID] else { return [] }
         var candidates: [Mention] = []
         // Gather candidates
         var publicChat: LokiPublicChat?
@@ -65,14 +65,14 @@ public final class MentionsManager : NSObject {
         return candidates
     }
 
-    @objc public static func populateUserHexEncodedPublicKeyCacheIfNeeded(for threadID: String, in transaction: YapDatabaseReadTransaction? = nil) {
+    @objc public static func populateUserPublicKeyCacheIfNeeded(for threadID: String, in transaction: YapDatabaseReadTransaction? = nil) {
         var result: Set<String> = []
         func populate(in transaction: YapDatabaseReadTransaction) {
             guard let thread = TSThread.fetch(uniqueId: threadID, transaction: transaction) else { return }
             if let groupThread = thread as? TSGroupThread, groupThread.groupModel.groupType == .closedGroup {
                 result = result.union(groupThread.groupModel.groupMemberIds)
             } else {
-                guard userHexEncodedPublicKeyCache[threadID] == nil else { return }
+                guard userPublicKeyCache[threadID] == nil else { return }
                 let interactions = transaction.ext(TSMessageDatabaseViewExtensionName) as! YapDatabaseViewTransaction
                 interactions.enumerateKeysAndObjects(inGroup: threadID) { _, _, object, index, _ in
                     guard let message = object as? TSIncomingMessage, index < userIDScanLimit else { return }
@@ -88,6 +88,6 @@ public final class MentionsManager : NSObject {
             }
         }
         result.insert(getUserHexEncodedPublicKey())
-        userHexEncodedPublicKeyCache[threadID] = result
+        userPublicKeyCache[threadID] = result
     }
 }

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -1466,7 +1466,7 @@ NS_ASSUME_NONNULL_BEGIN
                 // Loki: Cache the user hex encoded public key (for mentions)
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-                        [LKMentionsManager populateUserHexEncodedPublicKeyCacheIfNeededFor:oldGroupThread.uniqueId in:transaction];
+                        [LKMentionsManager populateUserPublicKeyCacheIfNeededFor:oldGroupThread.uniqueId in:transaction];
                         [LKMentionsManager cache:incomingMessage.authorId for:oldGroupThread.uniqueId];
                     }];
                 });