Fix a slew of bugs related to reblogs

Fixes #37 Fixes #38 Fixes #39
Remove old code
2019-09-05 14:24:13 -04:00 · 2019-09-05 14:04:05 -04:00 · 2019-09-05 13:40:10 -04:00 · 2019-09-05 12:49:17 -04:00 · 2019-09-05 11:34:41 -04:00
12 changed files with 305 additions and 103 deletions
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@ -148,6 +148,12 @@
 		D68632AC21ED8319008C716E /* GMImagePicker.strings in Resources */ = {isa = PBXBuildFile; fileRef = D686329321ED8319008C716E /* GMImagePicker.strings */; };
 		D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */; };
 		D6A5FAFB217B86CE003DB2D9 /* OnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */; };
+		D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; };
+		D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */; };
+		D6AEBB432321685E00E5038B /* OpenInSafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */; };
+		D6AEBB4523216AF800E5038B /* FollowAccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */; };
+		D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4723216B1D00E5038B /* AccountActivity.swift */; };
+		D6AEBB4A23216F0400E5038B /* UnfollowAccountActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */; };
 		D6B8DB342182A59300424AF7 /* UIAlertController+Visibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */; };
 		D6BC874521961F73006163F1 /* Gifu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6BC874421961F73006163F1 /* Gifu.framework */; };
 		D6BC874621961F73006163F1 /* Gifu.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D6BC874421961F73006163F1 /* Gifu.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@ -382,6 +388,12 @@
 		D686329421ED8319008C716E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = GMImagePicker.strings; sourceTree = "<group>"; };
 		D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ComposeViewController.xib; sourceTree = "<group>"; };
 		D6A5FAFA217B86CE003DB2D9 /* OnboardingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingViewController.xib; sourceTree = "<group>"; };
+		D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIActivity+Types.swift"; sourceTree = "<group>"; };
+		D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMesasgeActivity.swift; sourceTree = "<group>"; };
+		D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenInSafariActivity.swift; sourceTree = "<group>"; };
+		D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowAccountActivity.swift; sourceTree = "<group>"; };
+		D6AEBB4723216B1D00E5038B /* AccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountActivity.swift; sourceTree = "<group>"; };
+		D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnfollowAccountActivity.swift; sourceTree = "<group>"; };
 		D6B8DB332182A59300424AF7 /* UIAlertController+Visibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Visibility.swift"; sourceTree = "<group>"; };
 		D6BC874421961F73006163F1 /* Gifu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Gifu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6BC8747219738E1006163F1 /* EnhancedTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancedTableViewController.swift; sourceTree = "<group>"; };
@ -918,6 +930,27 @@
 			path = de.lproj;
 			sourceTree = "<group>";
 		};
+		D6AEBB3F2321640F00E5038B /* Activities */ = {
+			isa = PBXGroup;
+			children = (
+				D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */,
+				D6AEBB4623216B0C00E5038B /* Account Activities */,
+				D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */,
+			);
+			path = Activities;
+			sourceTree = "<group>";
+		};
+		D6AEBB4623216B0C00E5038B /* Account Activities */ = {
+			isa = PBXGroup;
+			children = (
+				D6AEBB4723216B1D00E5038B /* AccountActivity.swift */,
+				D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */,
+				D6AEBB4423216AF800E5038B /* FollowAccountActivity.swift */,
+				D6AEBB4923216F0400E5038B /* UnfollowAccountActivity.swift */,
+			);
+			path = "Account Activities";
+			sourceTree = "<group>";
+		};
 		D6BED1722126661300F02DA0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
@ -1001,6 +1034,7 @@
 				D6757A7A2157E00100721E32 /* XCallbackURL */,
 				D62D241E217AA46B005076CC /* Shortcuts */,
 				D663626021360A9600C9CBA2 /* Preferences */,
+				D6AEBB3F2321640F00E5038B /* Activities */,
 				D667E5F62135C2ED0057A976 /* Extensions */,
 				D6F953F121251A2F00CF0F2B /* Controllers */,
 				D641C780213DD7C4004B4513 /* Screens */,
