Auto upload from specific Albums

Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension UI.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Nextcloud.xcodeproj/xcshareddata/xcschemes/File Provider Extension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Nextcloud.xcodeproj/xcshareddata/xcschemes/Nextcloud.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Nextcloud.xcodeproj/xcshareddata/xcschemes/Notification Service Extension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Nextcloud.xcodeproj/xcshareddata/xcschemes/Share.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Nextcloud.xcodeproj/xcshareddata/xcschemes/Widget.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Nextcloud.xcodeproj/xcshareddata/xcschemes/WidgetDashboardIntentHandler.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1620"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

iOSClient/DeepLink/NCDeepLinkHandler.swift

@@ -146,9 +146,11 @@ class NCDeepLinkHandler {
         controller.selectedIndex = ControllerConstants.moreIndex
         guard let navigationController = controller.viewControllers?[controller.selectedIndex] as? UINavigationController else { return }
 
-        let autoUploadView = NCAutoUploadView(model: NCAutoUploadModel(controller: controller))
-        let autoUploadController = UIHostingController(rootView: autoUploadView)
-        navigationController.pushViewController(autoUploadController, animated: true)
+        Task { @MainActor in
+            let autoUploadView = NCAutoUploadView(model: NCAutoUploadModel(controller: controller), albumModel: AlbumModel(controller: controller))
+            let autoUploadController = UIHostingController(rootView: autoUploadView)
+            navigationController.pushViewController(autoUploadController, animated: true)
+        }
     }
 
     private func navigateAppUpdate() {

iOSClient/Extensions/PHAssetCollection+Extension.swift

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2024 Milen Pivchev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Photos
+
+extension PHAssetCollection {
+    var assetCount: Int {
+        let fetchOptions = PHFetchOptions()
+        let result = PHAsset.fetchAssets(in: self, options: fetchOptions)
+        return result.count
+    }
+
+    static var allAlbums: [PHAssetCollection] {
+        let smartAlbumAssetCollections = PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: .any, options: nil)
+        var smartAlbums: [PHAssetCollection] = []
+
+        smartAlbumAssetCollections.enumerateObjects { collection, _, _ in
+            smartAlbums.append(collection)
+        }
+
+        let userAlbumAssetCollections = PHAssetCollection.fetchAssetCollections(with: .album, subtype: .any, options: nil)
+        var userAlbums: [PHAssetCollection] = []
+
+        userAlbumAssetCollections.enumerateObjects { collection, _, _ in
+            userAlbums.append(collection)
+        }
+
+        return smartAlbums + userAlbums
+    }
+}

iOSClient/Main/NCMainNavigationController.swift

@@ -38,11 +38,7 @@ class NCMainNavigationController: UINavigationController, UINavigationController
     }
 
     func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
-        if viewController is NCMore || viewController is UIHostingController<Nextcloud.NCSettingsView> {
-            setGroupAppearance()
-        } else {
-            setNavigationBarAppearance()
-        }
+        setNavigationBarAppearance()
     }
 
     func setNavigationLeftItems() { }

iOSClient/More/NCMoreNavigationController.swift

@@ -62,4 +62,8 @@ class NCMoreNavigationController: NCMainNavigationController {
             self.tabBarController?.tabBar.isHidden = true
         }
     }
+
+    override func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
+        setGroupAppearance()
+    }
 }

iOSClient/Networking/NCAutoUpload.swift

@@ -46,13 +46,17 @@
                 return completion(0)
             }
 
-            NCAskAuthorization().askAuthorizationPhotoLibrary(controller: controller) { hasPermission in
+            NCAskAuthorization().askAuthorizationPhotoLibrary(controller: controller) { [self] hasPermission in
                 guard hasPermission else {
                     self.database.setAccountAutoUploadProperty("autoUpload", state: false)
                     return completion(0)
                 }
 
-                self.uploadAssetsNewAndFull(controller: controller, selector: NCGlobal.shared.selectorUploadAutoUpload, log: "Init Auto Upload", account: account) { num in
+                let albumIds = NCKeychain().getAutoUploadAlbumIds(account: account)
+
+                let selectedAlbums = PHAssetCollection.allAlbums.filter({albumIds.contains($0.localIdentifier)})
+
+                self.uploadAssetsNewAndFull(controller: controller, assetCollections: selectedAlbums, selector: NCGlobal.shared.selectorUploadAutoUpload, log: "Init Auto Upload", account: account) { num in
                     completion(num)
                 }
             }
@@ -67,29 +71,29 @@
         })
     }
 
