marinofaggiana 4 years ago
parent
commit
4e12f13e7b

+ 1 - 1
iOSClient/Data/NCManageDatabase.swift

@@ -2181,7 +2181,7 @@ class NCManageDatabase: NSObject {
             fileName = "."
             serverUrl = ".."
         } else {
-            fileName = CCUtility.getLastPath(fromServerUrl: serverUrl, urlBase: urlBase)
+            fileName = (serverUrl as NSString).lastPathComponent
             serverUrl = CCUtility.deletingLastPathComponent(fromServerUrl: serverUrl)
         }
         

+ 1 - 1
iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -45,7 +45,7 @@ class NCFileViewInFolder: NCCollectionViewCommon  {
         if serverUrl == NCUtility.shared.getHomeServer(urlBase: appDelegate.urlBase, account: appDelegate.account) {
             self.navigationItem.title = NCBrandOptions.sharedInstance.brand
         } else {
-            self.navigationItem.title = CCUtility.getLastPath(fromServerUrl: serverUrl, urlBase: appDelegate.urlBase)
+            self.navigationItem.title = (serverUrl as NSString).lastPathComponent
         }
         
         presentationController?.delegate = self

+ 1 - 1
iOSClient/Settings/CCManageAutoUpload.m

@@ -494,7 +494,7 @@
         }
         
         // Settings new folder Automatatic upload
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFileName:[CCUtility getLastPathFromServerUrl:serverUrl urlBase:appDelegate.urlBase]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadFileName:serverUrl.lastPathComponent];
         [[NCManageDatabase sharedInstance] setAccountAutoUploadDirectory:[CCUtility deletingLastPathComponentFromServerUrl:serverUrl] urlBase:appDelegate.urlBase account:appDelegate.account];
     }
 }

+ 0 - 1
iOSClient/Utility/CCUtility.h

@@ -231,7 +231,6 @@
 + (void)createDirectoryAtPath:(NSString *)atPath;
 
 + (NSString *)deletingLastPathComponentFromServerUrl:(NSString *)serverUrl;
-+ (NSString *)getLastPathFromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase;
 + (NSString *)returnPathfromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase account:(NSString *)account;
 + (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase account:(NSString *)account;
 + (NSArray *)createNameSubFolder:(NSArray *)assets;

+ 0 - 11
iOSClient/Utility/CCUtility.m

@@ -1277,17 +1277,6 @@
     return [pather substringToIndex: [pather length] - 1];
 }
 
-+ (NSString *)getLastPathFromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase
-{
-    if ([serverUrl isEqualToString:urlBase])
-        return @"";
-    
-    NSURL *serverUrlURL = [NSURL URLWithString:[serverUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
-    NSString *fileName = [serverUrlURL lastPathComponent];
-
-    return fileName;
-}
-
 + (NSString *)returnPathfromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase account:(NSString *)account
 {
     NSString *homeServer = [[NCUtility shared] getHomeServerWithUrlBase:urlBase account:account];