coding

Nextcloud.xcodeproj/project.pbxproj

@@ -2213,7 +2213,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2264,7 +2264,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2307,7 +2307,7 @@
 				CODE_SIGN_ENTITLEMENTS = iOSClient/Brand/Share.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2351,7 +2351,7 @@
 				CODE_SIGN_ENTITLEMENTS = iOSClient/Brand/Share.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2401,7 +2401,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2451,7 +2451,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2493,7 +2493,7 @@
 				CODE_SIGN_ENTITLEMENTS = iOSClient/Brand/iOSClient.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2538,7 +2538,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 6JLRKY9ZV7;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (

iOSClient/Share/NCShare.swift

@@ -50,18 +50,6 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
     private var dropDown = DropDown()
     private var networking: NCShareNetworking?
     
-    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
-    
-
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -283,8 +271,8 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         dropDown.cellNib = UINib(nibName: "NCShareUserDropDownCell", bundle: nil)
         dropDown.customCellConfiguration = { (index: Index, item: String, cell: DropDownCell) -> Void in
             guard let cell = cell as? NCShareUserDropDownCell else { return }
-            cell.imageItem.image = UIImage(named: "avatar")
             let sharee = sharees[index]
+            cell.imageItem.image = NCShareCommon.sharedInstance.getImageShareType(shareType: sharee.shareType)
 
             let fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(self.appDelegate.activeUser, activeUrl: self.appDelegate.activeUrl) + "-" + sharee.label + ".png"
             if FileManager.default.fileExists(atPath: fileNameLocalPath) {
@@ -298,39 +286,12 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
                                     cell.imageItem.image = image
                                 }
                             }
-                        } else {
-                            DispatchQueue.main.async {
-                                cell.imageItem.image = UIImage(named: "avatar")
-                            }
-                        }
+                        } 
                     }
                 }
             }
 
-            switch sharee.shareType {
-            case self.SHARE_TYPE_USER:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
-            case self.SHARE_TYPE_GROUP:
-                cell.imageShareeType.image = UIImage(named: "shareTypeGroup")
-            case self.SHARE_TYPE_LINK:
-                cell.imageShareeType.image = UIImage(named: "shareTypeLink")
-            case self.SHARE_TYPE_EMAIL:
-                cell.imageShareeType.image = UIImage(named: "shareTypeEmail")
-            case self.SHARE_TYPE_CONTACT:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
-            case self.SHARE_TYPE_REMOTE:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
-            case self.SHARE_TYPE_CIRCLE:
-                cell.imageShareeType.image = UIImage(named: "shareTypeCircles")
-            case self.SHARE_TYPE_GUEST:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
-            case self.SHARE_TYPE_REMOTE_GROUP:
-                cell.imageShareeType.image = UIImage(named: "shareTypeGroup")
-            case self.SHARE_TYPE_ROOM:
-                cell.imageShareeType.image = UIImage(named: "shareTypeRoom")
-            default:
-                cell.imageShareeType.image = UIImage(named: "shareTypeUser")
-            }
+            cell.imageShareeType.image = NCShareCommon.sharedInstance.getImageShareType(shareType: sharee.shareType)
         }
         
         dropDown.selectionAction = { [weak self] (index, item) in
@@ -399,6 +360,7 @@ extension NCShare: UITableViewDataSource {
                 cell.switchCanEdit.isHidden = false
                 cell.labelCanEdit.isHidden = false
                 cell.buttonMenu.isHidden = false
+                cell.imageItem.image = NCShareCommon.sharedInstance.getImageShareType(shareType: tableShare.shareType)
                 
                 let fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.activeUser, activeUrl: appDelegate.activeUrl) + "-" + tableShare.shareWith + ".png"
                 if FileManager.default.fileExists(atPath: fileNameLocalPath) {
@@ -410,8 +372,6 @@ extension NCShare: UITableViewDataSource {
                                 if let image = UIImage(contentsOfFile: fileNameLocalPath) {
                                     cell.imageItem.image = image
                                 }
-                            } else {
-                                cell.imageItem.image = UIImage(named: "avatar")
                             }
                         }
                     }

iOSClient/Share/NCShareCommon.swift

@@ -30,6 +30,17 @@ 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
+    
     func createLinkAvatar() -> UIImage? {
         
         let size: CGFloat = 200
@@ -204,4 +215,32 @@ class NCShareCommon: NSObject {
             viewController.present(activityViewController, animated: true, completion: nil)
         }
     }
+    
+    func getImageShareType(shareType: Int) -> UIImage? {
+        
+        switch shareType {
+        case SHARE_TYPE_USER:
+            return UIImage(named: "shareTypeUser")
+        case self.SHARE_TYPE_GROUP:
+            return UIImage(named: "shareTypeGroup")
+        case self.SHARE_TYPE_LINK:
+            return UIImage(named: "shareTypeLink")
+        case self.SHARE_TYPE_EMAIL:
+            return UIImage(named: "shareTypeEmail")
+        case self.SHARE_TYPE_CONTACT:
+            return UIImage(named: "shareTypeUser")
+        case self.SHARE_TYPE_REMOTE:
+            return UIImage(named: "shareTypeUser")
+        case self.SHARE_TYPE_CIRCLE:
+            return UIImage(named: "shareTypeCircles")
+        case self.SHARE_TYPE_GUEST:
+            return UIImage(named: "shareTypeUser")
+        case self.SHARE_TYPE_REMOTE_GROUP:
+            return UIImage(named: "shareTypeGroup")
+        case self.SHARE_TYPE_ROOM:
+            return UIImage(named: "shareTypeRoom")
+        default:
+            return UIImage(named: "shareTypeUser")
+        }
+    }
 }