Marino Faggiana 6 years ago
parent
commit
f8a8ca773d
3 changed files with 5 additions and 7 deletions
  1. 5 5
      Share/CCloadItemData.swift
  2. 0 1
      Share/ShareViewController.h
  3. 0 1
      Share/ShareViewController.m

+ 5 - 5
Share/CCloadItemData.swift

@@ -26,7 +26,7 @@ import MobileCoreServices
 
 class CCloadItemData: NSObject {
     
-    @objc func loadFiles(_ directoryUser: String, extensionContext: NSExtensionContext, vc: ShareViewController) {
+    @objc func loadFiles(_ directory: String, extensionContext: NSExtensionContext, vc: ShareViewController) {
         
         var filesName: [String] = []
         var conuter = 0
@@ -68,7 +68,7 @@ class CCloadItemData: NSObject {
                                         if let pngImageData = UIImagePNGRepresentation(image) {
                                         
                                             let fileName = "\(dateFormatter.string(from: Date()))\(conuter).png"
-                                            let filenamePath = directoryUser + "/" + fileName
+                                            let filenamePath = directory + "/" + fileName
                                         
                                             let result = (try? pngImageData.write(to: URL(fileURLWithPath: filenamePath), options: [.atomic])) != nil
                                         
@@ -91,7 +91,7 @@ class CCloadItemData: NSObject {
                                         // OLD fileName with date
                                         //let pathExtention = URL(fileURLWithPath: url.lastPathComponent).pathExtension
                                         //let fileName = "\(dateFormatter.string(from: Date()))\(conuter).\(pathExtention)"
-                                        let filenamePath = directoryUser + "/" + fileName
+                                        let filenamePath = directory + "/" + fileName
                                         
                                         do {
                                             try FileManager.default.removeItem(atPath: filenamePath)
@@ -136,7 +136,7 @@ class CCloadItemData: NSObject {
                                             let pathExtention = (fileExtArr[fileExtArr.count-1]).uppercased()
                                         
                                             let fileName = "\(dateFormatter.string(from: Date()))\(conuter).\(pathExtention)"
-                                            let filenamePath = directoryUser + "/" + fileName
+                                            let filenamePath = directory + "/" + fileName
 
                                             FileManager.default.createFile(atPath: filenamePath, contents:data, attributes:nil)
                                                                                 
@@ -151,7 +151,7 @@ class CCloadItemData: NSObject {
                                             print("item as NSString")
                                         
                                             let fileName = "\(dateFormatter.string(from: Date()))\(conuter).txt"
-                                            let filenamePath = directoryUser + "/" + fileName
+                                            let filenamePath = directory + "/" + fileName
                                         
                                             FileManager.default.createFile(atPath: filenamePath, contents:data.data(using: String.Encoding.utf8.rawValue), attributes:nil)
                                         

+ 0 - 1
Share/ShareViewController.h

@@ -44,7 +44,6 @@
 @property (nonatomic, strong) NSString *activeUserID;
 @property (nonatomic, strong) NSString *activePassword;
 @property (nonatomic, strong) NSString *activeAccessToken;
-@property (nonatomic, strong) NSString *directoryUser;
 @property (nonatomic, strong) NSString *serverUrl;
 
 @property (nonatomic, retain) NSMutableArray *filesName;

+ 0 - 1
Share/ShareViewController.m

@@ -62,7 +62,6 @@
         _activeUrl = recordAccount.url;
         _activeUser = recordAccount.user;
         _activeUserID = recordAccount.userID;
-        _directoryUser = [CCUtility getDirectoryActiveUser:self.activeUser activeUrl:self.activeUrl];
         
         if ([_activeAccount isEqualToString:[CCUtility getActiveAccountExt]]) {