NMC 1997 - Sharing customisation changes

Author: harshada-15-tsys

Nextcloud.xcodeproj/project.pbxproj

@@ -110,6 +110,7 @@
 		B5E2E6ED2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */; };
 		B5E2E6EE2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */; };
 		B5E2E6F02DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */; };
+		C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
 		D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
 		D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
 		F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
@@ -2135,6 +2136,7 @@
 				F34BDB3B2F574A58007A222C /* BidiSafeFilenameTests.swift */,
 				AA52EB452D42AC5A0089C348 /* Placeholder.swift */,
 				B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */,
+				AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */,
 			);
 			path = NextcloudUnitTests;
 			sourceTree = "<group>";

iOSClient/Activity/NCActivity.swift

@@ -34,6 +34,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
         }
     }
     var dateAutomaticFetch: Date?
+    private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
 
     @MainActor
     var session: NCSession.Session {
@@ -100,6 +101,8 @@ class NCActivity: UIViewController, NCSharePagingContent {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
+        appDelegate.activeViewController = self
+        navigationController?.setNavigationBarAppearance()
         fetchAll(isInitial: true)
     }
 
@@ -130,14 +133,10 @@ class NCActivity: UIViewController, NCSharePagingContent {
 
         let label = UILabel()
         label.font = UIFont.systemFont(ofSize: 15)
-        label.textColor = NCBrandColor.shared.textColor2
+        label.textColor = UIColor.systemGray
         label.textAlignment = .center
         label.text = NSLocalizedString("_no_activity_footer_", comment: "")
         view.addSubview(label)
-        label.translatesAutoresizingMaskIntoConstraints = false
-        label.topAnchor.constraint(equalTo: view.topAnchor, constant: 20).isActive = true
-        label.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
-        label.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
 
         return view
     }

iOSClient/Share/NCShare+Helper.swift

@@ -92,6 +92,7 @@ class NCTableShareOptions: NCTableShareable {
     convenience init(sharee: NKSharee, metadata: tableMetadata, password: String?) {
         self.init(shareType: sharee.shareType, metadata: metadata, password: password)
         self.shareWith = sharee.shareWith
+        self.shareWithDisplayname = sharee.label
     }
 
     static func shareLink(metadata: tableMetadata, password: String?) -> NCTableShareOptions {

iOSClient/Share/NCShare.swift

@@ -192,43 +192,10 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
     @objc func openShareProfile(_ sender: UITapGestureRecognizer) {
         self.showProfileMenu(userId: metadata.ownerId, session: session, sender: sender.view)
     }
-    
-    @objc func keyboardWillShow(notification: Notification) {
-        if UIDevice.current.userInterfaceIdiom == .phone {
-           if (UIScreen.main.bounds.width < 374 || UIDevice.current.orientation.isLandscape) {
-                if let keyboardSize = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue {
-                    if view.frame.origin.y == 0 {
-                        self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
-                        self.view.frame.origin.y -= keyboardSize.height
-                    }
-                }
-            } else if UIScreen.main.bounds.height < 850 {
-                if view.frame.origin.y == 0 {
-                    self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
-                    self.view.frame.origin.y -= 70
-                }
-            } else {
-                if view.frame.origin.y == 0 {
-                    self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
-                    self.view.frame.origin.y -= 40
-                }
-            }
-        }
-        
-        if UIDevice.current.userInterfaceIdiom == .pad, UIDevice.current.orientation.isLandscape {
-            if view.frame.origin.y == 0 {
-                self.tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
-                self.view.frame.origin.y -= 230
-            }
-        }
-        textField?.layer.borderColor = NCBrandColor.shared.brand.cgColor
-    }
-    
-    @objc func keyboardWillHide(notification: Notification) {
-        if view.frame.origin.y != 0 {
-            self.view.frame.origin.y = 0
-        }
-        textField?.layer.borderColor = NCBrandColor.shared.label.cgColor
+
+    @objc func openShareProfile() {
+        guard let metadata = metadata else { return }
+        self.showProfileMenu(userId: metadata.ownerId, session: session)
     }
 
     @objc func keyboardWillShow(notification: Notification) {
@@ -278,6 +245,9 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
     @objc func reloadData() {
         shares = self.database.getTableShares(metadata: metadata)
         shareLinksCount = 0
+//        if let metadata = metadata {
+//            shares = self.database.getTableShares(metadata: metadata)
+//        }
         tableView.reloadData()
     }
 
@@ -290,14 +260,29 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
     }
 
     @IBAction func searchFieldDidChange(textField: UITextField) {
+        NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(searchSharees), object: nil)
         guard let searchString = textField.text else {return}
         if searchString.count == 0 {
             dropDown.hide()
         } else {
-            networking?.getSharees(searchString: searchString)
+//            networking?.getSharees(searchString: searchString)
+            perform(#selector(searchSharees), with: nil, afterDelay: 0.5)
         }
     }
 
+    @objc private func searchSharees() {
+        // https://stackoverflow.com/questions/25471114/how-to-validate-an-e-mail-address-in-swift
+        func isValidEmail(_ email: String) -> Bool {
+
+            let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
+            let emailPred = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
+            return emailPred.evaluate(with: email)
+        }
+        guard let searchString = textField?.text, !searchString.isEmpty else { return }
+        if searchString.contains("@"), !isValidEmail(searchString) { return }
+        networking?.getSharees(searchString: searchString)
+    }
+    
     @IBAction func createLinkClicked(_ sender: Any) {
         appDelegate?.adjust.trackEvent(TriggerEvent(CreateLink.rawValue))
         TealiumHelper.shared.trackEvent(title: "magentacloud-app.sharing.create", data: ["": ""])
@@ -307,7 +292,7 @@ class NCShare: UIViewController, NCShareNetworkingDelegate, NCSharePagingContent
     @IBAction func touchUpInsideButtonMenu(_ sender: Any) {
 
         guard let metadata = metadata else { return }
-        let isFilesSharingPublicPasswordEnforced = NCGlobal.shared.capabilityFileSharingPubPasswdEnforced
+        let isFilesSharingPublicPasswordEnforced = NCCapabilities.Capabilities().capabilityFileSharingPubPasswdEnforced
         let shares = NCManageDatabase.shared.getTableShares(metadata: metadata)
 
         if isFilesSharingPublicPasswordEnforced && shares.firstShareLink == nil {
@@ -650,24 +635,43 @@ extension NCShare: UITableViewDataSource {
                 cell.indexPath = indexPath
                 cell.tableShare = tableShare
                 cell.delegate = self
-                cell.setupCellUI(titleAppendString: String(shareLinksCount))
-                cell.menuButton.menu = NCContextMenuShare(share: tableShare, isDirectory: metadata.isDirectory, canReshare: canReshare, shareController: self, controller: controller).viewMenu()
-                cell.menuButton.showsMenuAsPrimaryAction = true
-                if tableShare.shareType == NKShare.ShareType.publicLink.rawValue { shareLinksCount += 1 }
-                return cell
-            }
-        } else {
-        // USER / GROUP etc.
-            if let cell = tableView.dequeueReusableCell(withIdentifier: "cellUser", for: indexPath) as? NCShareUserCell {
-                cell.index = indexPath
-                cell.tableShare = tableShare
-                cell.isDirectory = metadata.directory
-                cell.delegate = self
-                cell.setupCellUI(userId: session.userId, session: session, metadata: metadata)
-
-                cell.buttonMenu.menu = NCContextMenuShare(share: tableShare, isDirectory: metadata.isDirectory, canReshare: canReshare, shareController: self, controller: controller).viewMenu()
-                cell.buttonMenu.showsMenuAsPrimaryAction = true
-
+//<<<<<<< HEAD
+//                cell.setupCellUI(titleAppendString: String(shareLinksCount))
+//                cell.menuButton.menu = NCContextMenuShare(share: tableShare, isDirectory: metadata.isDirectory, canReshare: canReshare, shareController: self, controller: controller).viewMenu()
+//                cell.menuButton.showsMenuAsPrimaryAction = true
+//                if tableShare.shareType == NKShare.ShareType.publicLink.rawValue { shareLinksCount += 1 }
+//                return cell
+//            }
+//        } else {
+//        // USER / GROUP etc.
+//            if let cell = tableView.dequeueReusableCell(withIdentifier: "cellUser", for: indexPath) as? NCShareUserCell {
+//                cell.index = indexPath
+//                cell.tableShare = tableShare
+//                cell.isDirectory = metadata.directory
+//                cell.delegate = self
+//                cell.setupCellUI(userId: session.userId, session: session, metadata: metadata)
+//
+//                cell.buttonMenu.menu = NCContextMenuShare(share: tableShare, isDirectory: metadata.isDirectory, canReshare: canReshare, shareController: self, controller: controller).viewMenu()
+//                cell.buttonMenu.showsMenuAsPrimaryAction = true
+
+                cell.setupCellUI()
+                if !tableShare.label.isEmpty {
+                    cell.labelTitle.text = String(format: NSLocalizedString("_share_linklabel_", comment: ""), tableShare.label)
+                } else {
+                    cell.labelTitle.text = directory ? NSLocalizedString("_share_link_folder_", comment: "") : NSLocalizedString("_share_link_file_", comment: "")
+                }
+//                cell.setupCellUI(userId: session.userId)
+                let isEditingAllowed = shareCommon.isEditingEnabled(isDirectory: directory, fileExtension: metadata?.fileExtension ?? "", shareType: tableShare.shareType)
+                if isEditingAllowed || directory || checkIsCollaboraFile() {
+                    cell.btnQuickStatus.isEnabled = true
+                    cell.labelQuickStatus.textColor = NCBrandColor.shared.brand
+                    cell.imageDownArrow.image = UIImage(named: "downArrow")?.imageColor(NCBrandColor.shared.brand)
+                } else {
+                    cell.btnQuickStatus.isEnabled = false
+                    cell.labelQuickStatus.textColor = NCBrandColor.shared.optionItem
+                    cell.imageDownArrow.image = UIImage(named: "downArrow")?.imageColor(NCBrandColor.shared.optionItem)
+                }
+                
                 return cell
             } else {
                 // USER / GROUP etc.
@@ -705,18 +709,23 @@ extension NCShare: UITableViewDataSource {
         headerView.updateCanReshareUI()
 
 
-        if FileManager.default.fileExists(atPath: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata?.ocId ?? "", etag: metadata?.etag ?? "")) {
-            headerView.fullWidthImageView.image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata?.ocId ?? "", etag: metadata?.etag ?? ""))
+        if let image = NCUtility().getImage(ocId: metadata.ocId, etag: metadata.etag, ext: NCGlobal.shared.previewExt1024) {
+            headerView.fullWidthImageView.image = image
+//            headerView.fullWidthImageView.image = UIImage(contentsOfFile: utilityFileSystem.getDirectoryProviderStorageIconOcId(metadata?.ocId ?? "", etag: metadata?.etag ?? ""))
             headerView.fullWidthImageView.contentMode = .scaleAspectFill
             headerView.imageView.isHidden = true
         } else {
             if metadata?.directory ?? false {
-                let image = (metadata?.e2eEncrypted ?? false) ? UIImage(named: "folderEncrypted") : UIImage(named: "folder_nmcloud")
+                let image = (metadata?.e2eEncrypted ?? false) ? NCImageCache.shared.getFolderEncrypted() : NCImageCache.shared.getFolder()
                 headerView.imageView.image = image
             } else if !(metadata?.iconName.isEmpty ?? false) {
-                headerView.imageView.image = metadata!.fileExtension == "odg" ? UIImage(named: "file-diagram") : UIImage.init(named: metadata!.iconName)
+                if let image = UIImage.init(named: metadata!.iconName) {
+                    headerView.imageView.image = metadata!.fileExtension == "odg" ? UIImage(named: "diagram") : image
+                } else {
+                    headerView.imageView.image = metadata!.fileExtension == "odg" ? UIImage(named: "diagram") : NCUtility().loadImage(named: metadata.iconName, useTypeIconFile: true, account: metadata.account)
+                }
             } else {
-                headerView.imageView.image = UIImage(named: "file")
+                headerView.imageView.image = NCImageCache.shared.getImageFile()
             }
         }
 
@@ -732,10 +741,10 @@ extension NCShare: UITableViewDataSource {
 
     }
     func tableView(_ tableView: UITableView, estimatedHeightForHeaderInSection section: Int) -> CGFloat {
-        return metadata?.ownerId != appDelegate?.userId ? canReshare ? 400 : 350 : 320
+        return metadata?.ownerId != session?.userId ? canReshare ? 400 : 350 : 320
     }
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return metadata?.ownerId != appDelegate?.userId ? canReshare ? UITableView.automaticDimension : 350 : 320
+        return metadata?.ownerId != session?.userId ? canReshare ? UITableView.automaticDimension : 350 : 320
     }
 }
 

iOSClient/Share/NCShareCommon.swift

@@ -112,7 +112,7 @@ enum NCShareCommon {
     }
 
     func isCurrentUserIsFileOwner(fileOwnerId: String) -> Bool {
-        if let currentUser = NCManageDatabase.shared.getActiveAccount(), currentUser.userId == fileOwnerId {
+        if let currentUser = NCManageDatabase.shared.getActiveTableAccount(), currentUser.userId == fileOwnerId {
             return true
         }
         return false

iOSClient/Share/NCShareHeader.swift

@@ -54,11 +54,11 @@ class NCShareAdvancePermissionHeader: UIView {
             imageView.isHidden = true
         } else {
             if metadata.directory {
-                imageView.image = UIImage.init(named: "folder")
+                imageView.image = metadata.e2eEncrypted ? NCImageCache.shared.getFolderEncrypted() : NCImageCache.shared.getFolder()
             } else if !metadata.iconName.isEmpty {
-                imageView.image = UIImage.init(named: metadata.iconName)
+                imageView.image = NCUtility().loadImage(named: metadata.iconName, useTypeIconFile: true, account: metadata.account)
             } else {
-                imageView.image = UIImage.init(named: "file")
+                imageView.image = NCImageCache.shared.getImageFile()
             }
         }
 

iOSClient/Share/NCShareLinkCell.swift

@@ -134,7 +134,7 @@ class NCShareLinkCell: UITableViewCell {
         buttonMenu.contentMode = .scaleAspectFill
         imageItem.image = UIImage(named: "sharebylink")?.image(color: NCBrandColor.shared.label, size: 30)
         buttonCopy.setImage(UIImage.init(named: "shareCopy")!.image(color: NCBrandColor.shared.customer, size: 24), for: .normal)
-        buttonMenu.setImage(NCImageCache.images.buttonMore.image(color: NCBrandColor.shared.customer, size: 24), for: .normal)
+        buttonMenu.setImage(UIImage.init(named: "shareMenu")!.image(color: NCBrandColor.shared.customer, size: 24), for: .normal)
         labelQuickStatus.textColor = NCBrandColor.shared.customer
     }