coding

Nextcloud.xcodeproj/project.pbxproj

@@ -50,7 +50,6 @@
 		F70F2BA5225F2D8900EBB73E /* ZIPFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F70F2BA4225F2D8900EBB73E /* ZIPFoundation.framework */; };
 		F710C5F02471A6D1009AD8B7 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F710C5EF2471A6D1009AD8B7 /* Sentry.framework */; };
 		F710D1F52405770F00A6033D /* NCViewerPDF.swift in Sources */ = {isa = PBXBuildFile; fileRef = F710D1F42405770F00A6033D /* NCViewerPDF.swift */; };
-		F710D1F924057C9D00A6033D /* NCDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F710D1F824057C9D00A6033D /* NCDetailViewController.swift */; };
 		F710D1FE24057E5E00A6033D /* NCActionSheetHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F710D1FB24057E5E00A6033D /* NCActionSheetHeader.swift */; };
 		F710D1FF24057E5E00A6033D /* NCActionSheetHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F710D1FC24057E5E00A6033D /* NCActionSheetHeaderView.swift */; };
 		F710D20024057E5E00A6033D /* NCActionSheetHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F710D1FD24057E5E00A6033D /* NCActionSheetHeaderView.xib */; };
@@ -248,7 +247,6 @@
 		F79A65C32191D90F00FF6DCC /* NCSelect.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F79A65C22191D90F00FF6DCC /* NCSelect.storyboard */; };
 		F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79A65C52191D95E00FF6DCC /* NCSelect.swift */; };
 		F7A321AD1E9E6AD50069AD1B /* CCAdvanced.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A321AC1E9E6AD50069AD1B /* CCAdvanced.m */; };
-		F7A68AB625382F0D00A7C2E8 /* NCDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7A68AB525382F0D00A7C2E8 /* NCDetail.storyboard */; };
 		F7A80BCA252624C100C7CD01 /* NCFileViewInFolder.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7A80BC8252624C100C7CD01 /* NCFileViewInFolder.storyboard */; };
 		F7A80BCB252624C100C7CD01 /* NCFileViewInFolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A80BC9252624C100C7CD01 /* NCFileViewInFolder.swift */; };
 		F7AE00F5230D5F9E007ACF8A /* NCLoginWeb.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7AE00F4230D5F9E007ACF8A /* NCLoginWeb.swift */; };
