coding

iOSClient/CCGlobal.h

@@ -85,7 +85,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         121
+#define k_databaseSchemaVersion                         132
 
 // Intro selector
 #define k_intro_login                                   0

iOSClient/Database/NCDatabase.swift

@@ -377,9 +377,11 @@ class tableShare: Object {
     @objc dynamic var mailSend: Bool = false
     @objc dynamic var mimeType = ""
     @objc dynamic var note = ""
-    @objc dynamic var parent: Int = 0
+    @objc dynamic var parent: String = ""
+    @objc dynamic var password: String = ""
     @objc dynamic var path = ""
     @objc dynamic var permissions: Int = 0
+    @objc dynamic var sendPasswordByTalk: Bool = false
     @objc dynamic var serverUrl = ""
     @objc dynamic var shareType: Int = 0
     @objc dynamic var shareWith = ""
@@ -389,6 +391,11 @@ class tableShare: Object {
     @objc dynamic var token = ""
     @objc dynamic var uidFileOwner = ""
     @objc dynamic var uidOwner = ""
+    @objc dynamic var url = ""
+
+    override static func primaryKey() -> String {
+        return "idShare"
+    }
 }
 
 class tableTag: Object {

iOSClient/Database/NCManageDatabase.swift

@@ -99,7 +99,7 @@ class NCManageDatabase: NSObject {
                         migration.deleteData(forType: tableTrash.className())
                     }
                     
-                    if oldSchemaVersion < 128 {
+                    if oldSchemaVersion < 120 {
                         migration.deleteData(forType: tableE2eEncryptionLock.className())
                         migration.deleteData(forType: tableCapabilities.className())
                         migration.deleteData(forType: tableComments.className())
@@ -107,7 +107,7 @@ class NCManageDatabase: NSObject {
                         migration.deleteData(forType: tableDirectory.className())
                     }
                     
-                    if oldSchemaVersion < 129 {
+                    if oldSchemaVersion < 132 {
                         migration.deleteData(forType: tableShare.className())
                     }
                     
@@ -2532,8 +2532,10 @@ class NCManageDatabase: NSObject {
             addObject.mimeType = share.mimeType
             addObject.note = share.note
             addObject.parent = share.parent
+            addObject.password = share.password
             addObject.path = share.path
             addObject.permissions = share.permissions
+            addObject.sendPasswordByTalk = share.sendPasswordByTalk
             addObject.shareType = share.shareType
             addObject.shareWith = share.shareWith
             addObject.shareWithDisplayname = share.shareWithDisplayname
@@ -2542,7 +2544,8 @@ class NCManageDatabase: NSObject {
             addObject.token = share.token
             addObject.uidOwner = share.uidOwner
             addObject.uidFileOwner = share.uidFileOwner
-            
+            addObject.url = share.url
+
             realm.add(addObject, update: .all)
         }
         
@@ -2571,7 +2574,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         realm.refresh()
         
-        let sortProperties = [SortDescriptor(keyPath: "shareType", ascending: false), SortDescriptor(keyPath: "idRemoteShared", ascending: false)]
+        let sortProperties = [SortDescriptor(keyPath: "shareType", ascending: false), SortDescriptor(keyPath: "idShare", ascending: false)]
         
         let firstShareLink = realm.objects(tableShare.self).filter("account == %@ AND serverUrl == %@ AND fileName == %@ AND shareType == 3", metadata.account, metadata.serverUrl, metadata.fileName).first
         if firstShareLink == nil {

iOSClient/Share/NCShare.swift

@@ -154,14 +154,14 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
             alertController.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .default) { (action:UIAlertAction) in })
             let okAction = UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default) { (action:UIAlertAction) in
                 let password = alertController.textFields?.first?.text
-                self.networking?.share(password: password ?? "", permission: 1, hideDownload: false)
+                self.networking?.shareLink(password: password ?? "")
             }
             okAction.isEnabled = false
             alertController.addAction(okAction)
             
             self.present(alertController, animated: true, completion:nil)
         } else if shares.firstShareLink == nil {
-            networking?.share(password: "", permission: 1, hideDownload: false)
+            networking?.shareLink(password: "")
         } else {
             tapMenu(with: shares.firstShareLink!, sender: sender)
         }

iOSClient/Share/NCShareLinkMenuView.swift

@@ -371,7 +371,7 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
     // Add another link
     @IBAction func buttonAddAnotherLink(sender: UIButton) {
         
-        networking?.share(password: "", permission: 1, hideDownload: false)
+        networking?.shareLink(password: "")
     }
     
     // MARK: - Delegate networking

iOSClient/Share/NCShareNetworking.swift

@@ -56,10 +56,10 @@ class NCShareNetworking: NSObject {
         }
     }
     
-    func share(password: String, permission: Int, hideDownload: Bool) {
+    func shareLink(password: String?) {
         NCUtility.sharedInstance.startActivityIndicator(view: view)
-        let fileName = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, activeUrl: activeUrl)!
-        NCCommunication.shared.createShare(path: fileName, shareType: 0, shareWith: "", password: password, permissions: permission) { (account, sharee, errorCode, errorDescription) in
+        let filenamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, activeUrl: activeUrl)!
+        NCCommunication.shared.createShareLink(path: filenamePath, password: password) { (account, sharee, errorCode, errorDescription) in
             
         }