Resolve photo deletion bug (#94)

* Reset uploaded items list during tidy up

* Bump version

Author: allanlang

Tree Tracker/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.10.8</string>
+	<string>0.10.9</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

Tree Tracker/Services/Database.swift

@@ -214,6 +214,21 @@ final class Database {
             }
         }
     }
+    
+    func clearUploadedItems(completion: @escaping () -> Void) {
+        dbQueue?.asyncWrite { db in
+            try? UploadedTree.deleteAll(db)
+        } completion: { db, result in
+            switch result {
+            case .failure(let error):
+                Rollbar.errorError(error, data: nil, context: "Error deleting uploaded items")
+            default:
+                DispatchQueue.main.async {
+                    completion()
+                }
+            }
+        }
+    }
 
     func update(tree: LocalTree, completion: @escaping () -> Void) {
         dbQueue?.asyncWrite { db in

Tree Tracker/Services/ProtectEarth/ProtectEarthTreeService.swift

@@ -12,12 +12,36 @@ class ProtectEarthTreeService: TreeService {
 
     // Complete any local tidy up following an upload session
     func tidyUp() {
-        database.fetchAll(UploadedTree.self) { uploadItems in
+        database.fetchAll(UploadedTree.self) { [weak self] uploadItems in
             if uploadItems.isNotEmpty {
                 let assetManager = PHAssetManager()
                 let assetIds = uploadItems.map { $0.phImageId }
-                Rollbar.infoMessage("Cleaning up \(uploadItems.count) tree photos")
-                assetManager.deletePhotoAssets(withIds: assetIds)
+                assetManager.deletePhotoAssets(withIds: assetIds) { success, error in
+                    if success {
+                        print("Deleted \(assetIds.count) photos successfully")
+                        Rollbar.infoMessage("Successfully cleared photos from library",
+                                           data: ["assetCount": assetIds.count],
+                                           context: "PHAssetManager.deletePhotoAssets")
+                        
+                    } else {
+                        print("Photos could not be cleared: \(error!.localizedDescription)")
+                        Rollbar.errorError(error!,
+                                          data: nil,
+                                          context: "PHAssetManager.deletePhotoAssets")
+                    }
+                    /*
+                     If we did not delete photos this is probably because the user declined this option.
+                     
+                     We should clear down the uploaded items list regardless because otherwise we risk
+                     deleting those photos at a later date.
+                     
+                     A consequence of this is that if the user declines, they will always have to clean up
+                     those photos manually, since the app will lose track of them.
+                     */
+                    self?.database.clearUploadedItems {
+                        print("Uploaded items list cleared")
+                    }
+                }
             }
         }
     }

Tree Tracker/Utilities/PHAssetManager.swift

@@ -1,11 +1,12 @@
 import Foundation
 import Photos
 import UIKit
+import RollbarNotifier
 
 protocol AssetManaging {
     func findAssets(for ids: [String]) -> [PHAsset]
     func save(image: UIImage, location: CLLocation?, completion: @escaping (Result<PHAsset, PHPhotoLibrarySaveImageError>) -> Void)
-    func deletePhotoAssets(withIds assetIds: [String])
+    func deletePhotoAssets(withIds assetIds: [String], completion: @escaping (Bool, Error?) -> Void)
 }
 
 struct PHAssetManager: AssetManaging {
@@ -27,12 +28,15 @@ struct PHAssetManager: AssetManaging {
         PHPhotoLibrary.shared().save(image: image, location: location, completion: completion)
     }
 
-    func deletePhotoAssets(withIds assetIds: [String]) {
+    func deletePhotoAssets(withIds assetIds: [String], completion: @escaping (Bool, Error?) -> Void) {
         let options = PHFetchOptions()
         options.wantsIncrementalChangeDetails = false
         let assets = PHAsset.fetchAssets(withLocalIdentifiers: assetIds, options: options)
-        PHPhotoLibrary.shared().performChanges({
+        
+        PHPhotoLibrary.shared().performChanges {
             PHAssetChangeRequest.deleteAssets(assets)
-        })
+        } completionHandler: { success, error in
+            completion(success, error)
+        }
     }
 }

Unit Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.10.8</string>
+	<string>0.10.9</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>