@@ -394,7 +392,6 @@
 		F70F2BA4225F2D8900EBB73E /* ZIPFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZIPFoundation.framework; path = Carthage/Build/iOS/ZIPFoundation.framework; sourceTree = "<group>"; };
 		F710C5EF2471A6D1009AD8B7 /* Sentry.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sentry.framework; path = Carthage/Build/iOS/Sentry.framework; sourceTree = "<group>"; };
 		F710D1F42405770F00A6033D /* NCViewerPDF.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCViewerPDF.swift; sourceTree = "<group>"; };
-		F710D1F824057C9D00A6033D /* NCDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCDetailViewController.swift; sourceTree = "<group>"; };
 		F710D1FB24057E5E00A6033D /* NCActionSheetHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCActionSheetHeader.swift; sourceTree = "<group>"; };
 		F710D1FC24057E5E00A6033D /* NCActionSheetHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCActionSheetHeaderView.swift; sourceTree = "<group>"; };
 		F710D1FD24057E5E00A6033D /* NCActionSheetHeaderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCActionSheetHeaderView.xib; sourceTree = "<group>"; };
@@ -607,7 +604,6 @@
 		F7A54C341C6267B500E2C8BF /* CCExifGeo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCExifGeo.h; sourceTree = "<group>"; };
 		F7A54C351C6267B500E2C8BF /* CCExifGeo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCExifGeo.m; sourceTree = "<group>"; };
 		F7A582D71A24DAB500E903D7 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AppDelegate.h; sourceTree = "<group>"; };
-		F7A68AB525382F0D00A7C2E8 /* NCDetail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCDetail.storyboard; sourceTree = "<group>"; };
 		F7A80BC8252624C100C7CD01 /* NCFileViewInFolder.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCFileViewInFolder.storyboard; sourceTree = "<group>"; };
 		F7A80BC9252624C100C7CD01 /* NCFileViewInFolder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCFileViewInFolder.swift; sourceTree = "<group>"; };
 		F7ACE4291BAC0268006C0017 /* Acknowledgements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Acknowledgements.h; sourceTree = "<group>"; };
@@ -1167,15 +1163,6 @@
 			path = Activity;
 			sourceTree = "<group>";
 		};
-		F7A68AAC25382EE300A7C2E8 /* Detail */ = {
-			isa = PBXGroup;
-			children = (
-				F7A68AB525382F0D00A7C2E8 /* NCDetail.storyboard */,
-				F710D1F824057C9D00A6033D /* NCDetailViewController.swift */,
-			);
-			path = Detail;
-			sourceTree = "<group>";
-		};
 		F7A80BC7252624C100C7CD01 /* FileViewInFolder */ = {
 			isa = PBXGroup;
 			children = (
@@ -1490,7 +1477,6 @@
 				F7B0C1701EE8397E0033AC24 /* AutoUpload */,
 				F7AE00F6230E8191007ACF8A /* BrowserWeb */,
 				F7BAAD951ED5A63D00B7EAD4 /* Data */,
-				F7A68AAC25382EE300A7C2E8 /* Detail */,
 				F73FAEE224D2CA830090692E /* Diagnostics */,
 				F723986F253D867900257F49 /* EmptyView */,
 				F7A3214D1E9E2A070069AD1B /* Favorites */,
@@ -1916,7 +1902,6 @@
 				F7651A8A23A2A3F2001403D2 /* NCCreateFormUploadDocuments.storyboard in Resources */,
 				F704B5E72430C06700632F5F /* NCCreateFormUploadConflictCell.xib in Resources */,
 				F79728D622F9A0B1003CACA7 /* NCShareUserFolderMenuView.xib in Resources */,
-				F7A68AB625382F0D00A7C2E8 /* NCDetail.storyboard in Resources */,
 				F7DFAA8A22E22EF100FC4527 /* NCShareLinkMenuView.xib in Resources */,
 				F7C9555321F0C4CA0024296E /* NCActivity.storyboard in Resources */,
 				F774DF0F1FCC26BE002AF9FC /* iTunesArtwork@1x.png in Resources */,
@@ -2159,7 +2144,6 @@
 				F79A65C62191D95E00FF6DCC /* NCSelect.swift in Sources */,
 				F7E0E1DC22327885006B0911 /* NCAudioRecorderViewController.swift in Sources */,
 				F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */,
-				F710D1F924057C9D00A6033D /* NCDetailViewController.swift in Sources */,
 				F74C0436253F1CDC009762AB /* NCShares.swift in Sources */,
 				F7AE00F5230D5F9E007ACF8A /* NCLoginWeb.swift in Sources */,
 				F7B2DEF01F976854007CF4D2 /* NYMnemonic.m in Sources */,

iOSClient/AppDelegate.h

@@ -43,7 +43,6 @@
 @class NCTrash;
 @class NCAppConfigView;
 @class IMImagemeterViewer;
-@class NCDetailViewController;
 @class NCNetworkingAutoUpload;
 @class NCDocumentPickerViewController;
 @class FileProviderDomain;

iOSClient/Detail/NCDetail.storyboard

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Detail View Controller-->
-        <scene sceneID="5rh-5g-l0Y">
-            <objects>
-                <viewController storyboardIdentifier="NCDetail" extendedLayoutIncludesOpaqueBars="YES" hidesBottomBarWhenPushed="YES" id="z35-nC-Oo4" customClass="NCDetailViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" tag="900" contentMode="scaleToFill" id="boJ-by-2PT">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="Nn5-fu-bWV"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="a7k-TU-M5i" userLabel="Detail"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="pPs-7w-Xdq" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="6162" y="1588"/>
-        </scene>
-    </scenes>
-</document>

iOSClient/Detail/NCDetailViewController.swift

@@ -1,798 +0,0 @@
-//
-//  NCDetailViewController.swift
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 07/02/2020.
-//  Copyright © 2020 Marino Faggiana. All rights reserved.
-//
-//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-import Foundation
-import WebKit
-import NCCommunication
-
-class NCDetailViewController: UIViewController {
-    
-    private let appDelegate = UIApplication.shared.delegate as! AppDelegate
-   
-    @objc var isNavigationBarHidden = false
-    @objc var metadata: tableMetadata?
-    @objc var selector: String?
-    @objc var mediaFilterImage: Bool = false
-    @objc var layoutKey = ""
-
-    @objc var viewerImageViewController: NCViewerImageViewController?
-    @objc var metadatas: [tableMetadata] = []
-    
-    private var maxProgress: Float = 0
-    private var videoLayer: AVPlayerLayer?
-    private var viewerImageViewControllerLongPressInProgress = false
-    
-    private var viewerQuickLook: NCViewerQuickLook?
-
-    //MARK: -
-
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        NotificationCenter.default.addObserver(self, selector: #selector(changeTheming), name: NSNotification.Name(rawValue: k_notificationCenter_changeTheming), object: nil)
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(downloadedFile(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_downloadedFile), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(uploadedFile(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_uploadedFile), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(deleteFile(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_deleteFile), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(renameFile(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_renameFile), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(moveFile(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_moveFile), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(triggerProgressTask(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_progressTask), object:nil)
-               
-        NotificationCenter.default.addObserver(self, selector: #selector(downloadImage(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_menuDownloadImage), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(saveLivePhoto(_:)), name: NSNotification.Name(rawValue: k_notificationCenter_menuSaveLivePhoto), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(viewUnload), name: NSNotification.Name(rawValue: k_notificationCenter_menuDetailClose), object: nil)
-        
-        changeTheming()
-
-        if metadata != nil  {
-            viewFile(metadata: metadata!, selector: selector)
-        }
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        setProgressBar()
-        navigateControllerBarHidden(isNavigationBarHidden)
-    }
-    
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-        
-        if appDelegate.player != nil && appDelegate.player.rate != 0 {
-            appDelegate.player.pause()
-        }
-        
-        if appDelegate.isMediaObserver {
-            appDelegate.isMediaObserver = false
-            NCViewerVideoCommon.sharedInstance.removeObserver()
-        }
-    }
-    
-    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        super.viewWillTransition(to: size, with: coordinator)
-        
-        coordinator.animate(alongsideTransition: nil) { _ in
-            self.setProgressBar()
-        }
-    }
-    
-    @objc func viewUnload() {
-        
-        metadata = nil
-        selector = nil
-        
-        navigationController?.popViewController(animated: true)
-        navigationController?.isNavigationBarHidden = false
-    }
-    
-    //MARK: - ProgressBar
-
-    @objc func setProgressBar() {
-        
-        appDelegate.progressViewDetail.removeFromSuperview()
-
-        guard let navigationController = splitViewController?.viewControllers.last as? UINavigationController else { return }
-                        
-        appDelegate.progressViewDetail.frame = CGRect(x: 0, y: navigationController.navigationBar.frame.height - 2, width: navigationController.navigationBar.frame.width, height: 2)
-        progress(0)
-        appDelegate.progressViewDetail.tintColor = NCBrandColor.sharedInstance.brandElement
-        appDelegate.progressViewDetail.trackTintColor = .clear
-        appDelegate.progressViewDetail.transform = CGAffineTransform(scaleX: 1, y: 1)
-        
-        navigationController.navigationBar.addSubview(appDelegate.progressViewDetail)
-    }
-    
-    @objc func progress(_ progress: Float) {
-        DispatchQueue.main.async {
-            if progress == 0 {
-                self.maxProgress = 0
-                self.appDelegate.progressViewDetail.progress = 0
-            } else if progress > self.maxProgress {
-                self.appDelegate.progressViewDetail.progress = progress
-                self.maxProgress = progress
-            }
-        }
-    }
-    
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        if isNavigationBarHidden {
-            return .lightContent
-        } else {
-            return .default
-        }
-    }
-    
-    //MARK: - Utility
-
-    @objc func navigateControllerBarHidden(_ state: Bool) {
-        
-        if state  {
-            view.backgroundColor = .black
-        } else {
-            view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
-        }
-        
-        navigationController?.setNavigationBarHidden(state, animated: false)
-        isNavigationBarHidden = state
-        self.setNeedsStatusBarAppearanceUpdate()
-    }
-    
-    //MARK: - NotificationCenter
-
-    @objc func changeTheming() {
-        //appDelegate.changeTheming(self, tableView: nil, collectionView: nil, form: false)
-        
-//        if navigationController?.isNavigationBarHidden == false {
-//            view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
-//        }
-    }
-   
-    /*
-    @objc func changeDisplayMode() {
-       if self.view?.window == nil { return }
-        
-        NCViewerImageCommon.shared.imageChangeSizeView(viewerImageViewController: viewerImageViewController, size: self.backgroundView.frame.size, metadata: metadata)
-        
-        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
-            self.setProgressBar()
-        }
-    }
-    */
-    
-    @objc func triggerProgressTask(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        guard let metadata = self.metadata else { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let account = userInfo["account"] as? String, let serverUrl = userInfo["serverUrl"] as? String {
-                if account == metadata.account && serverUrl == metadata.serverUrl {
-                    let progressNumber = userInfo["progress"] as? NSNumber ?? 0
-                    let progress = progressNumber.floatValue
-                    self.progress(progress)
-                }
-            }
-        }
-    }
-    
-    @objc func moveFile(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata, let metadataNew = userInfo["metadataNew"] as? tableMetadata {
-                if metadata.account != self.metadata?.account { return }
-                
-                // IMAGE
-                if (metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio) {
-                    
-                    viewImage()
-                }
-                
-                // OTHER
-                if (metadata.typeFile == k_metadataTypeFile_document || metadata.typeFile == k_metadataTypeFile_unknown) && metadataNew.ocId == self.metadata?.ocId {
-                    
-                    self.metadata = metadataNew
-                    
-                    // update subview
-                    for view in view.subviews {
-                        /*
-                        if view is NCViewerNextcloudText {
-                            (view as! NCViewerNextcloudText).metadata = self.metadata
-                        }
-                        else if view is NCViewerRichdocument {
-                            (view as! NCViewerRichdocument).metadata = self.metadata
-                        }
-                        */
-                    }
-                }
-            }
-        }
-    }
-    
-    @objc func deleteFile(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata {
-                if metadata.account != self.metadata?.account || metadata.serverUrl != self.metadata?.serverUrl { return }
-                                    
-                // IMAGE
-                if (metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio) {
-                
-                    let metadatas = self.metadatas.filter { $0.ocId != metadata.ocId }
-                    if metadatas.count > 0 {
-                        if self.metadata?.ocId == metadata.ocId {
-                            var index = viewerImageViewController!.index - 1
-                            if index < 0 { index = 0}
-                            self.metadata = metadatas[index]
-                        }
-                        viewImage()
-                    } else {
-                        viewUnload()
-                    }
-                }
-                
-                // OTHER
-                if (metadata.typeFile == k_metadataTypeFile_document || metadata.typeFile == k_metadataTypeFile_unknown) && metadata.ocId == self.metadata?.ocId {
-                    viewUnload()
-                }
-            }
-        }
-    }
-    
-    @objc func renameFile(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata {
-                if metadata.account != self.metadata?.account || metadata.serverUrl != self.metadata?.serverUrl { return }
-                
-                // IMAGE
-                if (metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio) {
-                    
-                    viewImage()
-                }
-                
-                // OTHER
-                if (metadata.typeFile == k_metadataTypeFile_document || metadata.typeFile == k_metadataTypeFile_unknown) && metadata.ocId == self.metadata?.ocId {
-                    
-                    if let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadata.ocId) {
-                        self.metadata = metadata
-                        self.navigationController?.navigationBar.topItem?.title = metadata.fileNameView
-                    } else {
-                        viewUnload()
-                    }
-                }
-            }
-        }
-    }
-    
-    @objc func downloadedFile(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata, let errorCode = userInfo["errorCode"] as? Int {
-                if metadata.account != self.metadata?.account || metadata.serverUrl != self.metadata?.serverUrl { return }
-                
-                // IMAGE
-                if metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio && errorCode != 0  {
-
-                    viewerImageViewController?.reloadContentViews()
-                }
-                
-                progress(0)
-            }
-        }
-    }
-    
-    @objc func uploadedFile(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata, let _ = userInfo["errorCode"] as? Int {
-                if metadata.serverUrl != self.metadata?.serverUrl { return }
-                    progress(0)
-            }
-        }
-    }
-    
-    @objc func downloadImage(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata {
-
-                NCNetworking.shared.download(metadata: metadata, selector: "") { (_) in }
-
-                if let index = metadatas.firstIndex(where: { $0.ocId == metadata.ocId }) {
-                    metadatas[index] = self.metadata!
-                }                
-            }
-        }
-    }
-    
-    @objc func saveLivePhoto(_ notification: NSNotification) {
-        if self.view?.window == nil { return }
-        
-        if let userInfo = notification.userInfo as NSDictionary? {
-            if let metadata = userInfo["metadata"] as? tableMetadata, let metadataMov = userInfo["metadataMov"] as? tableMetadata {
-                let fileNameImage = URL(fileURLWithPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!)
-                let fileNameMov = URL(fileURLWithPath: CCUtility.getDirectoryProviderStorageOcId(metadataMov.ocId, fileNameView: metadataMov.fileNameView)!)
-                
-                NCLivePhoto.generate(from: fileNameImage, videoURL: fileNameMov, progress: { progress in
-                    self.progress(Float(progress))
-                }, completion: { livePhoto, resources in
-                    self.progress(0)
-                    if resources != nil {
-                        NCLivePhoto.saveToLibrary(resources!) { (result) in
-                            if !result {
-                                NCContentPresenter.shared.messageNotification("_error_", description: "_livephoto_save_error_", delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: Int(k_CCErrorInternalError))
-                            }
-                        }
-                    } else {
-                        NCContentPresenter.shared.messageNotification("_error_", description: "_livephoto_save_error_", delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: Int(k_CCErrorInternalError))
-                    }
-                })
-            }
-        }
-    }
-    
-    //MARK: - View File
-    
-    @objc func viewFile(metadata: tableMetadata, selector: String?) {
-                
-        self.metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadata.ocId)
-        self.selector = selector
-        
-        if appDelegate.isMediaObserver {
-            appDelegate.isMediaObserver = false
-            NCViewerVideoCommon.sharedInstance.removeObserver()
-        }
-        
-        // IMAGE VIDEO AUDIO
-        if metadata.typeFile == k_metadataTypeFile_image || metadata.typeFile == k_metadataTypeFile_audio || metadata.typeFile == k_metadataTypeFile_video {
-            
-            viewImage()
-            
-            return
-        }
-    
-        // DOCUMENT
-        if metadata.typeFile == k_metadataTypeFile_document {
-            
-            /*
-            
-            // DirectEditinf: Nextcloud Text - OnlyOffice
-            if NCUtility.shared.isDirectEditing(account: metadata.account, contentType: metadata.contentType) != nil &&  NCCommunication.shared.isNetworkReachable() {
-                
-                guard let editor = NCUtility.shared.isDirectEditing(account: metadata.account, contentType: metadata.contentType) else { return }
-                if editor == k_editor_text || editor == k_editor_onlyoffice {
-                    
-                    NCUtility.shared.startActivityIndicator(view: view)
-
-                    if metadata.url == "" {
-                        
-                        var customUserAgent: String?
-                        let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, account: metadata.account)!
-                        
-                        if editor == k_editor_onlyoffice {
-                            customUserAgent = NCUtility.shared.getCustomUserAgentOnlyOffice()
-                            self.navigationController?.navigationBar.topItem?.title = ""
-                        }
-                        
-                        NCCommunication.shared.NCTextOpenFile(fileNamePath: fileNamePath, editor: editor, customUserAgent: customUserAgent) { (account, url, errorCode, errorMessage) in
-                            
-                            if errorCode == 0 && account == self.appDelegate.account && url != nil {
-                                
-                                let frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
-                                let nextcloudText = NCViewerNextcloudText.init(frame: frame, configuration: WKWebViewConfiguration())
-                                nextcloudText.viewerAt(url!, metadata: metadata, editor: editor, view: self.view, viewController: self)
-                                
-                            } else if errorCode != 0 {
-                                
-                                NCContentPresenter.shared.messageNotification("_error_", description: errorMessage, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
-                                self.navigationController?.popViewController(animated: true)
-                                
-                            } else {
-                                
-                                self.navigationController?.popViewController(animated: true)
-                            }
-                        }
-                        
-                    } else {
-                        
-                        if editor == k_editor_onlyoffice {
-                            self.navigationController?.navigationBar.topItem?.title = ""
-                        } 
-                            
-                        let frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
-                        let nextcloudText = NCViewerNextcloudText.init(frame: frame, configuration: WKWebViewConfiguration())
-                        nextcloudText.viewerAt(metadata.url, metadata: metadata, editor: editor, view: view, viewController: self)
-                    }
-                } else {
-                    NCContentPresenter.shared.messageNotification("_error_", description: "_editor_unknown_", delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: Int(k_CCErrorInternalError))
-                    viewUnload()
-                }
-                
-                return
-            }
-            */
-            
-            // RichDocument: Collabora
-            /*
-            if NCUtility.shared.isRichDocument(metadata) &&  NCCommunication.shared.isNetworkReachable() {
-                
-                NCUtility.shared.startActivityIndicator(view: view)
-                
-                if metadata.url == "" {
-                    
-                    NCCommunication.shared.createUrlRichdocuments(fileID: metadata.fileId) { (account, url, errorCode, errorDescription) in
-                        
-                        if errorCode == 0 && account == self.appDelegate.account && url != nil {
-                            
-                            let frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
-                            let richDocument = NCViewerRichdocument.init(frame: frame, configuration: WKWebViewConfiguration())
-                            richDocument.viewRichDocumentAt(url!, metadata: metadata, view: self.view, viewController: self)
-                            
-                        } else if errorCode != 0 {
-                            
-                            NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
-                            self.navigationController?.popViewController(animated: true)
-                            
-                        } else {
-                            
-                            self.navigationController?.popViewController(animated: true)
-                        }
-                    }
-                    
-                } else {
-                    
-                    let richDocument = NCViewerRichdocument.init(frame: view.frame, configuration: WKWebViewConfiguration())
-                    richDocument.viewRichDocumentAt(metadata.url, metadata: metadata, view: view, viewController: self)
-                }
-                
-                return
-            }
-            */
-        }
-        
-        // OTHER
-        
-        let fileNamePath = NSTemporaryDirectory() + metadata.fileNameView
-
-        CCUtility.copyFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView), toPath: fileNamePath)
-
-        viewerQuickLook = NCViewerQuickLook.init()
-        viewerQuickLook?.quickLook(url: URL(fileURLWithPath: fileNamePath))
-        
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-            self.viewUnload()
-        }
-    }
-}
-
-//MARK: - viewerImageViewController - Delegate/DataSource
-
-extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerImageViewControllerDataSource {
-    
-    func viewImage() {
-                
-        NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, mediaDatasorce: mediaFilterImage, layoutKey: layoutKey) { (metadatas) in
-            
-            guard let metadatas = metadatas else {
-                self.viewUnload()
-                return
-            }
-            var index = 0
-            
-            if let indexFound = metadatas.firstIndex(where: { $0.ocId == self.metadata?.ocId }) { index = indexFound }
-            // Video -> is a Live Photo ?
-            if self.metadata?.typeFile == k_metadataTypeFile_video {
-                let filename = (self.metadata!.fileNameView as NSString).deletingPathExtension.lowercased()
-                if let indexFound = metadatas.firstIndex(where: { (($0.fileNameView as NSString).deletingPathExtension.lowercased() as String) == filename && $0.typeFile == k_metadataTypeFile_image }) { index = indexFound }
-            }
-            self.metadatas = metadatas
-
-            self.viewerImageViewController = NCViewerImageViewController(index: index, dataSource: self, delegate: self)
-            if self.viewerImageViewController != nil {
-                           
-//                self.viewerImageViewController!.view.isHidden = true
-//                self.viewerImageViewController!.enableInteractiveDismissal = true
-                self.addChild(self.viewerImageViewController!)
-                self.view.addSubview(self.viewerImageViewController!.view)
-//                self.viewerImageViewController!.view.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height)
-                self.viewerImageViewController!.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-//                self.viewerImageViewController!.didMove(toParent: self)
-                
-//                DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
-//                    self.viewerImageViewController!.changeInViewSize(to: self.view.frame.size)
-//                    self.viewerImageViewController!.view.isHidden = false
-//                }
-            }
-        }
-    }
-    
-    func numberOfItems(in viewerImageViewController: NCViewerImageViewController) -> Int {
-        return metadatas.count
-    }
-
-    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, imageAt index: Int, completion: @escaping (_ index: Int, _ image: UIImage?, _ metadata: tableMetadata, _ zoomScale: ZoomScale?, _ error: Error?) -> Void) {
-        
-        if index >= metadatas.count { return }
-        let metadata = metadatas[index]
-        let isPreview = CCUtility.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)
-        let isImage = CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) > 0
-        let ext = CCUtility.getExtension(metadata.fileNameView)
-        let isFolderEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
-        
-        // Refresh self metadata && title
-        if viewerImageViewController.index < metadatas.count {
-            self.metadata = metadatas[viewerImageViewController.index]
-            self.navigationController?.navigationBar.topItem?.title = self.metadata!.fileNameView
-        }
-        
-        // Status Current
-        if index == viewerImageViewController.currentItemIndex {
-            statusViewImage(metadata: metadata, viewerImageViewController: viewerImageViewController)
-        }
-        
-        // Preview for Video
-        if metadata.typeFile == k_metadataTypeFile_video && !isPreview && isImage {
-            
-            CCGraphics.createNewImage(from: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, typeFile: metadata.typeFile)
-        }
-        
-        // Original only for actual
-        if metadata.typeFile == k_metadataTypeFile_image && isImage && index == viewerImageViewController.index {
-                
-            if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
-                completion(index, image, metadata, ZoomScale.default, nil)
-            } else {
-                completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-            }
-                
-        // Automatic download for: Encripted
-        } else if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && isFolderEncrypted{
-            
-            if NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@ AND session != ''", metadata.ocId)) == nil {
-                
-                NCNetworking.shared.download(metadata: metadata, selector: "") { (_) in }
-            }
-            
-            completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-            
-        // Automatic download for: HEIC - GIF - SVG
-        } else if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) == 0 && ((metadata.contentType == "image/heic" &&  metadata.hasPreview == false) || ext == "GIF" || ext == "SVG") {
-            
-            let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
-            let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName)!
-                        
-            NCCommunication.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { (_) in
-                                
-            },  progressHandler: { (progress) in
-                                
-                self.progress(Float(progress.fractionCompleted))
-                
-            }) { (account, etag, date, length, error, errorCode, errorDescription) in
-                
-                if errorCode == 0 && account == metadata.account {
-                    
-                    NCManageDatabase.sharedInstance.addLocalFile(metadata: metadata)
-                    
-                    if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
-                        completion(index, image, metadata, ZoomScale.default, nil)
-                    } else {
-                        completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-                    }
-                } else if errorCode != 0 {
-                    completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-                }
-                
-                self.progress(0)
-            }
-        
-        // Preview
-        } else if isPreview {
-                
-            if let image = NCViewerImageCommon.shared.getThumbnailImage(metadata: metadata) {
-                completion(index, image, metadata, ZoomScale.default, nil)
-            } else {
-                completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-            }
-    
-        } else if metadata.hasPreview {
-                
-            let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, account: metadata.account)!
-            let fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
-            let fileNameIconLocalPath = CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)!
-                    
-            NCCommunication.shared.downloadPreview(fileNamePathOrFileId: fileNamePath, fileNamePreviewLocalPath: fileNamePreviewLocalPath, widthPreview: Int(k_sizePreview), heightPreview: Int(k_sizePreview), fileNameIconLocalPath: fileNameIconLocalPath, sizeIcon: Int(k_sizeIcon)) { (account, imagePreview, imageIcon,  errorCode, errorMessage) in
-                if errorCode == 0 && imagePreview != nil {
-                    completion(index, imagePreview, metadata, ZoomScale.default, nil)
-                } else {
-                    completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-                }
-            }
-            
-        } else {
-            completion(index, NCViewerImageCommon.shared.getImageOffOutline(frame: self.view.frame, type: metadata.typeFile), metadata, ZoomScale.default, nil)
-        }
-    }
-    
-    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, willChangeFocusTo index: Int, view: NCViewerImageContentView, metadata: tableMetadata) {
-        
-        statusViewImage(metadata: metadata, viewerImageViewController: viewerImageViewController)
-    }
-    
-    func viewerImageViewController(_ viewerImageViewController: NCViewerImageViewController, didChangeFocusTo index: Int, view: NCViewerImageContentView, metadata: tableMetadata) {
-        
-        let ocId = metadata.ocId
-        if metadata.typeFile == k_metadataTypeFile_image && !view.isLoading {
-            DispatchQueue.global().async {
-                if let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(ocId) {
-                    if let image = NCViewerImageCommon.shared.getImage(metadata: metadata) {
-                        DispatchQueue.main.async {
-                            view.image = image
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    func viewerImageViewControllerTap(_ viewerImageViewController: NCViewerImageViewController, metadata: tableMetadata) {
-        
-        guard let navigationController = self.navigationController else { return }
-        
-        if metadata.typeFile == k_metadataTypeFile_image {
-        
-            if navigationController.isNavigationBarHidden {
-                navigateControllerBarHidden(false)
-                viewerImageViewController.statusView.isHidden = false
-            } else {
-                navigateControllerBarHidden(true)
-                viewerImageViewController.statusView.isHidden = true
-            }
-            
-            NCViewerImageCommon.shared.imageChangeSizeView(viewerImageViewController: viewerImageViewController, size: self.view.frame.size, metadata: metadata)
-            
-        } else {
-            
-            if let viewerImageVideo = UIStoryboard(name: "NCViewerVideo", bundle: nil).instantiateInitialViewController() as? NCViewerVideo {
-                viewerImageVideo.metadata = metadata
-                present(viewerImageVideo, animated: false) { }
-            }
-        }
-        
-        statusViewImage(metadata: metadata, viewerImageViewController: viewerImageViewController)
-    }
-    
-    func viewerImageViewControllerLongPressBegan(_ viewerImageViewController: NCViewerImageViewController, metadata: tableMetadata) {
-        
-        viewerImageViewController.statusView.isHidden = true
-        viewerImageViewControllerLongPressInProgress = true
-        
-        let fileName = (metadata.fileNameView as NSString).deletingPathExtension + ".mov"
-        if let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameView LIKE[c] %@", metadata.account, metadata.serverUrl, fileName)) {
-            
-            if CCUtility.fileProviderStorageSize(metadata.ocId, fileNameView: metadata.fileNameView) > 0 {
-                
-                AudioServicesPlaySystemSound(1519) // peek feedback
-                viewMOV(viewerImageViewController: viewerImageViewController, metadata: metadata)
-                
-            } else {
-                
-                let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileNameView
-                let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
-                                
-                NCCommunication.shared.download(serverUrlFileName: serverUrlFileName, fileNameLocalPath: fileNameLocalPath, requestHandler: { (_) in
-                    
-                }, progressHandler: { (progress) in
-                                    
-                    self.progress(Float(progress.fractionCompleted))
-                    
-                }) { (account, etag, date, length, error, errorCode, errorDescription) in
-                    
-                    self.progress(0)
-                    
-                    if errorCode == 0 && account == metadata.account {
-                        
-                        NCManageDatabase.sharedInstance.addLocalFile(metadata: metadata)
-                        AudioServicesPlaySystemSound(1519) // peek feedback
-                        self.viewMOV(viewerImageViewController: viewerImageViewController, metadata: metadata)
-                    }
-                }
-            }
-        }
-    }
-    
-    func viewerImageViewControllerLongPressEnded(_ viewerImageViewController: NCViewerImageViewController, metadata: tableMetadata) {
-        
-        viewerImageViewControllerLongPressInProgress = false
-        
-        viewerImageViewController.statusView.isHidden = false
-        appDelegate.player?.pause()
-        videoLayer?.removeFromSuperlayer()
-    }
-    
-    func viewerImageViewControllerDismiss() {
-        viewUnload()
-    }
-    
-    func statusViewImage(metadata: tableMetadata, viewerImageViewController: NCViewerImageViewController) {
-        
-        var colorStatus: UIColor = UIColor.white.withAlphaComponent(0.8)
-        if view.backgroundColor?.isLight() ?? true { colorStatus = UIColor.black.withAlphaComponent(0.8) }
-                
-        if NCManageDatabase.sharedInstance.isLivePhoto(metadata: metadata) != nil {
-            viewerImageViewController.statusView.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "livePhoto"), width: 100, height: 100, color: colorStatus)
-        } else if metadata.typeFile == k_metadataTypeFile_video || metadata.typeFile == k_metadataTypeFile_audio {
-            viewerImageViewController.statusView.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "play"), width: 100, height: 100, color: colorStatus)
-        } else {
-            viewerImageViewController.statusView.image = nil
-        }
-    }
-    
-    func viewMOV(viewerImageViewController: NCViewerImageViewController, metadata: tableMetadata) {
-        
-        if !viewerImageViewControllerLongPressInProgress { return }
-        
-        appDelegate.player = AVPlayer(url: URL(fileURLWithPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!))
-        videoLayer = AVPlayerLayer(player: appDelegate.player)
-        if  videoLayer != nil {
-            videoLayer!.frame = viewerImageViewController.view.frame
-            videoLayer!.videoGravity = AVLayerVideoGravity.resizeAspect
-            viewerImageViewController.view.layer.addSublayer(videoLayer!)
-            appDelegate.player?.play()
-        }
-    }
-}
-
-//MARK: -
-
-extension NCDetailViewController: NCSelectDelegate {
-    
-    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], buttonType: String, overwrite: Bool) {
-        if let metadata = self.metadata, let serverUrl = serverUrl {
-            if buttonType == "done" {
-                NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
-                    if errorCode != 0 {
-                        NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
-                    }
-                }
-            } else {
-                NCNetworking.shared.copyMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
-                    if errorCode != 0 {
-                        NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
-                    }
-                }
-            }
-        }
-    }
-}
-