@ -1403,6 +1437,7 @@
 				0427033A22B31269000D31B6 /* AdvancedPrefsView.swift in Sources */,
 				D6757A822157E8FA00721E32 /* XCBSession.swift in Sources */,
 				04DACE8C212CB14B009840C4 /* MainTabBarViewController.swift in Sources */,
+				D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */,
 				D6C693F92162E4DB007D6A6D /* StatusContentLabel.swift in Sources */,
 				D6D58DF922074B74009C8DD9 /* LinkLabel.swift in Sources */,
 				0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */,
@ -1423,12 +1458,15 @@
 				D67C57B421E2910700C3118B /* ComposeStatusReplyView.swift in Sources */,
 				04DACE8E212CC7CC009840C4 /* ImageCache.swift in Sources */,
 				D627FF7B217E951500CC0648 /* DraftsTableViewController.swift in Sources */,
+				D6AEBB4823216B1D00E5038B /* AccountActivity.swift in Sources */,
 				D6333B772138D94E00CE884A /* ComposeMediaView.swift in Sources */,
 				04ED00B121481ED800567C53 /* SteppedProgressView.swift in Sources */,
 				D627FF7F217E95E000CC0648 /* DraftTableViewCell.swift in Sources */,
+				D6AEBB4A23216F0400E5038B /* UnfollowAccountActivity.swift in Sources */,
 				D663626421360D2300C9CBA2 /* AvatarStyle.swift in Sources */,
 				D679C09F215850EF00DA27FE /* XCBActions.swift in Sources */,
 				D6DD353F22F502EC00A9563A /* Preferences+Notification.swift in Sources */,
+				D6AEBB4523216AF800E5038B /* FollowAccountActivity.swift in Sources */,
 				D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */,
 				D6E0DC8E216EDF1E00369478 /* Previewing.swift in Sources */,
 				D6BED174212667E900F02DA0 /* StatusTableViewCell.swift in Sources */,
@ -1448,6 +1486,7 @@
 				D6B8DB342182A59300424AF7 /* UIAlertController+Visibility.swift in Sources */,
 				D67C57AD21E265FC00C3118B /* LargeAccountDetailView.swift in Sources */,
 				D641C777213CAA9E004B4513 /* ActionNotificationTableViewCell.swift in Sources */,
+				D6AEBB432321685E00E5038B /* OpenInSafariActivity.swift in Sources */,
 				D6C693FE2162FEEA007D6A6D /* UIViewController+Children.swift in Sources */,
 				D64D0AB12128D9AE005A6F37 /* OnboardingViewController.swift in Sources */,
 				D627FF76217E923E00CC0648 /* DraftsManager.swift in Sources */,
@ -1466,6 +1505,7 @@
 				D6757A7C2157E01900721E32 /* XCBManager.swift in Sources */,
 				D6F1F84D2193B56E00F5FE67 /* Cache.swift in Sources */,
 				0427037C22B316B9000D31B6 /* SilentActionPrefs.swift in Sources */,
+				D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */,
 				D6757A7E2157E02600721E32 /* XCBRequestSpec.swift in Sources */,
 				D667E5F12134D5050057A976 /* UIViewController+Delegates.swift in Sources */,
 				D6BC8748219738E1006163F1 /* EnhancedTableViewController.swift in Sources */,
