marinofaggiana 4 years ago
parent
commit
0e1d046e1f

+ 15 - 0
iOSClient/Images.xcassets/shareTypeCircles.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "shareTypeCircles.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

BIN
iOSClient/Images.xcassets/shareTypeCircles.imageset/shareTypeCircles.pdf


+ 2 - 2
iOSClient/Share/NCShare.swift

@@ -321,7 +321,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
             case self.SHARE_TYPE_REMOTE:
                 cell.imageShareeType.image = UIImage(named: "shareTypeUser")
             case self.SHARE_TYPE_CIRCLE:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
+                cell.imageShareeType.image = UIImage(named: "shareTypeCircles")
             case self.SHARE_TYPE_GUEST:
                 cell.imageShareeType.image = UIImage(named: "shareTypeUser")
             case self.SHARE_TYPE_REMOTE_GROUP:
@@ -335,7 +335,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         
         dropDown.selectionAction = { [weak self] (index, item) in
             let sharee = sharees[index]
-            self!.networking?.createShare(name: sharee.label, shareType: sharee.shareType, metadata: self!.metadata!)
+            self!.networking?.createShare(shareWith: sharee.shareWith, shareType: sharee.shareType, metadata: self!.metadata!)
         }
         
         dropDown.show()

+ 2 - 2
iOSClient/Share/NCShareNetworking.swift

@@ -73,12 +73,12 @@ class NCShareNetworking: NSObject {
         }
     }
     
-    func createShare(name: String, shareType: Int, metadata: tableMetadata) {
+    func createShare(shareWith: String, shareType: Int, metadata: tableMetadata) {
         NCUtility.sharedInstance.startActivityIndicator(view: view)
         let filenamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, activeUrl: activeUrl)!
         var permission: Int = 1
         if metadata.directory { permission = Int(k_max_folder_share_permission) } else { permission = Int(k_max_file_share_permission) }
-        NCCommunication.shared.createShare(path: filenamePath, shareType: shareType, shareWith: name, permissions: permission) { (account, share, errorCode, errorDescription) in
+        NCCommunication.shared.createShare(path: filenamePath, shareType: shareType, shareWith: shareWith, permissions: permission) { (account, share, errorCode, errorDescription) in
             NCUtility.sharedInstance.stopActivityIndicator()
             if errorCode == 0 && share != nil {
                 NCManageDatabase.sharedInstance.addShare(account: self.metadata.account, activeUrl: self.activeUrl, shares: [share!])