dev

iOSClient/CCGlobal.h

@@ -195,7 +195,7 @@
 #define selectorDownloadSynchronize                     @"downloadSynchronize"
 #define selectorLoadFileView                            @"loadFileView"
 #define selectorLoadFileViewFavorite                    @"loadFileViewFavorite"
-#define selectorLoadFileInternalView                    @"loadFileInternalView"
+#define selectorLoadFileQuickLook                       @"loadFileQuickLook"
 #define selectorLoadCopy                                @"loadCopy"
 #define selectorLoadOffline                             @"loadOffline"
 #define selectorOpenIn                                  @"openIn"

iOSClient/Main/CCMain.m

@@ -1912,7 +1912,7 @@
             [items addObject:[[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_open_in_", nil) action:@selector(openinTouchFile:)]];
         }
         if ([self.metadata.typeFile isEqualToString: k_metadataTypeFile_document]) {
-            [items addObject:[[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_open_internal_view_", nil) action:@selector(openInternalViewerTouch:)]];
+            [items addObject:[[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_open_quicklook_", nil) action:@selector(openInternalViewerTouch:)]];
         }
         [items addObject:[[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_file_", nil) action:@selector(pasteTouchFile:)]];
         [items addObject:[[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_files_", nil) action:@selector(pasteTouchFiles:)]];
@@ -2108,7 +2108,7 @@
 /************************************ OPEN INTERNAL VIEWER ... ******************************/
 - (void)openInternalViewerTouch:(id)sender
 {
-    [[NCMainCommon sharedInstance] downloadOpenWithMetadata:self.metadata selector:selectorLoadFileInternalView];
+    [[NCMainCommon sharedInstance] downloadOpenWithMetadata:self.metadata selector:selectorLoadFileQuickLook];
 }
 
 /************************************ PASTE ************************************/

iOSClient/Main/NCDetailViewController.swift

@@ -458,6 +458,7 @@ class NCDetailViewController: UIViewController {
             return
         }
         
+        /*
         // DOCUMENT - INTERNAL VIEWER
         if metadata.typeFile == k_metadataTypeFile_document && selector != nil && selector == selectorLoadFileInternalView {
             
@@ -467,6 +468,7 @@ class NCDetailViewController: UIViewController {
             viewerDocumentWeb.viewDocumentWebAt(metadata, view: backgroundView)
             return
         }
+        */
         
         // DOCUMENT
         if metadata.typeFile == k_metadataTypeFile_document {

iOSClient/Networking/NCNetworkingNotificationCenter.swift

@@ -69,22 +69,21 @@ import Foundation
                         return
                     }
                     
-                    // open View File
-                    if (selector == selectorLoadFileView || selector == selectorLoadFileViewFavorite || selector == selectorLoadFileInternalView) && UIApplication.shared.applicationState == UIApplication.State.active {
-                    
-                        //
+                    // Quick Look
+                    if selector == selectorLoadFileQuickLook {
+                        
                         let quicklook = NCViewerQuickLook.init()
                         let fileNamePath = NSTemporaryDirectory() + metadata.fileNameView
 
                         CCUtility.copyFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView), toPath: fileNamePath)
 
                         quicklook.quickLook(url: URL(fileURLWithPath: fileNamePath), viewController: appDelegate.activeMain)
-                        
                         return
-                        
-                        //
-                        
-                        
+                    }
+                    
+                    // open View File
+                    if (selector == selectorLoadFileView || selector == selectorLoadFileViewFavorite) && UIApplication.shared.applicationState == UIApplication.State.active {
+                    
                         if metadata.contentType.contains("opendocument") && !NCUtility.sharedInstance.isRichDocument(metadata) {
                             metadata.typeFile = k_metadataTypeFile_unknown
                         }

iOSClient/PeekPop/CCPeekPop.m

@@ -79,8 +79,8 @@
     }
     
     if (self.showOpenInternalViewer) {
-        UIPreviewAction *item = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_open_internal_view_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController) {
-            [[NCMainCommon sharedInstance] downloadOpenWithMetadata:self.metadata selector:selectorLoadFileInternalView];
+        UIPreviewAction *item = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_open_quicklook_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController) {
+            [[NCMainCommon sharedInstance] downloadOpenWithMetadata:self.metadata selector:selectorLoadFileQuickLook];
         }];
         [items addObject:item];
     }

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -445,7 +445,7 @@
 "_copy_files_"                  = "Copy files";
 "_paste_file_"                  = "Paste file";
 "_paste_files_"                 = "Paste files";
-"_open_internal_view_"          = "Open with internal viewer";
+"_open_quicklook_"              = "Open with Quick Look";
 
 "_search_this_folder_"          = "Search in this folder";
 "_search_all_folders_"          = "Search in all folders";

iOSClient/Viewer/NCViewerQuickLook.swift

@@ -27,7 +27,7 @@ import QuickLook
             }
                         
             let httpURLResponse = response as? HTTPURLResponse
-            let mimeType = httpURLResponse?.mimeType
+            //let mimeType = httpURLResponse?.mimeType
             
             do {
                 // rename the temporary file or save it to the document or library directory if you want to keep the file
@@ -50,6 +50,7 @@ import QuickLook
                 return
             }
         }.resume()
+        
         UIApplication.shared.isNetworkActivityIndicatorVisible = true
     }