Merge branch 'master' of https://github.com/nextcloud/ios into filename-fixes

Author: mpivchev

Nextcloud.xcodeproj/project.pbxproj

@@ -49,6 +49,7 @@ class NCShareExtension: UIViewController {
     let global = NCGlobal.shared
     var maintenanceMode: Bool = false
     var token: Int?
+    var banner: LucidBanner?
     var sceneIdentifier: String = UUID().uuidString
 
     // MARK: - View Life Cycle
@@ -114,6 +115,10 @@ class NCShareExtension: UIViewController {
         }
 
         NCNetworking.shared.setupScene(sceneIdentifier: sceneIdentifier, controller: self)
+
+        if let windowScene = view.window?.windowScene {
+            banner = LucidBannerRegistry.shared.banner(for: windowScene)
+        }
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -383,10 +388,10 @@ extension NCShareExtension {
                                          vPosition: .center,
                                          horizontalLayout: horizontalLayout,
                                          blocksTouches: true)
-        token = showUploadBanner(scene: window.windowScene,
-                                 payload: payload,
-                                 allowMinimizeOnTap: false,
-                                 onButtonTap: {
+        (token, banner) = showUploadBanner(windowScene: window.windowScene,
+                                           payload: payload,
+                                           allowMinimizeOnTap: false,
+                                           onButtonTap: {
             self.cancel()
         })
 
@@ -397,7 +402,7 @@ extension NCShareExtension {
                 systemImage: "arrowshape.up.circle",
                 imageAnimation: .breathe,
                 progress: 0)
-            LucidBanner.shared.update(payload: payloadUpdate)
+            banner?.update(payload: payloadUpdate)
 
             error = await self.upload(metadata: metadata)
             if error != .success {
@@ -406,12 +411,12 @@ extension NCShareExtension {
         }
 
         if error == .success {
-            LucidBanner.shared.update(payload: LucidBannerPayload.Update(stage: .success, horizontalLayout: .centered(width: 100)), for: self.token)
+            banner?.update(payload: LucidBannerPayload.Update(stage: .success, horizontalLayout: .centered(width: 100)), for: self.token)
         } else {
-            LucidBanner.shared.update(payload: LucidBannerPayload.Update(subtitle: error?.errorDescription, stage: .error), for: self.token)
+            banner?.update(payload: LucidBannerPayload.Update(subtitle: error?.errorDescription, stage: .error), for: self.token)
         }
 
-        LucidBanner.shared.dismiss(after: 2) {
+        banner?.dismiss(after: 2) {
             self.cancel()
         }
     }
@@ -444,35 +449,40 @@ extension NCShareExtension {
         self.counterUploaded += 1
 
         if metadata.isDirectoryE2EE {
-            error = await NCNetworkingE2EEUpload().upload(metadata: metadata, session: session, controller: self, stageBanner: nil, tokenBanner: self.token)
+            error = await NCNetworkingE2EEUpload().upload(metadata: metadata,
+                                                          session: session,
+                                                          controller: self,
+                                                          banner: banner,
+                                                          stageBanner: nil,
+                                                          tokenBanner: self.token)
         } else if metadata.chunk > 0 {
-            LucidBanner.shared.update(payload: LucidBannerPayload.Update(systemImage: "gearshape.arrow.triangle.2.circlepath",
-                                                                         imageAnimation: .rotate),
+            banner?.update(payload: LucidBannerPayload.Update(systemImage: "gearshape.arrow.triangle.2.circlepath",
+                                                              imageAnimation: .rotate),
                                       for: self.token)
             let task = Task { () -> (account: String, file: NKFile?, error: NKError) in
                 let results = await NCNetworking.shared.uploadChunkFile(metadata: metadata) { total, counter in
                     Task {@MainActor in
-                        LucidBanner.shared.update(payload: LucidBannerPayload.Update(progress: Double(counter) / Double(total)), for: self.token)
+                        self.banner?.update(payload: LucidBannerPayload.Update(progress: Double(counter) / Double(total)), for: self.token)
                     }
                 } uploadStart: { _ in
                     Task {@MainActor in
                         let payload = LucidBannerPayload.Update(
                             systemImage: "arrowshape.up.circle",
                             imageAnimation: .breathe
                         )
-                        LucidBanner.shared.update(payload: payload, for: self.token)
+                        self.banner?.update(payload: payload, for: self.token)
                     }
                 } uploadProgressHandler: { _, _, progress in
                     Task {@MainActor in
-                        LucidBanner.shared.update(payload: LucidBannerPayload.Update(progress: progress), for: self.token)
+                        self.banner?.update(payload: LucidBannerPayload.Update(progress: progress), for: self.token)
                     }
                 } assembling: {
                     Task {@MainActor in
                         let payload = LucidBannerPayload.Update(
                             systemImage: "gearshape.arrow.triangle.2.circlepath",
                             imageAnimation: .rotate
                         )
-                        LucidBanner.shared.update(payload: payload, for: self.token)
+                        self.banner?.update(payload: payload, for: self.token)
                     }
                 }
 
@@ -494,8 +504,8 @@ extension NCShareExtension {
                                                                dateModificationFile: metadata.date as Date) { _ in
             } progressHandler: { _, _, fractionCompleted in
                 Task {@MainActor in
-                    LucidBanner.shared.update(payload: LucidBannerPayload.Update(progress: fractionCompleted),
-                                              for: self.token)
+                    self.banner?.update(payload: LucidBannerPayload.Update(progress: fractionCompleted),
+                                        for: self.token)
                 }
             }
             error = results.error

Share/NCShareExtension.swift

@@ -193,8 +193,8 @@ class NCAccount: NSObject {
         guard let tblAccount = await NCManageDatabase.shared.getTableAccountAsync(predicate: NSPredicate(format: "account == %@", account)) else {
             return
         }
-
-        await showErrorBanner(controller: controller, text: String(format: NSLocalizedString("_account_unauthorized_", comment: ""), account), errorCode: NCGlobal.shared.errorUnauthorized401)
+        let windowScene = SceneManager.shared.getWindowScene(controller: controller)
+        await showErrorBanner(windowScene: windowScene, text: String(format: NSLocalizedString("_account_unauthorized_", comment: ""), account), errorCode: NCGlobal.shared.errorUnauthorized401)
 
         let resultsWipe = await NextcloudKit.shared.getRemoteWipeStatusAsync(serverUrl: tblAccount.urlBase, token: token, account: account) { task in
             Task {

iOSClient/Account/NCAccount.swift

@@ -44,6 +44,11 @@ class NCActivity: UIViewController, NCSharePagingContent {
         }
     }
 
+    @MainActor
+    internal var windowScene: UIWindowScene? {
+       SceneManager.shared.getWindowScene(controller: self.tabBarController as? NCMainTabBarController)
+    }
+
     // MARK: - View Life Cycle
 
     override func viewDidLoad() {
@@ -83,7 +88,9 @@ class NCActivity: UIViewController, NCSharePagingContent {
                     self.loadComments()
                 } else {
                     Task {
-                        await showErrorBanner(controller: self.tabBarController, text: error.errorDescription, errorCode: error.errorCode)
+                        await showErrorBanner(windowScene: self.windowScene,
+                                              text: error.errorDescription,
+                                              errorCode: error.errorCode)
                     }
                 }
             }
@@ -424,7 +431,9 @@ extension NCActivity {
                 self.database.addComments(comments, account: metadata.account, objectId: metadata.fileId)
             } else if error.errorCode != NCGlobal.shared.errorResourceNotFound {
                 Task {
-                    await showErrorBanner(controller: self.tabBarController, text: error.errorDescription, errorCode: error.errorCode)
+                    await showErrorBanner(windowScene: self.windowScene,
+                                          text: error.errorDescription,
+                                          errorCode: error.errorCode)
                 }
             }
 

iOSClient/Activity/NCActivity.swift

@@ -82,7 +82,9 @@ extension NCActivityTableViewCell: UICollectionViewDelegate {
                         (responder as? UIViewController)!.navigationController?.pushViewController(viewController, animated: true)
                     } else {
                         Task {
-                            await showErrorBanner(controller: viewController.controller, text: "_trash_file_not_found_", errorCode: 0)
+                            await showErrorBanner(windowScene: viewController.windowScene,
+                                                  text: "_trash_file_not_found_",
+                                                  errorCode: NCGlobal.shared.errorInternalError)
                         }
                     }
                 }

iOSClient/Activity/NCActivityTableViewCell.swift

@@ -4,7 +4,9 @@
 
 import NextcloudKit
 
-@Observable class NCAssistantChatModel {
+@MainActor
+@Observable
+class NCAssistantChatModel {
     var messages: [AssistantChatMessage] = []
     var isSending: Bool = false
     var isThinking: Bool = false
@@ -22,6 +24,9 @@ import NextcloudKit
 
     @ObservationIgnored var controller: NCMainTabBarController?
     @ObservationIgnored private var chatMessageTaskId: Int?
+    @ObservationIgnored var windowScene: UIWindowScene? {
+        SceneManager.shared.getWindowScene(controller: controller)
+    }
 
     init(controller: NCMainTabBarController?, messages: [AssistantChatMessage] = []) {
         self.controller = controller
@@ -96,7 +101,7 @@ import NextcloudKit
         if result.error == .success {
             messages = result.chatMessages ?? []
         } else {
-            await showErrorBanner(controller: controller, title: "_error_", text: "_assistant_error_load_messages_", errorCode: result.error.errorCode)
+            await showErrorBanner(windowScene: windowScene, title: "_error_", text: "_assistant_error_load_messages_", errorCode: result.error.errorCode)
         }
     }
 
@@ -107,7 +112,7 @@ import NextcloudKit
 
         if result.error != .success {
             stopPolling()
-            await showErrorBanner(controller: controller, title: "_error_", text: "_assistant_error_generate_response_", errorCode: result.error.errorCode)
+            await showErrorBanner(windowScene: windowScene, title: "_error_", text: "_assistant_error_generate_response_", errorCode: result.error.errorCode)
             return
         }
 
@@ -134,7 +139,7 @@ import NextcloudKit
                 await generateChatSession()
                 startPollingForResponse()
             } else {
-                await showErrorBanner(controller: controller, title: "_error_", text: "_assistant_error_send_message_", errorCode: 20)
+                await showErrorBanner(windowScene: windowScene, title: "_error_", text: "_assistant_error_send_message_", errorCode: NCGlobal.shared.errorInternalError)
             }
 
             isSending = false

iOSClient/Assistant/Chat/NCAssistantChatModel.swift

@@ -89,7 +89,15 @@ extension NCManageDatabase {
         })
     }
 
-    func getLayoutForView(account: String, key: String, serverUrl: String, layout: String? = nil) -> NCDBLayoutForView {
+    func getLayoutForView(account: String, key: String, serverUrl: String, layoutType: String = NCGlobal.shared.layoutList) -> NCDBLayoutForView {
+        var layoutForView = NCDBLayoutForView()
+        defer {
+            /* FORCED LAYOUT RECENT */
+            if key == NCGlobal.shared.layoutViewRecent {
+                layoutForView.sort = "date"
+                layoutForView.ascending = false
+            }
+        }
         let keyStore = serverUrl.isEmpty ? key : serverUrl
         let index = account + " " + keyStore
 
@@ -99,7 +107,8 @@ extension NCManageDatabase {
                 .first
                 .map { NCDBLayoutForView(value: $0) }
         }) {
-            return layout
+            layoutForView = layout
+            return layoutForView
         }
 
         let tblAccount = core.performRealmRead { realm in
@@ -134,7 +143,8 @@ extension NCManageDatabase {
                     self.setLayoutForView(layoutForView: photosLayoutForView)
                 }
 
-                return photosLayoutForView
+                layoutForView = photosLayoutForView
+                return layoutForView
 
             } else if !serverUrl.isEmpty,
                       let serverDirectoryUp = NCUtilityFileSystem().serverDirectoryUp(serverUrl: serverUrl, home: home) {
@@ -154,24 +164,22 @@ extension NCManageDatabase {
                         self.setLayoutForView(layoutForView: previusLayoutForView)
                     }
 
-                    return previusLayoutForView
+                    layoutForView = previusLayoutForView
+                    return layoutForView
                 }
             }
         }
 
-        // Standatd layout
-        let layout = layout ?? NCGlobal.shared.layoutList
         DispatchQueue.global(qos: .utility).async {
-            self.setLayoutForView(account: account, key: key, serverUrl: serverUrl, layout: layout)
+            self.setLayoutForView(account: account, key: key, serverUrl: serverUrl, layout: layoutType)
         }
 
-        let placeholder = NCDBLayoutForView()
-        placeholder.index = index
-        placeholder.account = account
-        placeholder.keyStore = keyStore
-        placeholder.layout = layout
+        layoutForView.index = index
+        layoutForView.account = account
+        layoutForView.keyStore = keyStore
+        layoutForView.layout = layoutType
 
-        return placeholder
+        return layoutForView
     }
 
     func updatePhotoLayoutForView(account: String,

iOSClient/Data/NCManageDatabase+LayoutForView.swift

@@ -914,6 +914,21 @@ extension NCManageDatabase {
         }
     }
 
+    func getMetadatasAsync(predicate: NSPredicate,
+                           limit: Int? = nil) async -> [tableMetadata]? {
+        return await core.performRealmReadAsync { realm in
+            let results = realm.objects(tableMetadata.self)
+                .filter(predicate)
+
+            if let limit {
+                let sliced = results.prefix(limit)
+                return sliced.map { $0.detachedCopy() }
+            } else {
+                return results.map { $0.detachedCopy() }
+            }
+        }
+    }
+
     func getMetadatas(predicate: NSPredicate,
                       numItems: Int,
                       sorted: String,

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -140,9 +140,11 @@ class NCDeepLinkHandler {
         controller.selectedIndex = ControllerConstants.moreIndex
         guard let navigationController = controller.viewControllers?[controller.selectedIndex] as? UINavigationController else { return }
 
-        let settingsView = NCSettingsView(model: NCSettingsModel(controller: controller))
-        let settingsController = UIHostingController(rootView: settingsView)
-        navigationController.pushViewController(settingsController, animated: true)
+        Task { @MainActor in
+            let settingsView = NCSettingsView(model: NCSettingsModel(controller: controller))
+            let settingsController = UIHostingController(rootView: settingsView)
+            navigationController.pushViewController(settingsController, animated: true)
+        }
     }
 
     private func navigateToAutoUpload(controller: NCMainTabBarController) {

iOSClient/DeepLink/NCDeepLinkHandler.swift

@@ -1,30 +1,11 @@
-//
-//  UIViewController+Extension.swift
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 02/08/2022.
-//  Copyright © 2022 Marino Faggiana. All rights reserved.
-//
-//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2022-2026 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 import Foundation
 import UIKit
 import MessageUI
-import NextcloudKit
+import LucidBanner
 
 extension UIViewController {
     // https://stackoverflow.com/questions/6131205/how-to-find-topmost-view-controller-on-ios