marinofaggiana há 4 anos atrás
pai
commit
3bfaed1d8e
3 ficheiros alterados com 16 adições e 12 exclusões
  1. 1 1
      Cartfile.resolved
  2. 5 1
      iOSClient/Share/NCShare.swift
  3. 10 10
      iOSClient/Share/NCShareCommon.swift

+ 1 - 1
Cartfile.resolved

@@ -19,7 +19,7 @@ github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.7"
 github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "ae0bd9a052772662fb937c7407ad9a68af7d4e37"
+github "nextcloud/ios-communication-library" "f5afbf6f200e96773e8b4315fb4b262c3aca47b8"
 github "realm/realm-cocoa" "v5.1.0"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.5"

+ 5 - 1
iOSClient/Share/NCShare.swift

@@ -260,7 +260,11 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         appearance.setupMaskedCorners([.layerMaxXMaxYCorner, .layerMinXMaxYCorner])
         
         for sharee in sharees {
-            dropDown.dataSource.append(sharee.label)
+            var label = sharee.label
+            if sharee.shareType == NCShareCommon.sharedInstance.SHARE_TYPE_CIRCLE {
+                label = label + " (" + sharee.circleInfo + ", " +  sharee.circleOwner + ")"
+            }
+            dropDown.dataSource.append(label)
         }
         
         dropDown.anchorView = searchField

+ 10 - 10
iOSClient/Share/NCShareCommon.swift

@@ -30,16 +30,16 @@ class NCShareCommon: NSObject {
         return instance
     }()
     
-    private let SHARE_TYPE_USER = 0
-    private let SHARE_TYPE_GROUP = 1
-    private let SHARE_TYPE_LINK = 3
-    private let SHARE_TYPE_EMAIL = 4
-    private let SHARE_TYPE_CONTACT = 5
-    private let SHARE_TYPE_REMOTE = 6
-    private let SHARE_TYPE_CIRCLE = 7
-    private let SHARE_TYPE_GUEST = 8
-    private let SHARE_TYPE_REMOTE_GROUP = 9
-    private let SHARE_TYPE_ROOM = 10
+    let SHARE_TYPE_USER = 0
+    let SHARE_TYPE_GROUP = 1
+    let SHARE_TYPE_LINK = 3
+    let SHARE_TYPE_EMAIL = 4
+    let SHARE_TYPE_CONTACT = 5
+    let SHARE_TYPE_REMOTE = 6
+    let SHARE_TYPE_CIRCLE = 7
+    let SHARE_TYPE_GUEST = 8
+    let SHARE_TYPE_REMOTE_GROUP = 9
+    let SHARE_TYPE_ROOM = 10
     
     func createLinkAvatar() -> UIImage? {