new share view

iOSClient/Database/NCManageDatabase.swift

@@ -2328,54 +2328,65 @@ class NCManageDatabase: NSObject {
         return ["\(serverUrl)\(fileName)" : share]
     }
     
-    @objc func addShareV2(fileName: String, serverUrl: String, account: String, sharedDto: OCSharedDto) {
+    @objc func addShareV2(account: String, activeUrl: String, items: [OCSharedDto]) {
         
         let realm = try! Realm()
 
-        realm.beginWrite()
+        do {
+            try realm.write {
 
-        let addObject = tableShare()
-        
-        addObject.account = account
-        addObject.displayNameFileOwner = sharedDto.displayNameFileOwner
-        addObject.displayNameOwner = sharedDto.displayNameOwner
-        if sharedDto.expirationDate > 0 {
-            addObject.expirationDate =  Date(timeIntervalSince1970: TimeInterval(sharedDto.expirationDate)) as NSDate
-        }
-        addObject.fileParent = sharedDto.fileParent
-        addObject.fileTarget = sharedDto.fileTarget
-        addObject.hideDownload = sharedDto.hideDownload
-        addObject.idRemoteShared = sharedDto.idRemoteShared
-        addObject.isDirectory = sharedDto.isDirectory
-        addObject.itemSource = sharedDto.itemSource
-        addObject.label = sharedDto.label
-        addObject.mailSend = sharedDto.mailSend
-        addObject.mimeType = sharedDto.mimeType
-        addObject.note = sharedDto.note
-        addObject.path = sharedDto.path
-        addObject.permissions = sharedDto.permissions
-        addObject.parent = sharedDto.parent
-        addObject.sharedDate = Date(timeIntervalSince1970: TimeInterval(sharedDto.sharedDate)) as NSDate
-        addObject.shareType = sharedDto.shareType
-        addObject.shareWith = sharedDto.shareWith
-        addObject.shareWithDisplayName = sharedDto.shareWithDisplayName
-        addObject.storage = sharedDto.storage
-        addObject.storageID = sharedDto.storageID
-        addObject.token = sharedDto.token
-        addObject.url = sharedDto.url
-        addObject.uidOwner = sharedDto.uidOwner
-        addObject.uidFileOwner = sharedDto.uidFileOwner
-
-        addObject.fileName = fileName
-        addObject.serverUrl = serverUrl
-        
-        realm.add(addObject)
+                let results = realm.objects(tableShare.self).filter("account = %@", account)
+                realm.delete(results)
+                
+                for sharedDto in items {
+                    
+                    let addObject = tableShare()
+                    let fullPath = CCUtility.getHomeServerUrlActiveUrl(activeUrl) + "\(sharedDto.path!)"
+                    let fileName = NSString(string: fullPath).lastPathComponent
+                    var serverUrl = NSString(string: fullPath).substring(to: (fullPath.count - fileName.count - 1))
+                    if serverUrl.hasSuffix("/") {
+                        serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.count - 1))
+                    }
+                    
+                    addObject.account = account
+                    addObject.displayNameFileOwner = sharedDto.displayNameFileOwner
+                    addObject.displayNameOwner = sharedDto.displayNameOwner
+                    if sharedDto.expirationDate > 0 {
+                        addObject.expirationDate =  Date(timeIntervalSince1970: TimeInterval(sharedDto.expirationDate)) as NSDate
+                    }
+                    addObject.fileParent = sharedDto.fileParent
+                    addObject.fileTarget = sharedDto.fileTarget
+                    addObject.hideDownload = sharedDto.hideDownload
+                    addObject.idRemoteShared = sharedDto.idRemoteShared
+                    addObject.isDirectory = sharedDto.isDirectory
+                    addObject.itemSource = sharedDto.itemSource
+                    addObject.label = sharedDto.label
+                    addObject.mailSend = sharedDto.mailSend
+                    addObject.mimeType = sharedDto.mimeType
+                    addObject.note = sharedDto.note
+                    addObject.path = sharedDto.path
+                    addObject.permissions = sharedDto.permissions
+                    addObject.parent = sharedDto.parent
+                    addObject.sharedDate = Date(timeIntervalSince1970: TimeInterval(sharedDto.sharedDate)) as NSDate
+                    addObject.shareType = sharedDto.shareType
+                    addObject.shareWith = sharedDto.shareWith
+                    addObject.shareWithDisplayName = sharedDto.shareWithDisplayName
+                    addObject.storage = sharedDto.storage
+                    addObject.storageID = sharedDto.storageID
+                    addObject.token = sharedDto.token
+                    addObject.url = sharedDto.url
+                    addObject.uidOwner = sharedDto.uidOwner
+                    addObject.uidFileOwner = sharedDto.uidFileOwner
+                    
+                    addObject.fileName = fileName
+                    addObject.serverUrl = serverUrl
+                    
+                    realm.add(addObject)
+                }
         
-        do {
-            try realm.commitWrite()
+            }
         } catch let error {
             print("[LOG] Could not write to database: ", error)
-            return
         }
     }
 
@@ -2450,23 +2461,6 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func updateShareV2(_ items: [OCSharedDto], activeUrl: String, account: String) {
-        
-        self.removeShareActiveAccount(account: account)
-        
-        for itemOCSharedDto in items {
-            
-            let fullPath = CCUtility.getHomeServerUrlActiveUrl(activeUrl) + "\(itemOCSharedDto.path!)"
-            let fileName = NSString(string: fullPath).lastPathComponent
-            var serverUrl = NSString(string: fullPath).substring(to: (fullPath.count - fileName.count - 1))
-            if serverUrl.hasSuffix("/") {
-                serverUrl = NSString(string: serverUrl).substring(to: (serverUrl.count - 1))
-            }
-                
-            addShareV2(fileName: fileName, serverUrl: serverUrl, account: account, sharedDto: itemOCSharedDto)
-        }
-    }
-    
     @objc func updateShare(_ items: [String:OCSharedDto], activeUrl: String, account: String) -> [Any]? {
         
         var sharesLink = [String:String]()

iOSClient/Main/CCMain.m

@@ -1913,14 +1913,14 @@
         
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
             
+#ifdef DEBUG
+            [[NCManageDatabase sharedInstance] addShareV2WithAccount:account activeUrl:appDelegate.activeUrl items:items];
+#else
             [appDelegate.sharesID removeAllObjects];
             
             for (OCSharedDto *item in items)
                 [appDelegate.sharesID setObject:item forKey:[@(item.idRemoteShared) stringValue]];
             
-#ifdef DEBUG
-            [[NCManageDatabase sharedInstance] updateShareV2:items activeUrl:appDelegate.activeUrl account:account];
-#else
             NSArray *result = [[NCManageDatabase sharedInstance] updateShare:appDelegate.sharesID activeUrl:appDelegate.activeUrl account:appDelegate.activeAccount];
             if (result) {
                 appDelegate.sharesLink = result[0];

iOSClient/Share/NCShare.swift

@@ -512,7 +512,7 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate {
         OCNetworking.sharedManager()?.readShare(withAccount: metadata!.account, completion: { (account, items, message, errorCode) in
             if errorCode == 0 {
                 let itemsOCSharedDto = items as! [OCSharedDto]
-                NCManageDatabase.sharedInstance.updateShareV2(itemsOCSharedDto, activeUrl: self.appDelegate.activeUrl, account: account!)
+                NCManageDatabase.sharedInstance.addShareV2(account: account!, activeUrl: self.appDelegate.activeUrl, items: itemsOCSharedDto)
                 for item in itemsOCSharedDto {
                     if self.tableShare!.idRemoteShared == item.idRemoteShared {
                     }