Tusker/Info.plist

@@ -31,8 +31,6 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.social-networking</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Tusker/Preferences/Preferences.swift

@@ -38,6 +38,7 @@ class Preferences: Codable, ObservableObject {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         
         self.theme = try container.decode(UIUserInterfaceStyle.self, forKey: .theme)
+        self.showRepliesInProfiles = try container.decode(Bool.self, forKey: .showRepliesInProfiles)
         self.avatarStyle = try container.decode(AvatarStyle.self, forKey: .avatarStyle)
         self.hideCustomEmojiInUsernames = try container.decode(Bool.self, forKey: .hideCustomEmojiInUsernames)
         self.showIsStatusReplyIcon = try container.decode(Bool.self, forKey: .showIsStatusReplyIcon)
@@ -67,6 +68,7 @@ class Preferences: Codable, ObservableObject {
         var container = encoder.container(keyedBy: CodingKeys.self)
         
         try container.encode(theme, forKey: .theme)
+        try container.encode(showRepliesInProfiles, forKey: .showRepliesInProfiles)
         try container.encode(avatarStyle, forKey: .avatarStyle)
         try container.encode(hideCustomEmojiInUsernames, forKey: .hideCustomEmojiInUsernames)
         try container.encode(showIsStatusReplyIcon, forKey: .showIsStatusReplyIcon)
@@ -94,6 +96,7 @@ class Preferences: Codable, ObservableObject {
     
     // MARK: Appearance
     @Published var theme = UIUserInterfaceStyle.unspecified
+    @Published var showRepliesInProfiles = false
     @Published var avatarStyle = AvatarStyle.roundRect
     @Published var hideCustomEmojiInUsernames = false
     @Published var showIsStatusReplyIcon = false
@@ -125,6 +128,7 @@ class Preferences: Codable, ObservableObject {
 
     enum CodingKeys: String, CodingKey {
         case theme
+        case showRepliesInProfiles
         case avatarStyle
         case hideCustomEmojiInUsernames
         case showIsStatusReplyIcon

Tusker/Screens/Preferences/AppearancePrefsView.swift

@@ -30,6 +30,9 @@ struct AppearancePrefsView : View {
                 Text("Light").tag(UIUserInterfaceStyle.light)
                 Text("Dark").tag(UIUserInterfaceStyle.dark)
             }
+            Toggle(isOn: $preferences.showRepliesInProfiles) {
+                Text("Show Replies in Profiles")
+            }
             Toggle(isOn: useCircularAvatars) {
                 Text("Use Circular Avatars")
             }

Tusker/Screens/Profile/ProfileStatusesViewController.swift

@@ -25,7 +25,7 @@ class ProfileStatusesViewController: EnhancedTableViewController {
     private var older: RequestRange?
     private var newer: RequestRange?
     
-    var loaded = false
+    private var loaded = false
     
     init(accountID: String?, kind: Kind, mastodonController: MastodonController) {
         self.accountID = accountID
@@ -61,14 +61,12 @@ class ProfileStatusesViewController: EnhancedTableViewController {
         if !loaded,
            let accountID = accountID,
            let account = mastodonController.persistentContainer.account(for: accountID) {
+            loaded = true
             updateUI(account: account)
         }
     }
     
-    func updateUI(account: AccountMO) {
+    private func updateUI(account: AccountMO) {
-        guard !loaded else { return }
-        loaded = true
-        
         if kind == .statuses {
             getPinnedStatuses { (response) in
                 guard case let .success(statuses, _) = response else {

Tusker/Screens/Profile/ProfileViewController.swift

@@ -49,10 +49,6 @@ class ProfileViewController: UIPageViewController {
         fatalError("init(coder:) has not been implemented")
     }
 
-    deinit {
-        mastodonController.persistentContainer.account(for: accountID)?.decrementReferenceCount()
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -60,6 +56,7 @@ class ProfileViewController: UIPageViewController {
 
         headerView = ProfileHeaderView.create()
         headerView.delegate = self
+        headerView.updateUI(for: accountID)
 
         selectPage(at: 0, animated: false)
         
@@ -73,24 +70,6 @@ class ProfileViewController: UIPageViewController {
             .filter { [weak self] in $0 == self?.accountID }
             .receive(on: DispatchQueue.main)
             .sink { [weak self] (_) in self?.updateAccountUI() }
-        
-        if mastodonController.persistentContainer.account(for: accountID) != nil {
-            headerView.updateUI(for: accountID)
-        } else {
-            let req = Client.getAccount(id: accountID)
-            mastodonController.run(req) { [weak self] (response) in
-                guard let self = self else { return }
-                guard case let .success(account, _) = response  else { fatalError() }
-                self.mastodonController.persistentContainer.addOrUpdate(account: account, incrementReferenceCount: true) { (account) in
-                    DispatchQueue.main.async {
-                        self.headerView.updateUI(for: self.accountID)
-                        self.pageControllers.forEach {
-                            $0.updateUI(account: account)
-                        }
-                    }
-                }
-            }
-        }
     }
     
     private func updateAccountUI() {

Tusker/Screens/Utilities/Previewing.swift

@@ -185,7 +185,7 @@ extension MenuPreviewProvider {
     
     private func openInSafariAction(url: URL) -> UIAction {
         return createAction(identifier: "openinsafari", title: "Open in Safari", systemImageName: "safari", handler: { (_) in
-            self.navigationDelegate?.selected(url: url, allowUniversalLinks: false)
+            self.navigationDelegate?.selected(url: url)
         })
     }
     

Tusker/TuskerNavigationDelegate.swift

@@ -10,11 +10,52 @@ import UIKit
 import SafariServices
 import Pachyderm
 
-protocol TuskerNavigationDelegate: UIViewController {
+protocol TuskerNavigationDelegate: class {
+    
     var apiController: MastodonController { get }
+    
+    func show(_ vc: UIViewController)
+    
+    func selected(account accountID: String)
+    
+    func selected(mention: Mention)
+    
+    func selected(tag: Hashtag)
+    
+    func selected(url: URL)
+    
+    func selected(status statusID: String)
+    
+    func selected(status statusID: String, state: StatusState)
+    
+    func compose()
+    
+    func compose(mentioning: String?)
+    
+    func reply(to statusID: String)
+    
+    func reply(to statusID: String, mentioningAcct: String?)
+    
+    func loadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView) -> LoadingLargeImageViewController
+    
+    func showLoadingLargeImage(url: URL, cache: ImageCache, description: String?, animatingFrom sourceView: UIImageView)
+    
+    func gallery(attachments: [Attachment], sourceViews: [UIImageView?], startIndex: Int) -> GalleryViewController
+    
+    func showGallery(attachments: [Attachment], sourceViews: [UIImageView?], startIndex: Int)
+    
+    func showMoreOptions(forStatus statusID: String, sourceView: UIView?)
+    
+    func showMoreOptions(forAccount accountID: String, sourceView: UIView?)
+    
+    func showMoreOptions(forURL url: URL, sourceView: UIView?)
+    
+    func showFollowedByList(accountIDs: [String])
+    
+    func statusActionAccountList(action: StatusActionAccountListTableViewController.ActionType, statusID: String, statusState state: StatusState, accountIDs: [String]?) -> StatusActionAccountListTableViewController
 }
 
-extension TuskerNavigationDelegate {
+extension TuskerNavigationDelegate where Self: UIViewController {
     
     func show(_ vc: UIViewController) {
         if vc is LargeImageViewController || vc is GalleryViewController || vc is SFSafariViewController {
@@ -42,7 +83,7 @@ extension TuskerNavigationDelegate {
         show(HashtagTimelineViewController(for: tag, mastodonController: apiController), sender: self)
     }
     
-    func selected(url: URL, allowUniversalLinks: Bool = true) {
+    func selected(url: URL) {
         func openSafari() {
             if Preferences.shared.useInAppSafari {
                 let config = SFSafariViewController.Configuration()
@@ -53,7 +94,7 @@ extension TuskerNavigationDelegate {
             }
         }
         
-        if allowUniversalLinks && Preferences.shared.openLinksInApps {
+        if (Preferences.shared.openLinksInApps) {
             UIApplication.shared.open(url, options: [.universalLinksOnly: true]) { (success) in
                 if (!success) {
                     openSafari()

Tusker/Views/Profile Header/ProfileHeaderView.swift

@@ -46,6 +46,18 @@ class ProfileHeaderView: UIView {
     
     private var accountUpdater: Cancellable?
     
+    override var frame: CGRect {
+        didSet {
+            print("set header frame for \(self)")
+        }
+    }
+    
+    override var bounds: CGRect {
+        didSet {
+            print("set header bounds for \(self)")
+        }
+    }
+    
     deinit {
         avatarRequest?.cancel()
         headerRequest?.cancel()
@@ -81,7 +93,6 @@ class ProfileHeaderView: UIView {
     func updateUI(for accountID: String) {
         self.accountID = accountID
         
-        guard let mastodonController = mastodonController else { return }
         guard let account = mastodonController.persistentContainer.account(for: accountID) else {
             fatalError("Missing cached account \(accountID)")
         }

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -102,8 +102,7 @@ class BaseStatusTableViewCell: UITableViewCell {
                 .filter { [unowned self] in $0 == self.statusID }
                 .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
-                    if let mastodonController = mastodonController,
+                    if let status = self.mastodonController.persistentContainer.status(for: $0) {
-                       let status = mastodonController.persistentContainer.status(for: $0) {
                         self.updateStatusState(status: status)
                     }
             }
@@ -114,8 +113,7 @@ class BaseStatusTableViewCell: UITableViewCell {
                 .filter { [unowned self] in $0 == self.accountID }
                 .receive(on: DispatchQueue.main)
                 .sink { [unowned self] in
-                    if let mastodonController = mastodonController,
+                    if let account = self.mastodonController.persistentContainer.account(for: $0) {
-                       let account = mastodonController.persistentContainer.account(for: $0) {
                         self.updateUI(account: account)
                     }
             }