NMC 2172 - Dashboard theming customisation updated changes with 10.3.0 version

Author: harshada-15-tsys

iOSClient/Files/NCFiles.swift

@@ -8,15 +8,14 @@ import RealmSwift
 import SwiftUI
 
 class NCFiles: NCCollectionViewCommon {
+
     internal var fileNameBlink: String?
     internal var fileNameOpen: String?
 
     internal var lastOffsetY: CGFloat = 0
     internal var lastScrollTime: TimeInterval = 0
     internal var accumulatedScrollDown: CGFloat = 0
 
-    internal var syncMetadatasTask: Task<Void, Never>?
-
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
 
@@ -101,16 +100,19 @@ class NCFiles: NCCollectionViewCommon {
         super.viewWillAppear(animated)
 
         Task {
-            let capabilities = await database.getCapabilities(account: self.session.account) ?? NKCapabilities.Capabilities()
-            await mainNavigationController?.createPlusMenu(session: self.session, capabilities: capabilities)
-
             await self.reloadDataSource()
         }
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
+        // Re-evaluate in-app messages after viewDidAppear
+        MoEngageAnalytics.shared.displayInAppNotificationSafely(reason: "viewDidAppear")
+
+        // Preload hidden NCMedia so it's ready without being shown
+//        NCMediaPreloader.shared.preloadIfNeeded()
+
         if !self.dataSource.isEmpty() {
             self.blinkCell(fileName: self.fileNameBlink)
             self.openFile(fileName: self.fileNameOpen)
@@ -147,53 +149,10 @@ class NCFiles: NCCollectionViewCommon {
 
     // MARK: - DataSource
 
-    override func reloadDataSource() {
-        guard !isSearchingMode
-        else {
-            return super.reloadDataSource()
-        }
-
-        // Watchdog: this is only a fail safe "dead lock", I don't think the timeout will ever be called but at least nothing gets stuck, if after 5 sec. (which is a long time in this routine), the semaphore is still locked
-        //
-        if self.semaphoreReloadDataSource.wait(timeout: .now() + 5) == .timedOut {
-            self.semaphoreReloadDataSource.signal()
-        }
-
-        var predicate = self.defaultPredicate
-        let predicateDirectory = NSPredicate(format: "account == %@ AND serverUrl == %@", session.account, self.serverUrl)
-        let dataSourceMetadatas = self.dataSource.getMetadatas()
-
-        if NCKeychain().getPersonalFilesOnly(account: session.account) {
-            predicate = self.personalFilesOnlyPredicate
-        }
-
-        self.metadataFolder = database.getMetadataFolder(session: session, serverUrl: self.serverUrl)
-        self.richWorkspaceText = database.getTableDirectory(predicate: predicateDirectory)?.richWorkspace
-
-        let metadatas = self.database.getResultsMetadatasPredicate(predicate, layoutForView: layoutForView)
-        self.dataSource = NCCollectionViewDataSource(metadatas: metadatas, layoutForView: layoutForView)
-
-        if metadatas.isEmpty {
-            self.semaphoreReloadDataSource.signal()
-            return super.reloadDataSource()
-        }
-
-        self.dataSource.caching(metadatas: metadatas, dataSourceMetadatas: dataSourceMetadatas) {
-            self.semaphoreReloadDataSource.signal()
-            super.reloadDataSource()
-        }
-    }
-
-    override func getServerData(refresh: Bool = false) async {
-        await super.getServerData()
-
-        defer {
-            stopGUIGetServerData()
-            startSyncMetadata(metadatas: self.dataSource.getMetadatas())
-        }
-
-        Task {
-            await networking.networkingTasks.cancel(identifier: "\(self.serverUrl)_NCFiles")
+    override func reloadDataSource() async {
+        guard !isSearchingMode else {
+            await super.reloadDataSource()
+            return
         }
 
         self.metadataFolder = await self.database.getMetadataFolderAsync(session: self.session, serverUrl: self.serverUrl)
@@ -229,7 +188,7 @@ class NCFiles: NCCollectionViewCommon {
 
     override func getServerData(forced: Bool = false) async {
         defer {
-            restoreDefaultTitle()
+            stopGUIGetServerData()
             startSyncMetadata(metadatas: self.dataSource.getMetadatas())
         }
 
@@ -288,22 +247,30 @@ class NCFiles: NCCollectionViewCommon {
                 self.collectionView.reloadData()
             }
         }
-        guard resultsReadFile.error == .success, let metadata = resultsReadFile.metadata else {
-            return (nil, resultsReadFile.error, false)
+        guard resultsReadFile.error == .success,
+              let metadata = resultsReadFile.metadata else {
+            return(nil, resultsReadFile.error, reloadRequired)
         }
+        let e2eEncrypted = metadata.e2eEncrypted
+        let ocId = metadata.ocId
 
         await self.database.updateDirectoryRichWorkspaceAsync(metadata.richWorkspace, account: resultsReadFile.account, serverUrl: serverUrl)
         let tableDirectory = await self.database.getTableDirectoryAsync(ocId: metadata.ocId)
 
+        // Verify LivePhoto
+        //
+        reloadRequired = await networking.setLivePhoto(account: resultsReadFile.account)
+        await NCManageDatabase.shared.deleteLivePhotoError()
+
         let shouldSkipUpdate: Bool = (
-            !refresh &&
+            !forced &&
             tableDirectory?.etag == metadata.etag &&
             !metadata.e2eEncrypted &&
             !self.dataSource.isEmpty()
         )
 
         if shouldSkipUpdate {
-            return (nil, NKError(), false)
+            return (nil, NKError(), reloadRequired)
         }
 
         startGUIGetServerData()
@@ -312,30 +279,40 @@ class NCFiles: NCCollectionViewCommon {
         let (account, metadataFolder, metadatas, error) = await NCNetworking.shared.readFolderAsync(serverUrl: serverUrl,
                                                                                                     account: session.account,
                                                                                                     options: options) { task in
-            self.dataSourceTask = task
+            Task {
+                await NCNetworking.shared.networkingTasks.track(identifier: "\(self.serverUrl)_NCFiles", task: task)
+            }
             if self.dataSource.isEmpty() {
                 self.collectionView.reloadData()
             }
+        }
 
         guard error == .success else {
-            return (nil, error, false)
+            return(nil, error, reloadRequired)
         }
+        reloadRequired = true
 
         if let metadataFolder {
             self.metadataFolder = metadataFolder.detachedCopy()
             self.richWorkspaceText = metadataFolder.richWorkspace
         }
 
-        guard let metadataFolder,
-              isDirectoryE2EE,
-              NCKeychain().isEndToEndEnabled(account: account),
+        //
+        // E2EE section
+        //
+
+        guard e2eEncrypted,
+              let metadatas,
+              !metadatas.isEmpty,
+              NCPreferences().isEndToEndEnabled(account: account),
               await !NCNetworkingE2EE().isInUpload(account: account, serverUrl: serverUrl) else {
-            return (metadatas, error, true)
+            return(metadatas, error, reloadRequired)
         }
 
-        /// E2EE
         let lock = await self.database.getE2ETokenLockAsync(account: account, serverUrl: serverUrl)
-        let results = await NCNetworkingE2EE().getMetadata(fileId: metadataFolder.ocId, e2eToken: lock?.e2eToken, account: account)
+        if let e2eToken = lock?.e2eToken {
+            nkLog(tag: self.global.logTagE2EE, message: "Tocken: \(e2eToken)", minimumLogLevel: .verbose)
+        }
 
         let results = await NCNetworkingE2EE().getMetadata(fileId: ocId, e2eToken: lock?.e2eToken, account: account)
 
@@ -397,79 +374,6 @@ class NCFiles: NCCollectionViewCommon {
             }
         }
 
-        guard error == .success else {
-            return(nil, error, reloadRequired)
-        }
-        reloadRequired = true
-
-        if let metadataFolder {
-            self.metadataFolder = metadataFolder.detachedCopy()
-            self.richWorkspaceText = metadataFolder.richWorkspace
-        }
-
-        //
-        // E2EE section
-        //
-
-        guard e2eEncrypted,
-              let metadatas,
-              !metadatas.isEmpty,
-              NCPreferences().isEndToEndEnabled(account: account),
-              await !NCNetworkingE2EE().isInUpload(account: account, serverUrl: serverUrl) else {
-            return(metadatas, error, reloadRequired)
-        }
-
-        let lock = await self.database.getE2ETokenLockAsync(account: account, serverUrl: serverUrl)
-        if let e2eToken = lock?.e2eToken {
-            nkLog(tag: self.global.logTagE2EE, message: "Tocken: \(e2eToken)", minimumLogLevel: .verbose)
-        }
-
-        let results = await NCNetworkingE2EE().getMetadata(fileId: ocId, e2eToken: lock?.e2eToken, account: account)
-
-        nkLog(tag: self.global.logTagE2EE, message: "Get metadata with error: \(results.error.errorCode)")
-        nkLog(tag: self.global.logTagE2EE, message: "Get metadata with metadata: \(results.e2eMetadata ?? ""), signature: \(results.signature ?? ""), version \(results.version ?? "")", minimumLogLevel: .verbose)
-
-        guard results.error == .success,
-              let e2eMetadata = results.e2eMetadata,
-              let version = results.version else {
-
-            // No metadata fount, re-send it
-            if results.error.errorCode == NCGlobal.shared.errorResourceNotFound {
-                NCContentPresenter().showInfo(description: "Metadata not found")
-                let error = await NCNetworkingE2EE().uploadMetadata(serverUrl: serverUrl, account: account)
-                if error != .success {
-                    NCContentPresenter().showError(error: error)
-                }
-            } else {
-                // show error
-                NCContentPresenter().showError(error: results.error)
-            }
-
-            return(metadatas, error, reloadRequired)
-        }
-
-        let errorDecodeMetadata = await NCEndToEndMetadata().decodeMetadata(e2eMetadata, signature: results.signature, serverUrl: serverUrl, session: self.session)
-        nkLog(debug: "Decode e2ee metadata with error: \(errorDecodeMetadata.errorCode)")
-
-        if errorDecodeMetadata == .success {
-            let capabilities = await NKCapabilities.shared.getCapabilities(for: self.session.account)
-            if version == "v1", capabilities.e2EEApiVersion == NCGlobal.shared.e2eeVersionV20 {
-                NCContentPresenter().showInfo(description: "Conversion metadata v1 to v2 required, please wait...")
-                nkLog(tag: self.global.logTagE2EE, message: "Conversion v1 to v2")
-                NCActivityIndicator.shared.start()
-
-                let error = await NCNetworkingE2EE().uploadMetadata(serverUrl: serverUrl, updateVersionV1V2: true, account: account)
-                if error != .success {
-                    NCContentPresenter().showError(error: error)
-                }
-                NCActivityIndicator.shared.stop()
-            }
-        } else {
-            // Client Diagnostic
-            await self.database.addDiagnosticAsync(account: account, issue: NCGlobal.shared.diagnosticIssueE2eeErrors)
-            NCContentPresenter().showError(error: error)
-        }
-
         return (metadatas, error, reloadRequired)
     }
 
@@ -518,12 +422,6 @@ class NCFiles: NCCollectionViewCommon {
                 navigationController = UIStoryboard(name: "NCIntro", bundle: nil).instantiateInitialViewController() as? UINavigationController
             }
 
-            UIApplication.shared.firstWindow?.rootViewController = navigationController
-        } else if let account = tblAccount?.account, account != currentAccount {
-            Task {
-                await NCAccount().changeAccount(account, userProfile: nil, controller: controller)
-            }
-
             UIApplication.shared.mainAppWindow?.rootViewController = navigationController
         } else if let account = tblAccount?.account, account != currentAccount {
             Task {
@@ -539,3 +437,4 @@ class NCFiles: NCCollectionViewCommon {
         }
     }
 }
+

iOSClient/Main/Collection Common/Cell/NCGridCell.swift

@@ -163,6 +163,12 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellMainP
     }
 
     func selected(_ status: Bool, isEditMode: Bool, color: UIColor) {
+        // E2EE - remove encrypt folder selection
+        if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata?.ocId), metadata.e2eEncrypted {
+            imageSelect.isHidden = true
+        } else {
+            imageSelect.isHidden = isEditMode ? false : true
+        }
         if isEditMode {
             buttonMore.isHidden = true
             accessibilityCustomActions = nil
@@ -173,6 +179,14 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellMainP
         imageVisualEffect.alpha = status ? 1 : 0
         imageSelect.alpha = status ? 1 : 0
         imageSelect.image = NCImageCache.shared.getImageCheckedYes(color: color)
+//        if status {
+//            imageSelect.image = NCImageCache.shared.getImageCheckedYes()
+//            imageVisualEffect.isHidden = false
+//        } else {
+//            imageSelect.image = NCImageCache.shared.getImageCheckedNo()
+//            backgroundView = nil
+//            imageVisualEffect.isHidden = true
+//        }
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
@@ -189,6 +203,14 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellMainP
         accessibilityLabel = label
         accessibilityValue = value
     }
+
+    func setIconOutlines() {
+        if imageStatus.image != nil {
+            imageStatus.makeCircularBackground(withColor: .systemBackground)
+        } else {
+            imageStatus.backgroundColor = .clear
+        }
+    }
 }
 
 // MARK: - Grid Layout

iOSClient/Main/Collection Common/Cell/NCPhotoCell.swift

@@ -45,10 +45,45 @@ class NCPhotoCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellMain
         return nil
     }
 
+    @objc private func handleTapObserver(_ g: UITapGestureRecognizer) {
+        let location = g.location(in: contentView)
+
+        if buttonMore.frame.contains(location) {
+            delegate?.onMenuIntent(with: metadata)
+        }
+    }
+
+    func setButtonMore(image: UIImage) {
+        buttonMore.setImage(image, for: .normal)
+    }
+
+    func hideButtonMore(_ status: Bool) {
+       // buttonMore.isHidden = status NO MORE USED
+    }
+
+    func hideImageStatus(_ status: Bool) {
+        imageStatus.isHidden = status
+    }
+
     func selected(_ status: Bool, isEditMode: Bool, color: UIColor) {
         imageVisualEffect.alpha = status ? 1 : 0
         imageSelect.alpha = status ? 1 : 0
         imageSelect.image = NCImageCache.shared.getImageCheckedYes(color: color)
+        // E2EE - remove encrypt folder selection
+        if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata?.ocId), metadata.e2eEncrypted {
+            imageSelect.isHidden = true
+        } else {
+            imageSelect.isHidden = isEditMode ? false : true
+        }
+        if status {
+//            imageSelect.isHidden = false
+            imageVisualEffect.isHidden = false
+            imageSelect.image = NCImageCache.shared.getImageCheckedYes()
+        } else {
+//            imageSelect.isHidden = true
+            imageVisualEffect.isHidden = true
+            imageSelect.image = NCImageCache.shared.getImageCheckedNo()
+        }
     }
 
     func setAccessibility(label: String, value: String) {