CHANGELOG.md

@@ -1,8 +1,5 @@
 # Changelog
 
-## 2023.5 (89)
-This build is a hotfix for an issue loading notifications in certain circumstances. The changelong for the previous build (adding post editing) is included below.
-
 ## 2023.5 (85)
 This build adds support for editing posts and showing edit timestamps and history.
 

Tusker.xcodeproj/project.pbxproj

@@ -2370,7 +2370,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2436,7 +2436,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2462,7 +2462,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2491,7 +2491,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2520,7 +2520,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2675,7 +2675,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2706,7 +2706,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2812,7 +2812,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2838,7 +2838,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 89;
+				CURRENT_PROJECT_VERSION = 85;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;

Tusker/CoreData/MastodonCachePersistentStore.swift

@@ -31,21 +31,18 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         context.persistentStoreCoordinator = self.persistentStoreCoordinator
         context.automaticallyMergesChangesFromParent = true
         context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
-        context.name = "Background"
         return context
     }()
     
-    // remote change processing happens on its own context, since it can sometimes take
+    private(set) lazy var prefetchBackgroundContext: NSManagedObjectContext = {
-    // a really long time (upwards of a minute) and shouldn't block other things using the background context
-    private lazy var remoteChangesBackgroundContext: NSManagedObjectContext = {
         let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         context.persistentStoreCoordinator = self.persistentStoreCoordinator
         context.automaticallyMergesChangesFromParent = true
         context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
-        context.name = "RemoteChanges"
         return context
     }()
     
+    private var remoteChangeHandlerQueue = DispatchQueue(label: "PersistentStore remote changes")
     private var lastRemoteChangeToken: NSPersistentHistoryToken?
     
     // TODO: consider sending managed objects through this to avoid re-fetching things unnecessarily
@@ -185,7 +182,6 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         
         viewContext.automaticallyMergesChangesFromParent = true
         viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
-        viewContext.name = "View"
         
         NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: viewContext)
         NotificationCenter.default.addObserver(self, selector: #selector(remoteChanges), name: .NSPersistentStoreRemoteChange, object: persistentStoreCoordinator)
@@ -513,48 +509,50 @@ class MastodonCachePersistentStore: NSPersistentCloudKitContainer {
         guard let token = notification.userInfo?[NSPersistentHistoryTokenKey] as? NSPersistentHistoryToken else {
             return
         }
-        remoteChangesBackgroundContext.perform {
+        remoteChangeHandlerQueue.async {
             defer {
                 self.lastRemoteChangeToken = token
             }
             let req = NSPersistentHistoryChangeRequest.fetchHistory(after: self.lastRemoteChangeToken)
-            if let result = try? self.remoteChangesBackgroundContext.execute(req) as? NSPersistentHistoryResult,
+            self.backgroundContext.performAndWait {
-               let transactions = result.result as? [NSPersistentHistoryTransaction],
+                if let result = try? self.backgroundContext.execute(req) as? NSPersistentHistoryResult,
-               !transactions.isEmpty {
+                   let transactions = result.result as? [NSPersistentHistoryTransaction],
-                var changedHashtags = false
+                   !transactions.isEmpty {
-                var changedInstances = false
+                    var changedHashtags = false
-                var changedTimelinePositions = Set<NSManagedObjectID>()
+                    var changedInstances = false
-                var changedAccountPrefs = false
+                    var changedTimelinePositions = Set<NSManagedObjectID>()
-                outer: for transaction in transactions {
+                    var changedAccountPrefs = false
-                    for change in transaction.changes ?? [] {
+                    outer: for transaction in transactions {
-                        if change.changedObjectID.entity.name == "SavedHashtag" {
+                        for change in transaction.changes ?? [] {
-                            changedHashtags = true
+                            if change.changedObjectID.entity.name == "SavedHashtag" {
-                        } else if change.changedObjectID.entity.name == "SavedInstance" {
+                                changedHashtags = true
-                            changedInstances = true
+                            } else if change.changedObjectID.entity.name == "SavedInstance" {
-                        } else if change.changedObjectID.entity.name == "TimelinePosition" {
+                                changedInstances = true
-                            changedTimelinePositions.insert(change.changedObjectID)
+                            } else if change.changedObjectID.entity.name == "TimelinePosition" {
-                        } else if change.changedObjectID.entity.name == "AccountPreferences" {
+                                changedTimelinePositions.insert(change.changedObjectID)
-                            changedAccountPrefs = true
+                            } else if change.changedObjectID.entity.name == "AccountPreferences" {
+                                changedAccountPrefs = true
+                            }
                         }
                     }
-                }
+                    DispatchQueue.main.async {
-                DispatchQueue.main.async {
+                        if changedHashtags {
-                    if changedHashtags {
+                            NotificationCenter.default.post(name: .savedHashtagsChanged, object: nil)
-                        NotificationCenter.default.post(name: .savedHashtagsChanged, object: nil)
+                        }
-                    }
+                        if changedInstances {
-                    if changedInstances {
+                            NotificationCenter.default.post(name: .savedInstancesChanged, object: nil)
-                        NotificationCenter.default.post(name: .savedInstancesChanged, object: nil)
+                        }
-                    }
+                        for id in changedTimelinePositions {
-                    for id in changedTimelinePositions {
+                            guard let timelinePosition = try? self.viewContext.existingObject(with: id) as? TimelinePosition else {
-                        guard let timelinePosition = try? self.viewContext.existingObject(with: id) as? TimelinePosition else {
+                                continue
-                            continue
+                            }
+                            // the kvo observer that clears the LazilyDecoding cache doesn't always fire on remote changes, so do it manually
+                            timelinePosition.changedRemotely()
+                            NotificationCenter.default.post(name: .timelinePositionChanged, object: timelinePosition)
+                        }
+                        if changedAccountPrefs {
+                            NotificationCenter.default.post(name: .accountPreferencesChangedRemotely, object: nil)
                         }
-                        // the kvo observer that clears the LazilyDecoding cache doesn't always fire on remote changes, so do it manually
-                        timelinePosition.changedRemotely()
-                        NotificationCenter.default.post(name: .timelinePositionChanged, object: timelinePosition)
-                    }
-                    if changedAccountPrefs {
-                        NotificationCenter.default.post(name: .accountPreferencesChangedRemotely, object: nil)
                     }
                 }
             }

Tusker/Logging.swift

@@ -22,13 +22,12 @@ struct Logging {
             let entries = try store.getEntries()
             var data = Data()
             let subsystem = Bundle.main.bundleIdentifier!
-            let format = Date.ISO8601FormatStyle(includingFractionalSeconds: true)
             for entry in entries {
                 guard let entry = entry as? OSLogEntryLog,
                       entry.subsystem == subsystem else {
                     continue
                 }
-                data.append(contentsOf: entry.date.formatted(format).utf8)
+                data.append(contentsOf: entry.date.formatted(.iso8601).utf8)
                 data.append(32) // ' '
                 data.append(91) // '['
                 data.append(contentsOf: entry.category.utf8)