--- a/Activities/AccountActivity.swift
+++ b/Activities/AccountActivity.swift
@ -0,0 +1,34 @@
+//
+//  AccountActivity.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class AccountActivity: UIActivity {
+
+    override class var activityCategory: UIActivity.Category {
+        return .action
+    }
+    
+    var account: Account?
+    
+    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
+        for case is Account in activityItems {
+            return true
+        }
+        return false
+    }
+    
+    override func prepare(withActivityItems activityItems: [Any]) {
+        for case let account as Account in activityItems {
+            self.account = account
+            return
+        }
+    }
+    
+}
--- a/Activities/FollowAccountActivity.swift
+++ b/Activities/FollowAccountActivity.swift
@ -0,0 +1,42 @@
+//
+//  FollowAccountActivity.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class FollowAccountActivity: AccountActivity {
+
+    override var activityType: UIActivity.ActivityType? {
+        return .followAccount
+    }
+    
+    override var activityTitle: String? {
+        return NSLocalizedString("Follow", comment: "follow account activity title")
+    }
+    override var activityImage: UIImage? {
+        return UIImage(systemName: "person.badge.plus")
+    }
+
+    override func perform() {
+        guard let account = account else { return }
+        
+        UIImpactFeedbackGenerator(style: .medium).impactOccurred()
+        
+        let request = Account.follow(account.id)
+        MastodonController.client.run(request) { (response) in
+            if case let .success(relationship, _) = response {
+                MastodonCache.add(relationship: relationship)
+            } else {
+                // todo: display error message
+                UINotificationFeedbackGenerator().notificationOccurred(.error)
+                fatalError()
+            }
+        }
+    }
+    
+}
--- a/Activities/SendMesasgeActivity.swift
+++ b/Activities/SendMesasgeActivity.swift
@ -0,0 +1,34 @@
+//
+//  SendMesasgeActivity.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+
+class SendMessageActivity: AccountActivity {
+    
+    override var activityType: UIActivity.ActivityType? {
+        return .sendMessageMentioningAccount
+    }
+    
+    override var activityTitle: String? {
+        return NSLocalizedString("Send Message", comment: "send message activity title")
+    }
+    override var activityImage: UIImage? {
+        return UIImage(systemName: "square.and.pencil")
+    }
+    
+    override func perform() {
+        activityDidFinish(true)
+    }
+    
+    override var activityViewController: UIViewController? {
+        guard let account = account else { return nil }
+        
+        return UINavigationController(rootViewController: ComposeViewController(mentioningAcct: account.acct))
+    }
+
+}
--- a/Activities/UnfollowAccountActivity.swift
+++ b/Activities/UnfollowAccountActivity.swift
@ -0,0 +1,42 @@
+//
+//  UnfollowActivity.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class UnfollowAccountActivity: AccountActivity {
+    
+    override var activityType: UIActivity.ActivityType? {
+        return .unfollowAccount
+    }
+    
+    override var activityTitle: String? {
+        return NSLocalizedString("Unfollow", comment: "unfollow account activity title")
+    }
+    override var activityImage: UIImage? {
+        return UIImage(systemName: "person.badge.minus")
+    }
+
+    override func perform() {
+        guard let account = account else { return }
+        
+        UIImpactFeedbackGenerator(style: .medium).impactOccurred()
+        
+        let request = Account.unfollow(account.id)
+        MastodonController.client.run(request) { (response) in
+            if case let .success(relationship, _) = response {
+                MastodonCache.add(relationship: relationship)
+            } else {
+                // todo: display error message
+                UINotificationFeedbackGenerator().notificationOccurred(.error)
+                fatalError()
+            }
+        }
+    }
+    
+}
--- a/Tusker/Activities/OpenInSafariActivity.swift
+++ b/Tusker/Activities/OpenInSafariActivity.swift
@ -0,0 +1,47 @@
+//
+//  OpenInSafariActivity.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import SafariServices
+
+class OpenInSafariActivity: UIActivity {
+
+    override class var activityCategory: UIActivity.Category {
+        return .action
+    }
+    override var activityType: UIActivity.ActivityType? {
+        return .openInSafari
+    }
+    
+    override var activityTitle: String? {
+        return NSLocalizedString("Open in Safari", comment: "open in safari activity title")
+    }
+    override var activityImage: UIImage? {
+        return UIImage(systemName: "safari")
+    }
+    
+    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
+        for case is URL in activityItems {
+            return true
+        }
+        return false
+    }
+    
+    override func perform() {
+        activityDidFinish(true)
+    }
+    
+    static func completionHandler(viewController: UIViewController, url: URL) -> UIActivityViewController.CompletionWithItemsHandler {
+        return { (activityType, _, _, _) in
+            if activityType == .openInSafari {
+                viewController.present(SFSafariViewController(url: url), animated: true)
+            }
+        }
+    }
+    
+}
--- a/Tusker/Activities/UIActivity+Types.swift
+++ b/Tusker/Activities/UIActivity+Types.swift
@ -0,0 +1,22 @@
+//
+//  UIActivity+Types.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 9/5/19.
+//  Copyright © 2019 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+
+extension UIActivity.ActivityType {
+    
+    static let openInSafari = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).open_in_safari")
+    
+    // Account
+    static let sendMessageMentioningAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).send_message_mentioning_account")
+    static let followAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).follow_account")
+    static let unfollowAccount = UIActivity.ActivityType("\(Bundle.main.bundleIdentifier!).unfollow_account")
+    
+    // Status
+    
+}
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@ -60,23 +60,6 @@ class ConversationTableViewController: EnhancedTableViewController {
        }
    }

