Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-08-05 23:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix startup crash in sideloaded builds without iCloud entitlements

Browse Source 
Sideloading tools re-sign the app with a team that cannot register the
iCloud.stream.yattee.app container, and CKContainer(identifier:) fatally
traps when the entitlement is missing. Detect availability by parsing
the embedded provisioning profile, skip creating any CloudKit objects
when the entitlement is absent, and show an explanation in iCloud
settings instead of the sync toggle.
This commit is contained in:
Arkadiusz Fal
2026-07-27 20:08:21 +02:00
parent 7c07189023
commit 40f043b769
4 changed files with 135 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Yattee/Services/CloudKit/CloudKitSyncEngine.swift
View File

@@ -64,9 +64,14 @@ final class CloudKitSyncEngine: @unchecked Sendable {
// MARK: - State
private let container: CKContainer
private let database: CKDatabase
private let zoneManager: CloudKitZoneManager
/// Whether CloudKit is usable in this installation. False when the app was
/// re-signed without the iCloud container entitlement (sideloading); all
/// sync functionality is disabled then and the CloudKit objects stay nil.
let isCloudKitAvailable = CloudKitAvailability.isAvailable
private let container: CKContainer?
private let database: CKDatabase?
private let zoneManager: CloudKitZoneManager?
private var recordMapper: CloudKitRecordMapper
private var conflictResolver: CloudKitConflictResolver
private var syncEngine: CKSyncEngine?
@@ -232,12 +237,21 @@ final class CloudKitSyncEngine: @unchecked Sendable {
self.settingsManager = settingsManager
self.instancesManager = instancesManager
// Initialize CloudKit
self.container = CKContainer(identifier: AppIdentifiers.iCloudContainer)
self.database = container.privateCloudDatabase
// Initialize zone manager
self.zoneManager = CloudKitZoneManager(database: database)
// Initialize CloudKit. CKContainer(identifier:) fatally traps when the
// entitlement is missing (re-signed/sideloaded builds), so it must not
// be constructed at all in that case.
if CloudKitAvailability.isAvailable {
let container = CKContainer(identifier: AppIdentifiers.iCloudContainer)
let database = container.privateCloudDatabase
self.container = container
self.database = database
self.zoneManager = CloudKitZoneManager(database: database)
} else {
LoggingService.shared.logCloudKit("iCloud container entitlement missing (re-signed build) - CloudKit sync unavailable")
self.container = nil
self.database = nil
self.zoneManager = nil
}
// Initialize with temporary zone (will be updated in setupSyncEngine)
let tempZone = RecordType.createZone()
@@ -261,6 +275,10 @@ final class CloudKitSyncEngine: @unchecked Sendable {
/// Enables CloudKit sync. Creates CKSyncEngine and starts syncing.
func enable() async {
guard isCloudKitAvailable else {
LoggingService.shared.logCloudKit("CloudKit unavailable in this installation, cannot enable sync")
return
}
guard syncEngine == nil else {
LoggingService.shared.logCloudKit("Sync engine already enabled")
return
@@ -312,6 +330,11 @@ final class CloudKitSyncEngine: @unchecked Sendable {
return
}
guard let container, let database, let zoneManager else {
LoggingService.shared.logCloudKit("CloudKit unavailable in this installation, skipping engine setup")
return
}
do {
// Check iCloud account status
let status = try await container.accountStatus()
@@ -387,6 +410,7 @@ final class CloudKitSyncEngine: @unchecked Sendable {
/// Checks if the iCloud account has changed and handles it by clearing sync state.
/// - Returns: `true` if account changed and sync state was cleared, `false` otherwise.
private func checkAndHandleAccountChange() async -> Bool {
guard let container else { return false }
do {
// Fetch the current user's record ID using async wrapper
let currentUserRecordID = try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<CKRecord.ID, Error>) in
@@ -1422,6 +1446,8 @@ final class CloudKitSyncEngine: @unchecked Sendable {
/// Clear all sync state and reset. For testing/debugging only.
func resetSync() async throws {
guard let zoneManager else { return }
// Delete zone (and all records)
try await zoneManager.deleteZone()
@@ -1449,6 +1475,7 @@ final class CloudKitSyncEngine: @unchecked Sendable {
/// Refreshes the cached iCloud account status
func refreshAccountStatus() async {
guard let container else { return }
do {
accountStatus = try await container.accountStatus()
} catch {
@@ -1566,7 +1593,7 @@ final class CloudKitSyncEngine: @unchecked Sendable {
case .zoneNotFound:
LoggingService.shared.logCloudKit("Zone not found, recreating...")
Task {
try? await zoneManager.createZoneIfNeeded()
try? await zoneManager?.createZoneIfNeeded()
await sync()
}
@@ -1882,7 +1909,7 @@ extension CloudKitSyncEngine: CKSyncEngineDelegate {
// Zone was deleted — recreate it and retry the save
syncEngine?.state.add(pendingRecordZoneChanges: [.saveRecord(recordID)])
Task {
try? await zoneManager.createZoneIfNeeded()
try? await zoneManager?.createZoneIfNeeded()
}
LoggingService.shared.logCloudKit("Zone missing for \(recordName), recreating and retrying")
@@ -1966,7 +1993,7 @@ extension CloudKitSyncEngine: CKSyncEngineDelegate {
retryCount.removeAll()
do {
try await zoneManager.createZoneIfNeeded()
try await zoneManager?.createZoneIfNeeded()
await performInitialUpload()
} catch {
LoggingService.shared.logCloudKitError("Failed to recreate zone after remote deletion", error: error)