Fix the Lock Screen camera's thumbnails and its shots not arriving

On the first phone test, the Lock Screen camera's stack showed each shot
sideways and uncropped, and REVEAL opened the app with nothing to deal out.
The thumbnail came from UIKit, which ignored the photo's rotation tag; it's
now made the way the app reads photos, upright and cut to the brackets. The
app checked the camera's folders once as it came up; it now follows the
system's updates to them, and clears sessions where nothing was taken. Each
shot also records its camera angle, for debug mode.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: TheFilipcom4607

Shared/LockedShot.swift

@@ -11,6 +11,8 @@ struct LockedShot: Codable {
     var viewSize: CGSize?
     var latitude: Double?
     var longitude: Double?
+    /// The camera's rotation for the shot, in degrees (90 upright), for debug mode.
+    var angle: Double?
 
     func save(_ photo: Data, in folder: URL) throws {
         try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
@@ -20,6 +22,11 @@ struct LockedShot: Codable {
         try JSONEncoder().encode(self).write(to: folder.appendingPathComponent("\(id).json"), options: .atomic)
     }
 
+    static func hasShots(in folder: URL) -> Bool {
+        ((try? FileManager.default.contentsOfDirectory(at: folder, includingPropertiesForKeys: nil)) ?? [])
+            .contains { $0.pathExtension == "jpg" }
+    }
+
     /// Every shot in a session's folder, oldest first.
     static func all(in folder: URL) -> [(photo: Data, shot: LockedShot)] {
         let files = (try? FileManager.default.contentsOfDirectory(at: folder, includingPropertiesForKeys: nil)) ?? []

Tabor.xcodeproj/project.pbxproj

@@ -126,6 +126,7 @@
 			membershipExceptions = (
 				Camera/CameraModel.swift,
 				Camera/ViewfinderBrackets.swift,
+				Core/Viewfinder.swift,
 			);
 			target = A10000000000000000000090 /* TaborCapture */;
 		};

Tabor/App/TaborApp.swift

@@ -93,10 +93,13 @@ final class Router {
     let burst = BurstQueue()
     /// Goes up when the Lock Screen camera has left shots: CATCH takes them as a burst.
     var lockedShots = 0
+    /// The Lock Screen camera's session folders, kept from the system's updates: on the first
+    /// phone test, checking its list once as the app came up didn't find the shots.
+    var lockedFolders: [URL] = []
 
     /// Shots from the Lock Screen camera (#107), once the phone is unlocked.
     func catchLocked() {
-        guard !LockedCameraCaptureManager.shared.sessionContentURLs.isEmpty else { return }
+        guard lockedFolders.contains(where: LockedShot.hasShots) else { return }
         tab = .catchTab
         bookPath.removeAll()
         lockedShots += 1
@@ -262,6 +265,20 @@ struct RootView: View {
             // They've found the control on their own: no need to tip them off about it.
             UserDefaults.standard.set(true, forKey: CatchControlTip.seenKey)
         }
+        .task {
+            for await update in LockedCameraCaptureManager.shared.sessionContentUpdates {
+                switch update {
+                case .initial(let urls): router.lockedFolders = urls
+                case .added(let url): router.lockedFolders.append(url)
+                case .removed(let url): router.lockedFolders.removeAll { $0 == url }
+                }
+                // The camera opened and nothing taken: nothing to keep.
+                for url in router.lockedFolders where !LockedShot.hasShots(in: url) {
+                    try? await LockedCameraCaptureManager.shared.invalidateSessionContent(at: url)
+                }
+                router.catchLocked()
+            }
+        }
         // REVEAL in the Lock Screen camera, once Face ID lets it through.
         .onContinueUserActivity(NSUserActivityTypeLockedCameraCapture) { _ in router.catchLocked() }
         .onReceive(NotificationCenter.default.publisher(for: .taborOpenHunt)) { _ in

Tabor/Screens/CatchView.swift

@@ -873,7 +873,7 @@ struct CatchView: View {
     /// The Lock Screen camera's shots, read and dealt out as cards. Its folders are only
     /// cleared once the cards are ready, so a crash before then leaves the shots for next time.
     private func takeLocked() {
-        let folders = LockedCameraCaptureManager.shared.sessionContentURLs
+        let folders = router.lockedFolders
         guard !folders.isEmpty, draft == nil, cards == nil, !finishing else { return }
         Task {
             finishing = true
@@ -896,6 +896,7 @@ struct CatchView: View {
             record?.attach(original: photo)
             record?.update { $0.crop = "brackets \(crop.integral) in \(size.width)×\(size.height) viewfinder" }
         }
+        if let angle = shot.angle { record?.update { $0.captureAngle = angle } }
         let age = Date().timeIntervalSince(shot.date)
         // Taken a moment ago: you're still about where the shot was, and so are the vehicles.
         let nearby = age < 180 && live.fresh() != nil ? live.nearby : []

TaborCapture/CaptureView.swift

@@ -1,5 +1,6 @@
 import AVKit
 import CoreLocation
+import ImageIO
 import LockedCameraCapture
 import SwiftUI
 
@@ -214,7 +215,7 @@ struct CaptureView: View {
         withAnimation(.easeOut(duration: 0.35)) { flash = false }
         guard let data else { return }
         var shot = LockedShot(date: Date(), latitude: place.latest?.coordinate.latitude,
-                              longitude: place.latest?.coordinate.longitude)
+                              longitude: place.latest?.coordinate.longitude, angle: Double(camera.captureAngle))
         // Held upright, the app crops to the brackets as CATCH does; sideways it keeps it all.
         if camera.captureAngle == 90, bracketGlobal.width > 0, finderFrame.width > 0 {
             let brackets = bracketGlobal.offsetBy(dx: -finderFrame.minX, dy: -finderFrame.minY)
@@ -226,10 +227,29 @@ struct CaptureView: View {
         } catch {
             return UINotificationFeedbackGenerator().notificationOccurred(.error)
         }
-        let thumb = await Task.detached { UIImage(data: data)?.preparingThumbnail(of: CGSize(width: 120, height: 120)) }.value
+        let crop = shot.crop, size = shot.viewSize
+        let thumb = await Task.detached { Self.thumbnail(data, crop: crop, viewSize: size) }.value
         if let thumb { withAnimation(.spring(response: 0.3, dampingFraction: 0.7)) { thumbs.append(thumb) } }
     }
 
+    /// What the app will read: upright (UIKit's thumbnails ignored the photo's rotation tag)
+    /// and cut to the brackets.
+    nonisolated private static func thumbnail(_ data: Data, crop: CGRect?, viewSize: CGSize?) -> UIImage? {
+        guard let src = CGImageSourceCreateWithData(data as CFData, nil) else { return nil }
+        let opts: [CFString: Any] = [
+            kCGImageSourceCreateThumbnailFromImageAlways: true,
+            kCGImageSourceCreateThumbnailWithTransform: true,
+            kCGImageSourceThumbnailMaxPixelSize: 600,
+        ]
+        guard var image = CGImageSourceCreateThumbnailAtIndex(src, 0, opts as CFDictionary) else { return nil }
+        let w = CGFloat(image.width), h = CGFloat(image.height)
+        if let crop, let viewSize, let r = Viewfinder.region(of: crop, in: viewSize, imageSize: CGSize(width: w, height: h)),
+           let cut = image.cropping(to: CGRect(x: r.minX * w, y: r.minY * h, width: r.width * w, height: r.height * h).integral) {
+            image = cut
+        }
+        return UIImage(cgImage: image)
+    }
+
     /// Unlocks the phone (Face ID) and opens the app, which picks the shots up.
     private func reveal() {
         guard !opening else { return }