Browse Source

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 years ago
parent
commit
97bfac692a

+ 2 - 0
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1593,6 +1593,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
             // URL
             if metadata.classFile == NCCommunicationCommon.typeClassFile.url.rawValue {
+                cell.imageLocal.image = nil
                 cell.hideButtonShare(true)
                 cell.hideButtonMore(true)
                 if let ownerId = NCUtility.shared.getAvatarFromIconUrl(metadata: metadata) {
@@ -1736,6 +1737,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
             // URL
             if metadata.classFile == NCCommunicationCommon.typeClassFile.url.rawValue {
+                cell.imageLocal.image = nil
                 cell.hideButtonMore(true)
                 if let ownerId = NCUtility.shared.getAvatarFromIconUrl(metadata: metadata) {
                     cell.fileUser = ownerId

+ 1 - 1
iOSClient/Menu/UIViewController+Menu.swift

@@ -27,7 +27,7 @@ import NCCommunication
 import UIKit
 
 extension UIViewController {
-    fileprivate func handleProfileAction(_ action: NCHovercard.Action, for userId: String) {
+    fileprivate func handleProfileAction(_ action: NCCHovercard.Action, for userId: String) {
         switch action.appId {
         case "email":
             guard

+ 7 - 8
iOSClient/Networking/NCNetworking.swift

@@ -936,16 +936,13 @@ import Queuer
         }
 
         NCCommunication.shared.unifiedSearch(term: literal) { provider in
-            ["calendar", "circles", "collectives-page-content", "collectives", "collectives-pages", "comments", "contacts", "deck", "deck-comment", "discourse-search-post", "discourse-search-topic", "files", "fulltextsearch", "github-search-issues", "github-search-repos", "mail", "notes", "settings", "settings_apps", "talk-conversations", "talk-message", "talk-message-current", "tasks", "zammad-search"].contains(provider.id)
+            // example filter
+            // ["calendar", "files", "fulltextsearch"].contains(provider.id)
+            return true
         } update: { partialResult, provider, errorCode, errorDescription in
             guard let partialResult = partialResult else { return }
             
             switch provider.id {
-            case "calendar", "circles", "collectives-page-content", "collectives", "collectives-pages", "comments", "contacts", "deck", "deck-comment", "discourse-search-post", "discourse-search-topic", "github-search-issues", "github-search-repos", "mail", "notes", "settings", "settings_apps", "talk-conversations", "talk-message", "talk-message-current", "tasks", "zammad-search":
-                partialResult.entries.forEach({ entry in
-                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: urlBase.urlBase, urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name.lowercased(), subline: entry.subline, iconName: entry.icon, iconUrl: entry.thumbnailURL)
-                    searchFiles.insert(metadata)
-                })
             case "files":
                 partialResult.entries.forEach({ entry in
                     if let fileId = entry.fileId,
@@ -977,8 +974,10 @@ import Queuer
                     }
                 })
             default:
-                print("unknown provider results " + provider.id)
-                return
+                partialResult.entries.forEach({ entry in
+                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: urlBase.urlBase, urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name.lowercased(), subline: entry.subline, iconName: entry.icon, iconUrl: entry.thumbnailURL)
+                    searchFiles.insert(metadata)
+                })
             }
             update(searchFiles)
         } completion: { results, errorCode, errorDescription in