CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog
 
-## 2021.1 (21)
-This is a quick follow-up to the previous build with fixes for a couple major crashes. Unfortunately, due to a bug in iOS 14, the Disable Infinite Scrolling preference now requires the iOS 15 beta to use. It may return in a future build if I can find a workaround, but it's disabled in the meantime.
-
-Features/Improvements:
-- iPadOS 15: Add Open in New Window context menu action to sidebar items
-
-Bugfixes:
-- Fix crash when editing accounts in a list
-- Fix crash when refreshing timeline on iOS 14
-- Fix(ish) crash when opening collapsed status with Disable Infinite Scrolling active on iOS 15
-
 ## 2021.1 (20)
 This is a big one! In addition to a bunch of fixes for anyone on the iOS 15 beta, there are a couple of big ticket features, including the Open in Tusker action extension and the Disable Infinite Scrolling preference.
 

Tusker.xcodeproj/project.pbxproj

@@ -2577,7 +2577,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2610,7 +2610,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2719,7 +2719,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2746,7 +2746,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;

Tusker.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -2,7 +2,7 @@
   "object": {
     "pins": [
       {
-        "package": "plcrashreporter",
+        "package": "PLCrashReporter",
         "repositoryURL": "https://github.com/microsoft/plcrashreporter",
         "state": {
           "branch": null,

Tusker/Screens/Lists/EditListAccountsViewController.swift

@@ -80,15 +80,15 @@ class EditListAccountsViewController: EnhancedTableViewController {
             
             self.nextRange = pagination?.older
             
-            self.mastodonController.persistentContainer.addAll(accounts: accounts) {
-                var snapshot = self.dataSource.snapshot()
-                snapshot.deleteSections([.accounts])
-                snapshot.appendSections([.accounts])
-                snapshot.appendItems(accounts.map { .account(id: $0.id) })
+            self.mastodonController.persistentContainer.addAll(accounts: accounts)
             
-                DispatchQueue.main.async {
-                    self.dataSource.apply(snapshot)
-                }
+            var snapshot = self.dataSource.snapshot()
+            snapshot.deleteSections([.accounts])
+            snapshot.appendSections([.accounts])
+            snapshot.appendItems(accounts.map { .account(id: $0.id) })
+            
+            DispatchQueue.main.async {
+                self.dataSource.apply(snapshot)
             }
         }
     }

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -462,21 +462,6 @@ extension MainSidebarViewController: UICollectionViewDelegate {
             return true
         }
     }
-    
-    func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {
-        guard #available(iOS 15.0, *),
-              let item = dataSource.itemIdentifier(for: indexPath),
-              let activity = userActivityForItem(item) else {
-            return nil
-        }
-        return UIContextMenuConfiguration(identifier: nil, previewProvider: nil) { (_) in
-            return UIMenu(children: [
-                UIWindowScene.ActivationAction({ action in
-                    return UIWindowScene.ActivationConfiguration(userActivity: activity)
-                }),
-            ])
-        }
-    }
 }
 
 extension MainSidebarViewController: UICollectionViewDragDelegate {

Tusker/Screens/Preferences/WellnessPrefsView.swift

@@ -16,9 +16,7 @@ struct WellnessPrefsView: View {
             showFavAndReblogCount
             notificationsMode
             grayscaleImages
-            if #available(iOS 15.0, *) {
-                disableInfiniteScrolling
-            }
+            disableInfiniteScrolling
         }
         .listStyle(InsetGroupedListStyle())
         .navigationBarTitle(Text("Digital Wellness"))

Tusker/Screens/Profile/ProfileViewController.swift

@@ -74,7 +74,6 @@ class ProfileViewController: UIPageViewController {
                 self.composeDirectMentioning()
             })
         ])
-        composeButton.isEnabled = mastodonController.loggedIn
         navigationItem.rightBarButtonItem = composeButton
         
         headerView = ProfileHeaderView.create()

Tusker/Screens/Timeline/TimelineTableViewController.swift

@@ -123,8 +123,7 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
             return
         }
         
-        if #available(iOS 15.0, *),
-           Preferences.shared.disableInfiniteScrolling && !didConfirmLoadMore {
+        guard !Preferences.shared.disableInfiniteScrolling || didConfirmLoadMore else {
             guard !currentSnapshot.itemIdentifiers(inSection: .footer).contains(.confirmLoadMore) else {
                 // todo: need something more accurate than "success"/"failure"
                 completion(.success(currentSnapshot))
@@ -178,11 +177,11 @@ class TimelineTableViewController: DiffableTimelineLikeTableViewController<Timel
                 
                 self.mastodonController.persistentContainer.addAll(statuses: statuses) {
                     var snapshot = currentSnapshot
-                    let newIdentifiers = statuses.map { Item.status(id: $0.id, state: .unknown) }
+                    let identifiers = statuses.map { Item.status(id: $0.id, state: .unknown) }
                     if let first = snapshot.itemIdentifiers(inSection: .statuses).first {
-                        snapshot.insertItems(newIdentifiers, beforeItem: first)
+                        snapshot.insertItems(identifiers, beforeItem: first)
                     } else {
-                        snapshot.appendItems(newIdentifiers, toSection: .statuses)
+                        snapshot.appendItems(identifiers, toSection: .statuses)
                     }
                     completion(.success(snapshot))
                 }
@@ -206,27 +205,6 @@ extension TimelineTableViewController {
     enum Item: Hashable {
         case status(id: String, state: StatusState)
         case confirmLoadMore
-        
-        static func ==(lhs: Item, rhs: Item) -> Bool {
-            switch (lhs, rhs) {
-            case let (.status(id: a, state: _), .status(id: b, state: _)):
-                return a == b
-            case (.confirmLoadMore, .confirmLoadMore):
-                return true
-            default:
-                return false
-            }
-        }
-        
-        func hash(into hasher: inout Hasher) {
-            switch self {
-            case let .status(id: id, state: _):
-                hasher.combine(0)
-                hasher.combine(id)
-            case .confirmLoadMore:
-                hasher.combine(1)
-            }
-        }
     }
 }