iOSClient/Favorites/NCFavorite.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>

iOSClient/FileViewInFolder/NCFileViewInFolder.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>

iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -913,6 +913,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             }
         }
         
+        /*
         if let segueNavigationController = segue.destination as? UINavigationController {
             if let segueViewController = segueNavigationController.topViewController as? NCDetailViewController {
                 segueViewController.metadata = metadataTouch
@@ -922,6 +923,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             segueViewController.metadata = metadataTouch
             segueViewController.layoutKey = layoutKey
         }
+        */
     }
     
     // MARK: - DataSource + NC Endpoint

iOSClient/Main/Menu/NCViewer+Menu.swift

@@ -1,5 +1,5 @@
 //
-//  NCDetailNavigationController+Menu.swift
+//  NCViewer.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 07/02/2020.

iOSClient/Media/NCMedia.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>

iOSClient/Media/NCMedia.swift

@@ -473,6 +473,7 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         
+        /*
         if let segueNavigationController = segue.destination as? UINavigationController {
             if let segueViewController = segueNavigationController.topViewController as? NCDetailViewController {
             
@@ -482,6 +483,7 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
                 segueViewController.layoutKey = k_layout_view_media
             }
         }
+        */
     }
 }
 

iOSClient/Offline/NCOffline.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>

iOSClient/Recent/NCRecent.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>

iOSClient/Shares/NCShares.storyboard

@@ -43,20 +43,11 @@
                     </view>
                     <connections>
                         <outlet property="collectionView" destination="Zaz-Cl-qpZ" id="8oA-Gx-z7T"/>
-                        <segue destination="rIl-hI-jAh" kind="showDetail" identifier="segueDetail" id="MHI-ti-PGq"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="JJ0-Le-6eT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="256.80000000000001" y="228.32512315270938"/>
         </scene>
-        <!--NCDetail-->
-        <scene sceneID="D5y-IR-BuC">
-            <objects>
-                <viewControllerPlaceholder storyboardName="NCDetail" referencedIdentifier="NCDetail" id="rIl-hI-jAh" sceneMemberID="viewController"/>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eCA-Ct-z68" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1080" y="228"/>
-        </scene>
     </scenes>
 </document>