CHANGELOG.md

@@ -1,38 +1,5 @@
 # Changelog
 
-## 2020.1 (9)
-The marquee feature of this build is the new and improved Compose screen. It's been rewritten to use SwiftUI, is significantly more resilient to data loss, and now shows the toolbar when the main text field is not focused. It also turns out Apple is surprise-releasing iOS 14 very soon (or possibly already has, depending when you're reading this). For those who were not already on the beta train, iOS 14 brings a number of new features including a sidebar on iPadOS and lots and lots of context menus (a home screen widget is coming Soon™).
-
-Known Issues:
-- Pasting images to create attachments when composing a post is not currently supported due to an iOS bug (#109)
-- Full-size previews do not display in context menus for attachments on the Compose screen due to an iOS issue (#110)
-
-Features/Improvements:
-- Rewrite Compose screen using SwiftUI
-  - Prevent draft posts being lost if the app crahes or is killed by the system while composing
-  - Show toolbar while post content is not being edited
-  - Save post visibility in drafts
-  - Move Draw Something action out of the context menu
-  - iOS 14: Use context menus for setting post visibility
-- Show BlurHash previews for attachments on Mastodon
-- Add Expand All Content Warnings preference (Preferences -> Behavior)
-- Add Collapse Long Posts preference (Preferences -> Behavior)
-- Improve image gallery opening animation
-- Use fade in/out animations for opening/closing gallery and attachment picker when the Reduce Motion system setting is enabled
-  - iOS 14: Also requires the "Prefer Cross Fade" setting be enabled
-- Slightly reduce default status font sizes
-- Add "Direct Message" context menu action to Compose button on profile screen
-- Allow viewing attachments and navigating through posts/accounts on instance public timelines
-
-Bugfixes:
-- Fix errors when uploading attachments not displaying
-- Fix attachments not posting in the correct, user-specified order
-- Fix accounts displaying with outdated information (avatars, display names, etc.)
-- Fix Compose not showing button on profile screen
-- Fix navigation title not being set on profile screen
-- Fix follow notifications not showing names for users without display names set
-- iPadOS 14: Fix crash when resizing app in split view mode
-
 ## 2020.1 (8)
 This is just an emergency build to fix crashes on iOS 13 when selecting attachments. The changelog of the previous build is included below.
 

Tusker.xcodeproj/project.pbxproj

@@ -2229,7 +2229,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
@@ -2258,7 +2258,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;

Tusker/Controllers/MastodonController.swift

@@ -84,28 +84,23 @@ class MastodonController {
         }
     }
     
-    func getOwnAccount(completion: ((Result<Account, Client.Error>) -> Void)? = nil) {
+    func getOwnAccount(completion: ((Account) -> Void)? = nil) {
         if account != nil {
-            completion?(.success(account))
+            completion?(account)
         } else {
             let request = Client.getSelfAccount()
             run(request) { response in
-                switch response {
+                guard case let .success(account, _) = response else { fatalError() }
-                case let .failure(error):
+                self.account = account
-                    completion?(.failure(error))
+                self.persistentContainer.backgroundContext.perform {
-                    
+                    if let accountMO = self.persistentContainer.account(for: account.id, in: self.persistentContainer.backgroundContext) {
-                case let .success(account, _):
+                        accountMO.updateFrom(apiAccount: account, container: self.persistentContainer)
-                    self.account = account
+                    } else {
-                    self.persistentContainer.backgroundContext.perform {
+                        // the first time the user's account is added to the store,
-                        if let accountMO = self.persistentContainer.account(for: account.id, in: self.persistentContainer.backgroundContext) {
+                        // increment its reference count so that it's never removed
-                            accountMO.updateFrom(apiAccount: account, container: self.persistentContainer)
+                        self.persistentContainer.addOrUpdate(account: account, incrementReferenceCount: true)
-                        } else {
-                            // the first time the user's account is added to the store,
-                            // increment its reference count so that it's never removed
-                            self.persistentContainer.addOrUpdate(account: account, incrementReferenceCount: true)
-                        }
-                        completion?(.success(account))
                     }
+                    completion?(account)
                 }
             }
         }

Tusker/Models/Draft.swift

@@ -119,29 +119,10 @@ extension MastodonController {
     func createDraft(inReplyToID: String? = nil, mentioningAcct: String? = nil) -> Draft {
         var acctsToMention = [String]()
         
-        var visibility = Preferences.shared.defaultPostVisibility
-        var contentWarning = ""
-        
         if let inReplyToID = inReplyToID,
            let inReplyTo = persistentContainer.status(for: inReplyToID) {
             acctsToMention.append(inReplyTo.account.acct)
             acctsToMention.append(contentsOf: inReplyTo.mentions.map(\.acct))
-            visibility = inReplyTo.visibility
-            
-            if !inReplyTo.spoilerText.isEmpty {
-                switch Preferences.shared.contentWarningCopyMode {
-                case .doNotCopy:
-                    break
-                case .asIs:
-                    contentWarning = inReplyTo.spoilerText
-                case .prependRe:
-                    if inReplyTo.spoilerText.lowercased().starts(with: "re:") {
-                        contentWarning = inReplyTo.spoilerText
-                    } else {
-                        contentWarning = "re: \(inReplyTo.spoilerText)"
-                    }
-                }
-            }
         }
         if let mentioningAcct = mentioningAcct {
             acctsToMention.append(mentioningAcct)
@@ -155,9 +136,6 @@ extension MastodonController {
         draft.inReplyToID = inReplyToID
         draft.text = acctsToMention.map { "@\($0) " }.joined()
         draft.initialText = draft.text
-        draft.visibility = visibility
-        draft.contentWarning = contentWarning
-        draft.contentWarningEnabled = !contentWarning.isEmpty
         return draft
     }
     

Tusker/Screens/Onboarding/OnboardingViewController.swift

@@ -70,21 +70,13 @@ extension OnboardingViewController: InstanceSelectorTableViewControllerDelegate
                     let tempAccountInfo = LocalData.UserAccountInfo(id: "temp", instanceURL: instanceURL, clientID: clientID, clientSecret: clientSecret, username: nil, accessToken: accessToken)
                     mastodonController.accountInfo = tempAccountInfo
                     
-                    mastodonController.getOwnAccount { (result) in
+                    mastodonController.getOwnAccount { (account) in
                         DispatchQueue.main.async {
-                            switch result {
+                            // this needs to happen on the main thread because it publishes a new value for the ObservableObject
-                            case let .failure(error):
+                            let accountInfo = LocalData.shared.addAccount(instanceURL: instanceURL, clientID: clientID, clientSecret: clientSecret, username: account.username, accessToken: accessToken)
-                                let alert = UIAlertController(title: "Unable to Verify Credentials", message: "Your account could not be fetched at this time: \(error.localizedDescription)", preferredStyle: .alert)
+                            mastodonController.accountInfo = accountInfo
-                                alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
+                            
-                                self.present(alert, animated: true)
+                            self.onboardingDelegate?.didFinishOnboarding(account: accountInfo)
-                                
-                            case let .success(account):
-                                // this needs to happen on the main thread because it publishes a new value for the ObservableObject
-                                let accountInfo = LocalData.shared.addAccount(instanceURL: instanceURL, clientID: clientID, clientSecret: clientSecret, username: account.username, accessToken: accessToken)
-                                mastodonController.accountInfo = accountInfo
-                                
-                                self.onboardingDelegate?.didFinishOnboarding(account: accountInfo)
-                            }
                         }
                     }
                 }

Tusker/Screens/Preferences/LocalAccountAvatarView.swift

@@ -36,8 +36,7 @@ struct LocalAccountAvatarView: View {
     
     func loadImage() {
         let controller = MastodonController.getForAccount(localAccountInfo)
-        controller.getOwnAccount { (result) in
+        controller.getOwnAccount { (account) in
-            guard case let .success(account) = result else { return }
             _ = ImageCache.avatars.get(account.avatar) { (data) in
                 if let data = data, let image = UIImage(data: data) {
                     DispatchQueue.main.async {

Tusker/Screens/Profile/MyProfileViewController.swift

@@ -16,9 +16,7 @@ class MyProfileViewController: ProfileViewController {
         title = "My Profile"
         tabBarItem.image = UIImage(systemName: "person.fill")
         
-        mastodonController.getOwnAccount { (result) in
+        mastodonController.getOwnAccount { (account) in
-            guard case let .success(account) = result else { return }
-            
             DispatchQueue.main.async {
                 self.accountID = account.id
             }