-    override var previewActionItems: [UIPreviewActionItem] {
-        var actions = [UIPreviewActionItem]()
-        if let status = MastodonCache.status(for: mainStatusID),
-            let url = status.url {
-            actions.append(UIPreviewAction(title: "Open in Safari", style: .default, handler: { (_, _) in
-                let vc = SFSafariViewController(url: url)
-                UIApplication.shared.delegate!.window!!.rootViewController!.present(vc, animated: true)
-                // TODO: kill this ^ with fire
-            }))
-            actions.append(UIPreviewAction(title: "Share", style: .default, handler: { (_, _) in
-                let vc = UIActivityViewController(activityItems: [url], applicationActivities: nil)
-                UIApplication.shared.delegate!.window!!.rootViewController!.present(vc, animated: true)
-            }))
-        }
-        return actions
-    }
-    
    func getDirectParents(of status: Status, from statuses: [Status]) -> [Status] {
        var statuses = statuses
        var parents: [Status] = []
--- a/Tusker/Screens/Profile/ProfileTableViewController.swift
+++ b/Tusker/Screens/Profile/ProfileTableViewController.swift
@ -93,26 +93,6 @@ class ProfileTableViewController: EnhancedTableViewController {
        NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPreferences), name: .preferencesChanged, object: nil)
    }