-    func autoUploadFullPhotos(controller: NCMainTabBarController?, log: String, account: String) {
+    func autoUploadSelectedAlbums(controller: NCMainTabBarController?, assetCollections: [PHAssetCollection], log: String, account: String) {
         applicationState = UIApplication.shared.applicationState
         hud.initHudRing(view: controller?.view, text: nil, detailText: nil, tapToCancelDetailText: false)
 
         NCAskAuthorization().askAuthorizationPhotoLibrary(controller: controller) { hasPermission in
             guard hasPermission else { return }
             DispatchQueue.global().async {
-                self.uploadAssetsNewAndFull(controller: controller, selector: NCGlobal.shared.selectorUploadAutoUploadAll, log: log, account: account) { _ in
+                self.uploadAssetsNewAndFull(controller: controller, assetCollections: assetCollections, selector: NCGlobal.shared.selectorUploadAutoUploadAll, log: log, account: account) { _ in
                     self.hud.dismiss()
                 }
             }
         }
     }
 
-    private func uploadAssetsNewAndFull(controller: NCMainTabBarController?, selector: String, log: String, account: String, completion: @escaping (_ num: Int) -> Void) {
+    private func uploadAssetsNewAndFull(controller: NCMainTabBarController?, assetCollections: [PHAssetCollection] = [], selector: String, log: String, account: String, completion: @escaping (_ num: Int) -> Void) {
         guard let tableAccount = self.database.getTableAccount(predicate: NSPredicate(format: "account == %@", account)) else {
             return completion(0)
         }
         let session = NCSession.shared.getSession(account: account)
         let autoUploadPath = self.database.getAccountAutoUploadPath(session: session)
         var metadatas: [tableMetadata] = []
 
-        self.getCameraRollAssets(controller: controller, selector: selector, alignPhotoLibrary: false, account: account) { assets in
+        self.getCameraRollAssets(controller: controller, assetCollections: assetCollections, selector: selector, alignPhotoLibrary: false, account: account) { assets in
             guard let assets, !assets.isEmpty else {
                 NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Automatic upload, no new assets found [" + log + "]")
                 return completion(0)
@@ -210,19 +214,49 @@
         }
     }
 
-    private func getCameraRollAssets(controller: NCMainTabBarController?, selector: String, alignPhotoLibrary: Bool, account: String, completion: @escaping (_ assets: [PHAsset]?) -> Void) {
-        NCAskAuthorization().askAuthorizationPhotoLibrary(controller: controller) { hasPermission in
+    func processAssets(_ assetCollection: PHAssetCollection, _ fetchOptions: PHFetchOptions, _ tableAccount: tableAccount, _ selector: String, _ account: String) -> [PHAsset] {
+        let assets: PHFetchResult<PHAsset> = PHAsset.fetchAssets(in: assetCollection, options: fetchOptions)
+        var assetResult: [PHAsset] = []
+
+        if selector == NCGlobal.shared.selectorUploadAutoUpload,
+           let idAssets = self.database.getPhotoLibraryIdAsset(image: tableAccount.autoUploadImage, video: tableAccount.autoUploadVideo, account: account) {
+            assets.enumerateObjects { asset, _, _ in
+                var creationDateString = ""
+                if let creationDate = asset.creationDate {
+                    creationDateString = String(describing: creationDate)
+                }
+                let idAsset = account + asset.localIdentifier + creationDateString
+                if !idAssets.contains(idAsset) {
+                    if (asset.isFavorite && tableAccount.autoUploadFavoritesOnly) || !tableAccount.autoUploadFavoritesOnly {
+                        assetResult.append(asset)
+                    }
+                }
+            }
+        } else {
+            assets.enumerateObjects { asset, _, _ in
+                if (asset.isFavorite && tableAccount.autoUploadFavoritesOnly) || !tableAccount.autoUploadFavoritesOnly {
+                    assetResult.append(asset)
+                }
+            }
+        }
+
+        return assetResult
+    }
+
+    private func getCameraRollAssets(controller: NCMainTabBarController?, assetCollections: [PHAssetCollection] = [], selector: String, alignPhotoLibrary: Bool, account: String, completion: @escaping (_ assets: [PHAsset]?) -> Void) {
+        NCAskAuthorization().askAuthorizationPhotoLibrary(controller: controller) { [self] hasPermission in
             guard hasPermission,
                   let tableAccount = self.database.getTableAccount(predicate: NSPredicate(format: "account == %@", account)) else {
                 return completion(nil)
             }
-            let assetCollection = PHAssetCollection.fetchAssetCollections(with: PHAssetCollectionType.smartAlbum, subtype: PHAssetCollectionSubtype.smartAlbumUserLibrary, options: nil)
-            guard let assetCollection = assetCollection.firstObject else { return completion(nil) }
+
+            var newAssets: [PHAsset] = []
+
+            let fetchOptions = PHFetchOptions()
+
             let predicateImage = NSPredicate(format: "mediaType == %i", PHAssetMediaType.image.rawValue)
             let predicateVideo = NSPredicate(format: "mediaType == %i", PHAssetMediaType.video.rawValue)
             var predicate: NSPredicate?
-            let fetchOptions = PHFetchOptions()
-            var newAssets: [PHAsset] = []
 
             if alignPhotoLibrary || (tableAccount.autoUploadImage && tableAccount.autoUploadVideo) {
                 predicate = NSCompoundPredicate(orPredicateWithSubpredicates: [predicateImage, predicateVideo])
@@ -235,30 +269,19 @@
             }
 
             fetchOptions.predicate = predicate
-            let assets: PHFetchResult<PHAsset> = PHAsset.fetchAssets(in: assetCollection, options: fetchOptions)
-
-            if selector == NCGlobal.shared.selectorUploadAutoUpload,
-               let idAssets = self.database.getPhotoLibraryIdAsset(image: tableAccount.autoUploadImage, video: tableAccount.autoUploadVideo, account: account) {
-                assets.enumerateObjects { asset, _, _ in
-                    var creationDateString = ""
-                    if let creationDate = asset.creationDate {
-                        creationDateString = String(describing: creationDate)
-                    }
-                    let idAsset = account + asset.localIdentifier + creationDateString
-                    if !idAssets.contains(idAsset) {
-                        if (asset.isFavorite && tableAccount.autoUploadFavoritesOnly) || !tableAccount.autoUploadFavoritesOnly {
-                            newAssets.append(asset)
-                        }
-                    }
-                }
+
+            if assetCollections.isEmpty {
+                let assetCollection = PHAssetCollection.fetchAssetCollections(with: .smartAlbum, subtype: PHAssetCollectionSubtype.smartAlbumUserLibrary, options: nil)
+                guard let assetCollection = assetCollection.firstObject else { return completion(nil) }
+
+                newAssets += processAssets(assetCollection, fetchOptions, tableAccount, selector, account)
             } else {
-                assets.enumerateObjects { asset, _, _ in
-                    if (asset.isFavorite && tableAccount.autoUploadFavoritesOnly) || !tableAccount.autoUploadFavoritesOnly {
-                        newAssets.append(asset)
-                    }
+                for assetCollection in assetCollections {
+                    newAssets += processAssets(assetCollection, fetchOptions, tableAccount, selector, account)
                 }
+
+                completion(newAssets)
             }
-            completion(newAssets)
         }
     }
 }

iOSClient/Settings/Advanced/NCSettingsAdvancedView.swift

@@ -253,6 +253,7 @@ struct NCSettingsAdvancedView: View {
             })
         }
         .navigationBarTitle(NSLocalizedString("_advanced_", comment: ""))
+        .navigationBarTitleDisplayMode(.inline)
         .defaultViewModifier(model)
     }
 

iOSClient/Settings/AutoUpload/Albums.swift

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2024 Milen Pivchev
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Photos
+
+class Albums: ObservableObject {
+    @Published var smartAlbums: [PHAssetCollection] = []
+}

iOSClient/Settings/AutoUpload/NCAutoUploadModel.swift

@@ -31,8 +31,6 @@ import NextcloudKit
 class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
     /// A state variable that indicates whether auto upload is enabled or not
     @Published var autoUpload: Bool = false
-    /// A state variable that indicates whether to open NCSelect View or not
-    @Published var autoUploadFolder: Bool = false
     /// A state variable that indicates whether auto upload for photos is enabled or not
     @Published var autoUploadImage: Bool = false
     /// A state variable that indicates whether auto upload for photos is restricted to Wi-Fi only or not
@@ -57,6 +55,7 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
     @Published var error: String = ""
     let database = NCManageDatabase.shared
     @Published var autoUploadPath = "\(NCManageDatabase.shared.getAccountAutoUploadFileName())"
+
     /// Root View Controller
     var controller: NCMainTabBarController?
     /// A variable user for change the auto upload directory
@@ -164,10 +163,11 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
     }
 
     /// Updates the auto-upload full content setting.
-    func handleAutoUploadFullChange(newValue: Bool) {
+    func handleAutoUploadChange(newValue: Bool, assetCollections: [PHAssetCollection]) {
         updateAccountProperty(\.autoUploadFull, value: newValue)
+
         if newValue {
-            NCAutoUpload.shared.autoUploadFullPhotos(controller: self.controller, log: "Auto upload full", account: session.account)
+            NCAutoUpload.shared.autoUploadSelectedAlbums(controller: self.controller, assetCollections: assetCollections, log: "Auto upload selected albums", account: session.account)
         } else {
             self.database.clearMetadatasUpload(account: session.account)
         }
@@ -214,8 +214,18 @@ class NCAutoUploadModel: ObservableObject, ViewOnAppearHandling {
                 self.database.setAccountAutoUploadDirectory(path, session: session)
             }
         }
+
         onViewAppear()
     }
+
+    func createAlbumTitle(autoUploadAlbumIds: Set<String>) -> String {
+        if autoUploadAlbumIds.count == 1 {
+            let album = PHAssetCollection.allAlbums.first(where: { autoUploadAlbumIds.first == $0.localIdentifier })
+            return (album?.assetCollectionSubtype == .smartAlbumUserLibrary) ? NSLocalizedString("_camera_roll_", comment: "") : (album?.localizedTitle ?? "")
+        } else {
+            return NSLocalizedString("_multiple_albums_", comment: "")
+        }
+    }
 }
 
 /// An enum that represents the granularity of the subfolders for auto upload