cleaning

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>

iOSClient/Utility/CCUtility.h

@@ -52,7 +52,6 @@
 
 // ===== Third parts =====
 
-+ (NSString *)getExtension:(NSString*)fileName;
 + (NSDate *)datetimeWithOutTime:(NSDate *)datDate;
 + (NSDate *)getATime:(const char *)path;
 

iOSClient/Utility/CCUtility.m

@@ -304,24 +304,6 @@
 #pragma mark ===== Third parts =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (NSString *)getExtension:(NSString*)fileName
-{
-    NSMutableArray *fileNameArray =[[NSMutableArray alloc] initWithArray: [fileName componentsSeparatedByCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"."]]];
-    NSString *extension = [NSString stringWithFormat:@"%@",[fileNameArray lastObject]];
-    extension = [extension uppercaseString];
-    //If the file has a ZIP extension obtain the previous one for check if it is a .pages.zip / .numbers.zip / .key.zip extension
-    if ([extension isEqualToString:@"ZIP"]) {
-        [fileNameArray removeLastObject];
-        NSString *secondExtension = [NSString stringWithFormat:@"%@",[fileNameArray lastObject]];
-        secondExtension = [secondExtension uppercaseString];
-        if ([secondExtension isEqualToString:@"PAGES"] || [secondExtension isEqualToString:@"NUMBERS"] || [secondExtension isEqualToString:@"KEY"]) {
-            extension = [NSString stringWithFormat:@"%@.%@",secondExtension,extension];
-            return extension;
-        }
-    }
-    return extension;
-}
-
 + (NSDate *)datetimeWithOutTime:(NSDate *)datDate
 {
     if (datDate == nil) return nil;

iOSClient/Utility/NCUtility+Image.swift

@@ -50,7 +50,8 @@ extension NCUtility {
     }
 
     func getImage(metadata: tableMetadata) -> UIImage? {
-        let ext = CCUtility.getExtension(metadata.fileNameView)
+
+        let ext = (metadata.fileName as NSString).pathExtension.uppercased()
         var image: UIImage?
 
         if utilityFileSystem.fileProviderStorageExists(metadata) && metadata.isImage {

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -297,7 +297,7 @@ class NCViewerMedia: UIViewController {
 
     func getImageMetadata(_ metadata: tableMetadata) -> UIImage? {
 
-        if let image = getImage(metadata: metadata) {
+        if let image = utility.getImage(metadata: metadata) {
             return image
         }
 
@@ -318,46 +318,6 @@ class NCViewerMedia: UIViewController {
         }
     }
 
-    func getImage(metadata: tableMetadata) -> UIImage? {
-
-        let ext = CCUtility.getExtension(metadata.fileNameView)
-        var image: UIImage?
-
-        if utilityFileSystem.fileProviderStorageExists(metadata) && metadata.isImage {
-
-            let previewPath = utilityFileSystem.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)
-            let imagePath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
-
-            if ext == "GIF" {
-                if !FileManager().fileExists(atPath: previewPath) {
-                    utility.createImageFrom(fileNameView: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
-                }
-                image = UIImage.animatedImage(withAnimatedGIFURL: URL(fileURLWithPath: imagePath))
-            } else if ext == "SVG" {
-                if let svgImage = SVGKImage(contentsOfFile: imagePath) {
-                    svgImage.size = CGSize(width: NCGlobal.shared.sizePreview, height: NCGlobal.shared.sizePreview)
-                    if let image = svgImage.uiImage {
-                        if !FileManager().fileExists(atPath: previewPath) {
-                            do {
-                                try image.pngData()?.write(to: URL(fileURLWithPath: previewPath), options: .atomic)
-                            } catch { }
-                        }
-                        return image
-                    } else {
-                        return nil
-                    }
-                } else {
-                    return nil
-                }
-            } else {
-                utility.createImageFrom(fileNameView: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
-                image = UIImage(contentsOfFile: imagePath)
-            }
-        }
-
-        return image
-    }
-
     func downloadImage(withSelector selector: String = "") {
         NCNetworking.shared.download(metadata: metadata, selector: selector, progressHandler: { _ in
             self.allowPanning = false