-    override var previewActionItems: [UIPreviewActionItem] {
-        var actions = [UIPreviewActionItem]()
-        if let account = MastodonCache.account(for: accountID) {
-            actions.append(UIPreviewAction(title: "Open in Safari", style: .default, handler: { (_, _) in
-                let vc = SFSafariViewController(url: account.url)
-                UIApplication.shared.delegate!.window!!.rootViewController!.present(vc, animated: true)
-                // TODO: kill this ^ with fire
-            }))
-            actions.append(UIPreviewAction(title: "Share", style: .default, handler: { (_, _) in
-                let vc = UIActivityViewController(activityItems: [account.url], applicationActivities: nil)
-                UIApplication.shared.delegate!.window!!.rootViewController!.present(vc, animated: true)
-            }))
-            actions.append(UIPreviewAction(title: "Send Message", style: .default, handler: { (_, _) in
-                let vc = UINavigationController(rootViewController: ComposeViewController(mentioningAcct: account.acct))
-                UIApplication.shared.delegate!.window!!.rootViewController!.present(vc, animated: true)
-            }))
-        }
-        return actions
-    }
-    
    func updateAccountUI() {
        loadingVC?.removeViewAndController()
        
@ -230,43 +210,28 @@ extension ProfileTableViewController: ProfileHeaderTableViewCellDelegate {
    func showMoreOptions() {
        let account = MastodonCache.account(for: accountID)!
        
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-        alert.addAction(UIAlertAction(title: "Open in Safari", style: .default, handler: { _ in
-            let vc = SFSafariViewController(url: account.url)
-            self.present(vc, animated: true)
-        }))
-        alert.addAction(UIAlertAction(title: "Share", style: .default, handler: { _ in
-            let vc = UIActivityViewController(activityItems: [account.url], applicationActivities: nil)
-            self.present(vc, animated: true)
-        }))
-        alert.addAction(UIAlertAction(title: "Send Message", style: .default, handler: { _ in
-            self.sendMessageMentioning()
-        }))
-        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
+        MastodonCache.relationship(for: account.id) { [weak self] (relationship) in
+            guard let self = self else { return }
            
-        MastodonCache.relationship(for: account.id) { (relationship) in
-            guard let relationship = relationship else {
-                DispatchQueue.main.async {
-                    self.present(alert, animated: true)
-                }
-                return
-            }
-            let title = relationship.following ? "Unfollow": "Follow"
-            DispatchQueue.main.async {
-                alert.addAction(UIAlertAction(title: title, style: .default, handler: { (_) in
-                    UIImpactFeedbackGenerator(style: .medium).impactOccurred()
-                    let request = (relationship.following ? Account.unfollow : Account.follow)(account.id)
-                    MastodonController.client.run(request, completion: { (response) in
-                        if case let .success(relationship, _) = response {
-                            MastodonCache.add(relationship: relationship)
+            let customActivities: [UIActivity]
+            if let relationship = relationship {
+                let toggleFollowActivity = relationship.following ? UnfollowAccountActivity() : FollowAccountActivity()
+                customActivities = [
+                    SendMessageActivity(),
+                    toggleFollowActivity,
+                    OpenInSafariActivity()
+                ]
            } else {
-                            // todo: display error message
-                            UINotificationFeedbackGenerator().notificationOccurred(.error)
-                            fatalError()
+                customActivities = [
+                    SendMessageActivity(),
+                    OpenInSafariActivity()
+                ]
            }
-                    })
-                }))
-                self.present(alert, animated: true)
+            
+            DispatchQueue.main.async {
+                let activityController = UIActivityViewController(activityItems: [account.url, account], applicationActivities: customActivities)
+                activityController.completionWithItemsHandler = OpenInSafariActivity.completionHandler(viewController: self, url: account.url)
+                self.present(activityController, animated: true)
            }
        }
    }
--- a/Tusker/TuskerNavigationDelegate.swift
+++ b/Tusker/TuskerNavigationDelegate.swift
@ -146,25 +146,16 @@ extension TuskerNavigationDelegate where Self: UIViewController {
        present(gallery(attachments: attachments, sourceViews: sourceViews, startIndex: startIndex), animated: true)
    }
    
-    private func moreOptions(forURL url: URL) -> UIAlertController {
-        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-        alert.title = url.absoluteString
-        alert.addAction(UIAlertAction(title: "Open in Safari", style: .default, handler: { (_) in
-            let vc = SFSafariViewController(url: url)
-            self.present(vc, animated: true)
-        }))
-        alert.addAction(UIAlertAction(title: "Copy", style: .default, handler: { (_) in
-            UIPasteboard.general.url = url
-        }))
-        alert.addAction(UIAlertAction(title: "Share...", style: .default, handler: { (_) in
-            let vc = UIActivityViewController(activityItems: [url], applicationActivities: nil)
-            self.present(vc, animated: true)
-        }))
-        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-        return alert
+    private func moreOptions(forURL url: URL) -> UIViewController {
+        let customActivites: [UIActivity] = [
+            OpenInSafariActivity()
+        ]
+        let activityController = UIActivityViewController(activityItems: [url], applicationActivities: customActivites)
+        activityController.completionWithItemsHandler = OpenInSafariActivity.completionHandler(viewController: self, url: url)
+        return activityController
    }
    
-    private func moreOptions(forStatus statusID: String) -> UIAlertController {
+    private func moreOptions(forStatus statusID: String) -> UIViewController {
        guard let status = MastodonCache.status(for: statusID) else { fatalError("Missing cached status \(statusID)") }
        guard let url = status.url else { fatalError("Missing url for status \(statusID)") }
        return moreOptions(forURL: url)
--- a/Header/ProfileHeaderTableViewCell.xib
+++ b/Header/ProfileHeaderTableViewCell.xib
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14845" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14799.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-        <capability name="iOS 13.0 system colors" minToolsVersion="11.0"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -32,7 +31,7 @@
                            </constraints>
                        </imageView>
                    </subviews>
-                    <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                    <constraints>
                        <constraint firstItem="tH8-sR-DHC" firstAttribute="centerX" secondItem="KyB-ey-l11" secondAttribute="centerX" id="KT6-FP-LsA"/>
                        <constraint firstAttribute="height" constant="120" id="LVm-OC-cGm"/>
@ -40,16 +39,16 @@
                        <constraint firstItem="tH8-sR-DHC" firstAttribute="centerY" secondItem="KyB-ey-l11" secondAttribute="centerY" id="nYu-RE-MfA"/>
                    </constraints>
                </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="LjK-72-Bez">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="LjK-72-Bez">
                    <rect key="frame" x="144" y="158" width="215" height="24"/>
                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
                    <nil key="textColor"/>
                    <nil key="highlightedColor"/>
                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MIj-OR-NOR">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="@username" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MIj-OR-NOR">
                    <rect key="frame" x="144" y="190" width="215" height="18"/>
                    <fontDescription key="fontDescription" type="system" weight="light" pointSize="15"/>
-                    <color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
+                    <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="DfO-uD-UNI">
@ -58,7 +57,7 @@
                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Follows you" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a32-1a-xXZ">
                            <rect key="frame" x="0.0" y="0.0" width="75.5" height="0.0"/>
                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <color key="textColor" cocoaTouchSystemColor="secondaryLabelColor"/>
+                            <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                            <nil key="highlightedColor"/>
                        </label>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Note" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I0n-aP-dJP" customClass="StatusContentLabel" customModule="Tusker" customModuleProvider="target">
@ -81,10 +80,12 @@
                    </subviews>
                </stackView>
                <button opaque="NO" alpha="0.59999999999999998" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiv-gB-kiX">
-                    <rect key="frame" x="340.5" y="120" width="18.5" height="22"/>
+                    <rect key="frame" x="323.5" y="120" width="35.5" height="22"/>
                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
                    <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <state key="normal" image="ellipsis" catalog="system"/>
+                    <state key="normal" image="ellipsis" catalog="system">
+                        <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="32" scale="default"/>
+                    </state>
                    <connections>
                        <action selector="morePressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="0go-4p-qDa"/>
                    </connections>
--- a/Tusker/Views/Status/StatusTableViewCell.swift
+++ b/Tusker/Views/Status/StatusTableViewCell.swift
@ -74,7 +74,7 @@ class StatusTableViewCell: UITableViewCell {
        NotificationCenter.default.addObserver(self, selector: #selector(updateUIForPreferences), name: .preferencesChanged, object: nil)
        
        statusUpdater = MastodonCache.statusSubject
-            .filter { $0.id == self.statusID || $0.id == self.reblogStatusID }
+            .filter { $0.id == self.statusID }
            .receive(on: DispatchQueue.main)
            .sink(receiveValue: updateStatusState(status:))
        
@ -96,11 +96,12 @@ class StatusTableViewCell: UITableViewCell {
        guard var status = MastodonCache.status(for: statusID) else { fatalError("Missing cached status \(statusID)") }
        self.statusID = statusID
        
-        if let reblogID = status.reblog?.id,
-            let reblog = MastodonCache.status(for: reblogID) {
+        if let rebloggedStatusID = status.reblog?.id,
+            let rebloggedStatus = MastodonCache.status(for: rebloggedStatusID) {
            reblogStatusID = statusID
            rebloggerID = status.account.id
-            status = reblog
+            status = rebloggedStatus
+            self.statusID = rebloggedStatus.id
            reblogLabel.isHidden = false
        } else {
            reblogStatusID = nil
Author	SHA1	Message	Date
Shadowfacts	1bc598691f	Fix a slew of bugs related to reblogs Fixes #37 Fixes #38 Fixes #39	2019-09-05 14:24:13 -04:00
Shadowfacts	ad0bbe0ab2	Remove old code	2019-09-05 14:04:05 -04:00
Shadowfacts	f4b0b9b70a	Use share sheet instead of alert controller for status options	2019-09-05 13:40:10 -04:00
Shadowfacts	b60688f4b8	Show share sheet with custom activities instead of alert controller for account actions	2019-09-05 12:49:17 -04:00
Shadowfacts	6a09c7e1e8	Tweak profile headers to better support long display names	2019-09-05 11:34:41 -04:00