new class browserweb

Nextcloud.xcodeproj/project.pbxproj

@@ -102,7 +102,6 @@
 		F732BA061D76CE1500E9878B /* CCNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F732BA041D76CE1500E9878B /* CCNetworking.m */; };
 		F732BA0B1D76DBA500E9878B /* CCNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = F732BA041D76CE1500E9878B /* CCNetworking.m */; };
 		F733B65221997CC2001C1FFA /* TLPhotoPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F733B65121997CC1001C1FFA /* TLPhotoPicker.framework */; };
-		F734A8BF21B59137009DE2E8 /* WKCookieWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F734A8BE21B59137009DE2E8 /* WKCookieWebView.swift */; };
 		F7362A1F220C853A005101B5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7362A1E220C853A005101B5 /* LaunchScreen.storyboard */; };
 		F7381EE1218218C9000B1560 /* NCOffline.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7381EDA218218C9000B1560 /* NCOffline.swift */; };
 		F7381EE5218218C9000B1560 /* NCOffline.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7381EDE218218C9000B1560 /* NCOffline.storyboard */; };
@@ -427,15 +426,11 @@
 		F7A377161EB2364A002856D3 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7A377141EB2364A002856D3 /* Crashlytics.framework */; };
 		F7A3771A1EB2364A002856D3 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7A377151EB2364A002856D3 /* Fabric.framework */; };
 		F7AE00F5230D5F9E007ACF8A /* NCLoginWeb.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7AE00F4230D5F9E007ACF8A /* NCLoginWeb.swift */; };
+		F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7AE00F7230E81CB007ACF8A /* NCBrowserWeb.swift */; };
+		F7AE00FA230E81EB007ACF8A /* NCBrowserWeb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7AE00F9230E81EB007ACF8A /* NCBrowserWeb.storyboard */; };
 		F7B0C0CD1EE7E7750033AC24 /* CCSynchronize.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B0C0CC1EE7E7750033AC24 /* CCSynchronize.m */; };
 		F7B0C1751EE839A30033AC24 /* NCAutoUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B0C1741EE839A30033AC24 /* NCAutoUpload.m */; };
 		F7B174C822FAC0A8000B7579 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B174C722FAC0A8000B7579 /* AppDelegate.m */; };
-		F7B1FBC41E72E3D1001781FE /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7B1FBB11E72E3D1001781FE /* Media.xcassets */; };
-		F7B1FBC61E72E3D1001781FE /* SwiftModalWebVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */; };
-		F7B1FBC71E72E3D1001781FE /* SwiftWebVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B1FBC01E72E3D1001781FE /* SwiftWebVC.swift */; };
-		F7B1FBC81E72E3D1001781FE /* SwiftWebVCActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B1FBC11E72E3D1001781FE /* SwiftWebVCActivity.swift */; };
-		F7B1FBC91E72E3D1001781FE /* SwiftWebVCActivityChrome.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B1FBC21E72E3D1001781FE /* SwiftWebVCActivityChrome.swift */; };
-		F7B1FBCA1E72E3D1001781FE /* SwiftWebVCActivitySafari.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B1FBC31E72E3D1001781FE /* SwiftWebVCActivitySafari.swift */; };
 		F7B2DEF01F976854007CF4D2 /* NYMnemonic.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B2DEEF1F976785007CF4D2 /* NYMnemonic.m */; };
 		F7B2DEF11F976859007CF4D2 /* english.txt in Resources */ = {isa = PBXBuildFile; fileRef = F7B2DEED1F976785007CF4D2 /* english.txt */; };
 		F7B4F1CB1F44356F00B53B42 /* NCUchardet.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B4F1C81F44356F00B53B42 /* NCUchardet.m */; };
@@ -774,7 +769,6 @@
 		F732BA031D76CE1500E9878B /* CCNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNetworking.h; sourceTree = "<group>"; };
 		F732BA041D76CE1500E9878B /* CCNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNetworking.m; sourceTree = "<group>"; };
 		F733B65121997CC1001C1FFA /* TLPhotoPicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TLPhotoPicker.framework; path = Carthage/Build/iOS/TLPhotoPicker.framework; sourceTree = "<group>"; };
-		F734A8BE21B59137009DE2E8 /* WKCookieWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKCookieWebView.swift; sourceTree = "<group>"; };
 		F7362A1E220C853A005101B5 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		F7381EDA218218C9000B1560 /* NCOffline.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCOffline.swift; sourceTree = "<group>"; };
 		F7381EDE218218C9000B1560 /* NCOffline.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCOffline.storyboard; sourceTree = "<group>"; };
@@ -1234,18 +1228,14 @@
 		F7ACE4301BAC0268006C0017 /* CCSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSettings.h; sourceTree = "<group>"; };
 		F7ACE4311BAC0268006C0017 /* CCSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSettings.m; sourceTree = "<group>"; };
 		F7AE00F4230D5F9E007ACF8A /* NCLoginWeb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCLoginWeb.swift; sourceTree = "<group>"; };
+		F7AE00F7230E81CB007ACF8A /* NCBrowserWeb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCBrowserWeb.swift; sourceTree = "<group>"; };
+		F7AE00F9230E81EB007ACF8A /* NCBrowserWeb.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCBrowserWeb.storyboard; sourceTree = "<group>"; };
 		F7B0C0CB1EE7E7750033AC24 /* CCSynchronize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSynchronize.h; sourceTree = "<group>"; };
 		F7B0C0CC1EE7E7750033AC24 /* CCSynchronize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCSynchronize.m; sourceTree = "<group>"; };
 		F7B0C1731EE839A30033AC24 /* NCAutoUpload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCAutoUpload.h; sourceTree = "<group>"; };
 		F7B0C1741EE839A30033AC24 /* NCAutoUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NCAutoUpload.m; sourceTree = "<group>"; };
 		F7B174C722FAC0A8000B7579 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		F7B1A7761EBB3C8000BFB6D1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		F7B1FBB11E72E3D1001781FE /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
-		F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftModalWebVC.swift; sourceTree = "<group>"; };
-		F7B1FBC01E72E3D1001781FE /* SwiftWebVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftWebVC.swift; sourceTree = "<group>"; };
-		F7B1FBC11E72E3D1001781FE /* SwiftWebVCActivity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftWebVCActivity.swift; sourceTree = "<group>"; };
-		F7B1FBC21E72E3D1001781FE /* SwiftWebVCActivityChrome.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftWebVCActivityChrome.swift; sourceTree = "<group>"; };
-		F7B1FBC31E72E3D1001781FE /* SwiftWebVCActivitySafari.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftWebVCActivitySafari.swift; sourceTree = "<group>"; };
 		F7B2DEED1F976785007CF4D2 /* english.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = english.txt; sourceTree = "<group>"; };
 		F7B2DEEE1F976785007CF4D2 /* NYMnemonic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYMnemonic.h; sourceTree = "<group>"; };
 		F7B2DEEF1F976785007CF4D2 /* NYMnemonic.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYMnemonic.m; sourceTree = "<group>"; };
@@ -2479,6 +2469,15 @@
 			path = Settings;
 			sourceTree = "<group>";
 		};
+		F7AE00F6230E8191007ACF8A /* BrowserWeb */ = {
+			isa = PBXGroup;
+			children = (
+				F7AE00F7230E81CB007ACF8A /* NCBrowserWeb.swift */,
+				F7AE00F9230E81EB007ACF8A /* NCBrowserWeb.storyboard */,
+			);
+			path = BrowserWeb;
+			sourceTree = "<group>";
+		};
 		F7B0C0CA1EE7E7750033AC24 /* Synchronize */ = {
 			isa = PBXGroup;
 			children = (
@@ -2497,28 +2496,6 @@
 			path = AutoUpload;
 			sourceTree = "<group>";
 		};
-		F7B1FBAF1E72E3D1001781FE /* SwiftWebVC */ = {
-			isa = PBXGroup;
-			children = (
-				F7B1FBB01E72E3D1001781FE /* Resources */,
-				F734A8BE21B59137009DE2E8 /* WKCookieWebView.swift */,
-				F7B1FBC01E72E3D1001781FE /* SwiftWebVC.swift */,
-				F7B1FBBF1E72E3D1001781FE /* SwiftModalWebVC.swift */,
-				F7B1FBC11E72E3D1001781FE /* SwiftWebVCActivity.swift */,
-				F7B1FBC21E72E3D1001781FE /* SwiftWebVCActivityChrome.swift */,
-				F7B1FBC31E72E3D1001781FE /* SwiftWebVCActivitySafari.swift */,
-			);
-			path = SwiftWebVC;
-			sourceTree = "<group>";
-		};
-		F7B1FBB01E72E3D1001781FE /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				F7B1FBB11E72E3D1001781FE /* Media.xcassets */,
-			);
-			path = Resources;
-			sourceTree = "<group>";
-		};
 		F7B2DEEB1F976785007CF4D2 /* NYMnemonic */ = {
 			isa = PBXGroup;
 			children = (
@@ -2863,7 +2840,6 @@
 				F7B4F1C51F44356F00B53B42 /* NCUchardet */,
 				F760F75621F21F61006B1A73 /* PhotoEditor */,
 				F762CB7B1EACB81000B38484 /* REMenu */,
-				F7B1FBAF1E72E3D1001781FE /* SwiftWebVC */,
 				F762CB8B1EACB84400B38484 /* TWMessageBarManager */,
 				F762CB1C1EACB7D400B38484 /* VFR Pdf Reader */,
 				F762CA9F1EACB66200B38484 /* XLForm */,
@@ -2963,6 +2939,7 @@
 				F7A321621E9E37960069AD1B /* Activity */,
 				F7E0E1DA22327885006B0911 /* AudioRecorder */,
 				F7B0C1701EE8397E0033AC24 /* AutoUpload */,
+				F7AE00F6230E8191007ACF8A /* BrowserWeb */,
 				F7BAAD951ED5A63D00B7EAD4 /* Database */,
 				F7A3214D1E9E2A070069AD1B /* Favorites */,
 				F7D7B0D52245377800E6FE36 /* Imagemeter */,
@@ -3327,7 +3304,6 @@
 				F7D423401F0596AC009C9782 /* Reader-Email@3x.png in Resources */,
 				F7D423391F0596AC009C9782 /* Reader-Button-H@2x.png in Resources */,
 				F7D423351F0596AC009C9782 /* AppIcon-152.png in Resources */,
-				F7B1FBC41E72E3D1001781FE /* Media.xcassets in Resources */,
 				F78F74342163757000C2ADAD /* NCTrash.storyboard in Resources */,
 				F7D4234E1F0596AC009C9782 /* Reader-Thumbs@2x.png in Resources */,
 				F760F78521F21F61006B1A73 /* EmojiCollectionViewCell.xib in Resources */,
@@ -3416,6 +3392,7 @@
 				F7D423491F0596AC009C9782 /* Reader-Mark-Y@3x.png in Resources */,
 				F7D423421F0596AC009C9782 /* Reader-Export@2x.png in Resources */,
 				F73CB3B222E072A000AD728E /* NCShareHeaderView.xib in Resources */,
+				F7AE00FA230E81EB007ACF8A /* NCBrowserWeb.storyboard in Resources */,
 				F7F54CE91E5B14C700E19C62 /* ImageSelectedOff@2x.png in Resources */,
 				F77B0F8A1D118A16002130FE /* CCCellMain.xib in Resources */,
 				F78ACD58219048040088454D /* NCSectionHeaderMenu.xib in Resources */,
@@ -3641,6 +3618,7 @@
 				F760F78221F21F61006B1A73 /* PhotoEditor+UITextView.swift in Sources */,
 				F77444F522281649000D5EB0 /* NCGridMediaCell.swift in Sources */,
 				F77B0DF41D118A16002130FE /* CCMain.m in Sources */,
+				F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */,
 				F7E9C41B20F4CA870040CF18 /* CCTransfers.m in Sources */,
 				F73B4F0D1F470D9100BBEE4B /* nsLatin1Prober.cpp in Sources */,
 				F77B0DF51D118A16002130FE /* CCUtility.m in Sources */,
@@ -3671,7 +3649,6 @@
 				F7F54D061E5B14C800E19C62 /* MWCaptionView.m in Sources */,
 				F762CB001EACB66200B38484 /* XLFormSegmentedCell.m in Sources */,
 				F732BA061D76CE1500E9878B /* CCNetworking.m in Sources */,
-				F7B1FBC71E72E3D1001781FE /* SwiftWebVC.swift in Sources */,
 				F7D423801F0596C6009C9782 /* ReaderMainPagebar.m in Sources */,
 				F762CB061EACB66200B38484 /* XLFormTextViewCell.m in Sources */,
 				F78ACD4221903CE00088454D /* NCListCell.swift in Sources */,
@@ -3682,7 +3659,6 @@
 				F73F537F1E929C8500F8678D /* CCMore.swift in Sources */,
 				F73B4EF71F470D9100BBEE4B /* LangBulgarianModel.cpp in Sources */,
 				F7F54D0C1E5B14C800E19C62 /* MWTapDetectingView.m in Sources */,
-				F7B1FBC61E72E3D1001781FE /* SwiftModalWebVC.swift in Sources */,
 				F7FB1D3E215E191D00D669EA /* NCViewerDocumentWeb.swift in Sources */,
 				F78E7065219F096B006F23E4 /* NCAvatar.swift in Sources */,
 				F7DFB7F0219C5B8000680748 /* NCCreateFormUploadAssets.swift in Sources */,
@@ -3715,7 +3691,6 @@
 				F762CB111EACB66200B38484 /* NSString+XLFormAdditions.m in Sources */,
 				F762CB9B1EACB84400B38484 /* TWMessageBarManager.m in Sources */,
 				F7D423871F0596C6009C9782 /* ReaderThumbsView.m in Sources */,
-				F7B1FBCA1E72E3D1001781FE /* SwiftWebVCActivitySafari.swift in Sources */,
 				F7DFB7EB219C5A2E00680748 /* NCCreateMenuAdd.swift in Sources */,
 				F7F54D0A1E5B14C800E19C62 /* MWPhotoBrowser.m in Sources */,
 				F762CB081EACB66200B38484 /* XLFormOptionsViewController.m in Sources */,
@@ -3809,7 +3784,6 @@
 				F73B4EF51F470D9100BBEE4B /* JpCntx.cpp in Sources */,
 				F78071091EDAB65800EAFFF6 /* NSNotificationCenter+MainThread.m in Sources */,
 				F76B3CCE1EAE01BD00921AC9 /* NCBrand.swift in Sources */,
-				F7B1FBC91E72E3D1001781FE /* SwiftWebVCActivityChrome.swift in Sources */,
 				F762CB8A1EACB81000B38484 /* REMenuItemView.m in Sources */,
 				F7BF1B431D51E893000854F6 /* CCLogin.m in Sources */,
 				F760F79821F21F61006B1A73 /* StickerCollectionViewCell.swift in Sources */,
@@ -3825,7 +3799,6 @@
 				F72AAECB1E5C60C700BB17E1 /* AHKActionSheetViewController.m in Sources */,
 				F760F79B21F21F61006B1A73 /* ColorCollectionViewCell.swift in Sources */,
 				F77B0E921D118A16002130FE /* CCCellMainTransfer.m in Sources */,
-				F7B1FBC81E72E3D1001781FE /* SwiftWebVCActivity.swift in Sources */,
 				F77B0E981D118A16002130FE /* CCManageAccount.m in Sources */,
 				F762CB011EACB66200B38484 /* XLFormSelectorCell.m in Sources */,
 				F755BD9B20594AC7008C5FBB /* NCService.swift in Sources */,
@@ -3848,7 +3821,6 @@
 				F762CAF71EACB66200B38484 /* XLFormBaseCell.m in Sources */,
 				F760F78A21F21F61006B1A73 /* UIImage+Size.swift in Sources */,
 				F70022B31EC4C9100080073F /* OCActivity.m in Sources */,
-				F734A8BF21B59137009DE2E8 /* WKCookieWebView.swift in Sources */,
 				F7D7B0D42245271100E6FE36 /* IMImagemeter.swift in Sources */,
 				F70022D41EC4C9100080073F /* NSDate+ISO8601.m in Sources */,
 				F762CB151EACB66200B38484 /* XLFormRowNavigationAccessoryView.m in Sources */,

iOSClient/AppDelegate.m

@@ -36,7 +36,7 @@
 
 @class NCViewerRichdocument;
 
-@interface AppDelegate () <UNUserNotificationCenterDelegate, CCLoginDelegate, NCLoginDelegateWeb>
+@interface AppDelegate () <UNUserNotificationCenterDelegate, CCLoginDelegate, NCLoginWebDelegate>
 {
 PKPushRegistry *pushRegistry;
 }

iOSClient/Brand/Intro/CCIntro.m

@@ -25,7 +25,9 @@
 #import "AppDelegate.h"
 #import "NCBridgeSwift.h"
 
-@interface CCIntro () <SwiftModalWebVCDelegate>
+@class NCBrowserWeb;
+
+@interface CCIntro ()
 {
     int titlePositionY;
     int titleIconPositionY;
@@ -252,23 +254,12 @@
 - (void)host:(id)sender
 {
     AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+
+    NCBrowserWeb *browserWebVC = [[UIStoryboard storyboardWithName:@"NCBrowserWeb" bundle:nil] instantiateInitialViewController];
     
-    SwiftModalWebVC *webVC = [[SwiftModalWebVC alloc] initWithUrlString:[NCBrandOptions sharedInstance].linkLoginHost colorText:[UIColor whiteColor] colorDoneButton:[UIColor blackColor] doneButtonVisible:YES hideToolbar:NO];
-    webVC.delegateWeb = self;
+    browserWebVC.urlBase = [NCBrandOptions sharedInstance].linkLoginHost;
     
-    [appDelegate.window.rootViewController presentViewController:webVC animated:YES completion:nil];
-}
-- (void)didStartLoading
-{
-}
-- (void)didReceiveServerRedirectForProvisionalNavigationWithUrl:(NSURL *)url
-{
-}
-- (void)didFinishLoadingWithSuccess:(BOOL)success url:(NSURL *)url
-{
-}
-- (void)webDismiss
-{
+    [appDelegate.window.rootViewController presentViewController:browserWebVC animated:YES completion:nil];
 }
 
 @end

iOSClient/BrowserWeb/NCBrowserWeb.storyboard

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="OOi-qQ-BCK">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Browser Web-->
+        <scene sceneID="qXu-Mk-wdV">
+            <objects>
+                <viewController id="OOi-qQ-BCK" customClass="NCBrowserWeb" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Aai-ip-ntL">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lht-2f-Ep4">
+                                <rect key="frame" x="374" y="54" width="30" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="ckh-Eb-Ze8"/>
+                                    <constraint firstAttribute="width" constant="30" id="oHS-Ba-9eq"/>
+                                </constraints>
+                                <state key="normal" image="exit"/>
+                                <connections>
+                                    <action selector="touchUpInsideButtonExit:" destination="OOi-qQ-BCK" eventType="touchUpInside" id="hcA-Hb-TJd"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="Lht-2f-Ep4" firstAttribute="top" secondItem="fTU-bd-6qR" secondAttribute="top" constant="10" id="Qy7-ho-gnO"/>
+                            <constraint firstItem="fTU-bd-6qR" firstAttribute="trailing" secondItem="Lht-2f-Ep4" secondAttribute="trailing" constant="10" id="ysf-ri-C7p"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="fTU-bd-6qR"/>
+                    </view>
+                    <connections>
+                        <outlet property="buttonExit" destination="Lht-2f-Ep4" id="dsx-PX-MaQ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4JZ-dx-ros" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4511.594202898551" y="-1210.0446428571429"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="exit" width="300" height="300"/>
+    </resources>
+</document>

iOSClient/BrowserWeb/NCBrowserWeb.swift

@@ -0,0 +1,88 @@
+//
+//  NCBrowserWeb.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 22/08/2019.
+//  Copyright © 2019 TWS. All rights reserved.
+//
+
+import Foundation
+
+@objc protocol NCBrowserWebDelegate: class {
+    @objc optional func browserWebDismiss()
+}
+
+class NCBrowserWeb: UIViewController {
+    
+    var webView: WKWebView?
+    let appDelegate = UIApplication.shared.delegate as! AppDelegate
+    
+    @objc var urlBase = ""
+    @objc weak var delegate: NCBrowserWebDelegate?
+    
+    @IBOutlet weak var buttonExit: UIButton!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        webView = WKWebView(frame: CGRect.zero)
+        webView!.navigationDelegate = self
+        view.addSubview(webView!)
+        webView!.translatesAutoresizingMaskIntoConstraints = false
+        webView!.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
+        webView!.rightAnchor.constraint(equalTo: view.rightAnchor, constant: 0).isActive = true
+        webView!.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+        webView!.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
+        
+        // button exit
+        self.view.bringSubviewToFront(buttonExit)
+        
+        loadWebPage(webView: webView!, url: URL(string: urlBase)!)
+    }
+    
+    func loadWebPage(webView: WKWebView, url: URL)  {
+        
+        let language = NSLocale.preferredLanguages[0] as String
+        var request = URLRequest(url: url)
+        
+        request.setValue(CCUtility.getUserAgent(), forHTTPHeaderField: "User-Agent")
+        request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
+        request.addValue(language, forHTTPHeaderField: "Accept-Language")
+        
+        webView.load(request)
+    }
+    
+    @IBAction func touchUpInsideButtonExit(_ sender: UIButton) {
+        self.dismiss(animated: true) {
+            self.delegate?.browserWebDismiss?()
+        }
+    }
+}
+
+extension NCBrowserWeb: WKNavigationDelegate {
+    
+   
+    public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+        if let serverTrust = challenge.protectionSpace.serverTrust {
+            completionHandler(Foundation.URLSession.AuthChallengeDisposition.useCredential, URLCredential(trust: serverTrust))
+        } else {
+            completionHandler(URLSession.AuthChallengeDisposition.useCredential, nil);
+        }
+    }
+    
+    public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+        decisionHandler(.allow)
+    }
+    
+    public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+        print("didStartProvisionalNavigation");
+    }
+    
+    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        print("didFinishProvisionalNavigation");
+    }
+    
+    public func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
+        print("didReceiveServerRedirectForProvisionalNavigation");
+    }
+}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivityChrome-iPad.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivityChrome-iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivityChrome-iPad@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivityChrome.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivityChrome@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivitySafari-iPad.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivitySafari-iPad.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivitySafari-iPad@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCActivitySafari.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCActivitySafari@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCBack.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCBack.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCBack@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCDismiss.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCDismiss.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCDismiss@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/Resources/Media.xcassets/SwiftWebVCNext.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCNext.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "SwiftWebVCNext@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

@@ -1,98 +0,0 @@
-//
-//  SwiftModalWebVC.swift
-//
-//  Created by Myles Ringle on 24/06/2015.
-//  Transcribed from code used in SVWebViewController.
-//  Copyright (c) 2015 Myles Ringle & Oliver Letterer. All rights reserved.
-//
-
-import UIKit
-
-@objc public protocol SwiftModalWebVCDelegate: class {
-    @objc func didStartLoading()
-    @objc func didReceiveServerRedirectForProvisionalNavigation(url: URL)
-    @objc func didFinishLoading(success: Bool, url: URL)
-    @objc func webDismiss()
-}
-
-public class SwiftModalWebVC: UINavigationController {
-    
-    @objc public weak var delegateWeb: SwiftModalWebVCDelegate?
-    
-    weak var webViewDelegate: UIWebViewDelegate? = nil
-    
-    @objc public convenience init(urlString: String, colorText: UIColor, colorDoneButton: UIColor, doneButtonVisible: Bool, hideToolbar: Bool = false) {
-        let url = URL(string: urlString)!
-        self.init(request: URLRequest(url: url), colorText: colorText, colorDoneButton: colorDoneButton, doneButtonVisible: doneButtonVisible, hideToolbar: hideToolbar)
-    }
-    
-    public init(request: URLRequest, colorText: UIColor = UIColor.white, colorDoneButton: UIColor = UIColor.black, doneButtonVisible: Bool = false, hideToolbar: Bool = false) {
-        
-        let webViewController = SwiftWebVC(aRequest: request, hideToolbar: hideToolbar)
-        webViewController.storedStatusColor = UINavigationBar.appearance().barStyle
-        
-        super.init(rootViewController: webViewController)
-
-        let doneButton = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCDismiss"), style: UIBarButtonItem.Style.plain, target: webViewController, action: #selector(SwiftWebVC.doneButtonTapped))
-    
-        doneButton.tintColor = colorDoneButton
-        webViewController.buttonColor = colorText
-        webViewController.titleColor = colorText
-        webViewController.view.backgroundColor = UIColor.clear
-        
-        UINavigationBar.appearance().barStyle = UIBarStyle.default
-        
-        if (doneButtonVisible == true) {
-            if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) {
-                webViewController.navigationItem.leftBarButtonItem = doneButton
-            }
-            else {
-                webViewController.navigationItem.rightBarButtonItem = doneButton
-            }
-        }
-        webViewController.delegate = self
-    }
-    
-    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
-        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-    }
-    
-    required public init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override public func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(false)
-    }
-    
-    public override func viewWillDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-    }
-
-    public override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-    }
-}
-
-extension SwiftModalWebVC: SwiftWebVCDelegate {
-    
-    public func didStartLoading() {
-        self.delegateWeb?.didStartLoading()
-    }
-    
-    public func didReceiveServerRedirectForProvisionalNavigation(url: URL) {
-        self.delegateWeb?.didReceiveServerRedirectForProvisionalNavigation(url: url)
-    }
-    
-    public func didFinishLoading(success: Bool) {
-        //print("Finished loading. Success: \(success).")
-    }
-    
-    public func didFinishLoading(success: Bool, url: URL) {
-        self.delegateWeb?.didFinishLoading(success: success, url: url)
-    }
-    
-    public func webDismiss() {
-        self.delegateWeb?.webDismiss()
-    }
-}

iOSClient/Library/SwiftWebVC/SwiftWebVC.swift

@@ -1,380 +0,0 @@
-//
-//  SwiftWebVC.swift
-//
-//  Created by Myles Ringle on 24/06/2015.
-//  Transcribed from code used in SVWebViewController.
-//  Copyright (c) 2015 Myles Ringle & Sam Vermette. All rights reserved.
-//
-
-import WebKit
-
-public protocol SwiftWebVCDelegate: class {
-    func didStartLoading()
-    func didReceiveServerRedirectForProvisionalNavigation(url: URL)
-    func didFinishLoading(success: Bool)
-    func didFinishLoading(success: Bool, url: URL)
-    func webDismiss()
-}
-
-public class SwiftWebVC: UIViewController {
-    
-    public weak var delegate: SwiftWebVCDelegate?
-    var storedStatusColor: UIBarStyle?
-    var buttonColor: UIColor? = nil
-    var titleColor: UIColor? = nil
-    var closing: Bool! = false
-    
-    lazy var backBarButtonItem: UIBarButtonItem =  {
-        var tempBackBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCBack"),
-                                                    style: UIBarButtonItem.Style.plain,
-                                                    target: self,
-                                                    action: #selector(SwiftWebVC.goBackTapped(_:)))
-        tempBackBarButtonItem.width = 18.0
-        tempBackBarButtonItem.tintColor = self.buttonColor
-        return tempBackBarButtonItem
-    }()
-    
-    lazy var forwardBarButtonItem: UIBarButtonItem =  {
-        var tempForwardBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCNext"),
-                                                       style: UIBarButtonItem.Style.plain,
-                                                       target: self,
-                                                       action: #selector(SwiftWebVC.goForwardTapped(_:)))
-        tempForwardBarButtonItem.width = 18.0
-        tempForwardBarButtonItem.tintColor = self.buttonColor
-        return tempForwardBarButtonItem
-    }()
-    
-    lazy var refreshBarButtonItem: UIBarButtonItem = {
-        var tempRefreshBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.refresh,
-                                                       target: self,
-                                                       action: #selector(SwiftWebVC.reloadTapped(_:)))
-        tempRefreshBarButtonItem.tintColor = self.buttonColor
-        return tempRefreshBarButtonItem
-    }()
-    
-    lazy var stopBarButtonItem: UIBarButtonItem = {
-        var tempStopBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.stop,
-                                                    target: self,
-                                                    action: #selector(SwiftWebVC.stopTapped(_:)))
-        tempStopBarButtonItem.tintColor = self.buttonColor
-        return tempStopBarButtonItem
-    }()
-    
-    lazy var actionBarButtonItem: UIBarButtonItem = {
-        var tempActionBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.action,
-                                                      target: self,
-                                                      action: #selector(SwiftWebVC.actionButtonTapped(_:)))
-        tempActionBarButtonItem.tintColor = self.buttonColor
-        return tempActionBarButtonItem
-    }()
-    
-    
-    lazy var webView: WKWebView = {
-        let config = WKWebViewConfiguration()
-        config.websiteDataStore = WKWebsiteDataStore.nonPersistent()
-        var tempWebView = WKWebView(frame: UIScreen.main.bounds, configuration: config)
-        tempWebView.uiDelegate = self
-        tempWebView.navigationDelegate = self
-        return tempWebView;
-    }()
-    
-    /*
-    lazy var webView: WKCookieWebView = {
-        var tempWebView = WKCookieWebView(frame: UIScreen.main.bounds, configuration: WKWebViewConfiguration(), useRedirectCookieHandling: true)
-        tempWebView.uiDelegate = self
-        tempWebView.navigationDelegate = self
-        return tempWebView;
-    }()
-    */
-    
-    var request: URLRequest!
-    
-    var navBarTitle: UILabel!
-    
-    var hideToolbar = false
-    
-    ////////////////////////////////////////////////
-    
-    deinit {
-        webView.stopLoading()
-        UIApplication.shared.isNetworkActivityIndicatorVisible = false
-        webView.uiDelegate = nil;
-        webView.navigationDelegate = nil;
-    }
-    
-    public convenience init(urlString: String, hideToolbar: Bool) {
-        self.init(pageURL: URL(string: urlString)!, hideToolbar: hideToolbar)
-    }
-    
-    public convenience init(pageURL: URL, hideToolbar: Bool) {
-        self.init(aRequest: URLRequest(url: pageURL), hideToolbar: hideToolbar)
-    }
-    
-    public convenience init(aRequest: URLRequest, hideToolbar: Bool) {
-        self.init()
-        self.request = aRequest
-        self.hideToolbar = hideToolbar
-    }
-    
-    ////////////////////////////////////////////////
-    // View Lifecycle
-    
-    override public func loadView() {
-        view = webView
-        let language = NSLocale.preferredLanguages[0] as String        
-        request.setValue(CCUtility.getUserAgent(), forHTTPHeaderField: "User-Agent")
-        request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
-        request.addValue(language, forHTTPHeaderField: "Accept-Language")
-        _ = webView.load(request)
-    }
-    
-    override public func viewDidLoad() {
-        super.viewDidLoad()
-        updateToolbarItems()
-    }
-    
-    override public func viewWillAppear(_ animated: Bool) {
-        assert(self.navigationController != nil, "SVWebViewController needs to be contained in a UINavigationController. If you are presenting SVWebViewController modally, use SVModalWebViewController instead.")
-        
-        navBarTitle = UILabel()
-        navBarTitle.backgroundColor = UIColor.clear
-        if presentingViewController == nil {
-            if let titleAttributes = navigationController!.navigationBar.titleTextAttributes {
-                navBarTitle.textColor = titleAttributes[NSAttributedString.Key.foregroundColor] as? UIColor //[titleAttributes:"NSColor"] // ["NSColor"] as! UIColor
-            }
-        }
-        else {
-            navBarTitle.textColor = self.titleColor
-        }
-        navBarTitle.shadowOffset = CGSize(width: 0, height: 1);
-        navBarTitle.font = UIFont(name: "HelveticaNeue-Medium", size: 17.0)
-        
-        navigationItem.titleView = navBarTitle;
-        
-        super.viewWillAppear(true)
-        
-        if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.phone) {
-            self.navigationController?.setToolbarHidden(false, animated: false)
-        }
-        else if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) {
-            self.navigationController?.setToolbarHidden(true, animated: true)
-        }
-        
-        self.navigationController?.setToolbarHidden(hideToolbar, animated: false)
-    }
-    
-    override public func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(true)
-        
-        if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.phone) {
-            self.navigationController?.setToolbarHidden(true, animated: true)
-        }
-    }
-    
-    override public func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(true)
-        UIApplication.shared.isNetworkActivityIndicatorVisible = false
-    }
-    
-    override public func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
-        super.dismiss(animated: flag, completion: {
-            self.delegate?.webDismiss()
-        })        
-    }
-    
-    
-    ////////////////////////////////////////////////
-    // Toolbar
-    
-    func updateToolbarItems() {
-        
-        backBarButtonItem.isEnabled = webView.canGoBack
-        forwardBarButtonItem.isEnabled = webView.canGoForward
-        
-        
-        let refreshStopBarButtonItem: UIBarButtonItem = webView.isLoading ? stopBarButtonItem : refreshBarButtonItem
-        
-        let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.fixedSpace, target: nil, action: nil)
-        let flexibleSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.flexibleSpace, target: nil, action: nil)
-        
-        if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) {
-            
-            let toolbarWidth: CGFloat = 250.0
-            fixedSpace.width = 35.0
-            
-            let items: NSArray = [fixedSpace, refreshStopBarButtonItem, fixedSpace, backBarButtonItem, fixedSpace, forwardBarButtonItem, fixedSpace, actionBarButtonItem]
-            
-            let toolbar: UIToolbar = UIToolbar(frame: CGRect(x: 0.0, y: 0.0, width: toolbarWidth, height: 44.0))
-            if !closing {
-                toolbar.items = items as? [UIBarButtonItem]
-                if presentingViewController == nil {
-                    toolbar.barTintColor = navigationController?.navigationBar.barTintColor
-                }
-                else {
-                    toolbar.barStyle = (navigationController?.navigationBar.barStyle)!
-                }
-                toolbar.tintColor = navigationController?.navigationBar.tintColor
-            }
-            navigationItem.rightBarButtonItems = items.reverseObjectEnumerator().allObjects as? [UIBarButtonItem]
-            
-        }
-        else {
-            let items: NSArray = [fixedSpace, backBarButtonItem, flexibleSpace, forwardBarButtonItem, flexibleSpace, refreshStopBarButtonItem, flexibleSpace, actionBarButtonItem, fixedSpace]
-            
-            if !closing {
-                if presentingViewController == nil {
-                    navigationController?.toolbar.barTintColor = navigationController?.navigationBar.barTintColor
-                }
-                else {
-                    navigationController?.toolbar.barStyle = (navigationController?.navigationBar.barStyle)!
-                }
-                navigationController?.toolbar.tintColor = navigationController?.navigationBar.tintColor
-                toolbarItems = items as? [UIBarButtonItem]
-            }
-        }
-    }
-    
-    
-    ////////////////////////////////////////////////
-    // Target Actions
-    
-    @objc func goBackTapped(_ sender: UIBarButtonItem) {
-        webView.goBack()
-    }
-    
-    @objc func goForwardTapped(_ sender: UIBarButtonItem) {
-        webView.goForward()
-    }
-    
-    @objc func reloadTapped(_ sender: UIBarButtonItem) {
-        webView.reload()
-    }
-    
-    @objc func stopTapped(_ sender: UIBarButtonItem) {
-        webView.stopLoading()
-        updateToolbarItems()
-    }
-    
-    @objc func actionButtonTapped(_ sender: AnyObject) {
-        
-        if let url: URL = ((webView.url != nil) ? webView.url : request.url) {
-            let activities: NSArray = [SwiftWebVCActivitySafari(), SwiftWebVCActivityChrome()]
-            
-            if url.absoluteString.hasPrefix("file:///") {
-                let dc: UIDocumentInteractionController = UIDocumentInteractionController(url: url)
-                dc.presentOptionsMenu(from: view.bounds, in: view, animated: true)
-            }
-            else {
-                let activityController: UIActivityViewController = UIActivityViewController(activityItems: [url], applicationActivities: activities as? [UIActivity])
-                
-                if floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_7_1 && UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad {
-                    let ctrl: UIPopoverPresentationController = activityController.popoverPresentationController!
-                    ctrl.sourceView = view
-                    ctrl.barButtonItem = sender as? UIBarButtonItem
-                }
-                
-                present(activityController, animated: true, completion: nil)
-            }
-        }
-    }
-    
-    ////////////////////////////////////////////////
-    
-    @objc func doneButtonTapped() {
-        closing = true
-        UINavigationBar.appearance().barStyle = storedStatusColor!
-        self.dismiss(animated: true, completion: nil)
-    }
-
-    // MARK: - Class Methods
-
-    /// Helper function to get image within SwiftWebVCResources bundle
-    ///
-    /// - parameter named: The name of the image in the SwiftWebVCResources bundle
-    class func bundledImage(named: String) -> UIImage? {
-        let image = UIImage(named: named)
-        if image == nil {
-            return UIImage(named: named, in: Bundle(for: SwiftWebVC.classForCoder()), compatibleWith: nil)
-        } // Replace MyBasePodClass with yours
-        return image
-    }
-    
-}
-
-extension SwiftWebVC: WKUIDelegate {
-    
-    // Add any desired WKUIDelegate methods here: https://developer.apple.com/reference/webkit/wkuidelegate
-    
-}
-
-extension SwiftWebVC: WKNavigationDelegate {
-    
-    public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        self.delegate?.didStartLoading()
-        UIApplication.shared.isNetworkActivityIndicatorVisible = true
-        updateToolbarItems()
-    }
-    
-    public func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        self.delegate?.didReceiveServerRedirectForProvisionalNavigation(url: webView.url!)
-    }
-    
-    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        
-        self.delegate?.didFinishLoading(success: true)
-        self.delegate?.didFinishLoading(success: true, url: webView.url!)
-        UIApplication.shared.isNetworkActivityIndicatorVisible = false
-        
-        webView.evaluateJavaScript("document.title") { result, error in
-            guard let title = result as? String else { return }
-        
-            if (error == nil && self.navBarTitle != nil) {
-                self.navBarTitle.text = String(describing: title)
-                self.navBarTitle.sizeToFit()
-                self.updateToolbarItems()
-            }
-        }
-    }
-    
-    public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        guard let url = navigationAction.request.url else {
-            decisionHandler(.allow)
-            return
-        }
-        
-        if String(describing: url).hasPrefix(NCBrandOptions.sharedInstance.webLoginAutenticationProtocol) {
-            decisionHandler(.allow)
-            return
-        } else if navigationAction.request.httpMethod != "GET" || navigationAction.request.value(forHTTPHeaderField: "OCS-APIRequest") != nil {
-            decisionHandler(.allow)
-            return
-        }
-        
-        decisionHandler(.cancel)
-        
-        let language = NSLocale.preferredLanguages[0] as String
-        var request = URLRequest(url: url)
-
-        request.setValue(CCUtility.getUserAgent(), forHTTPHeaderField: "User-Agent")
-        request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
-        request.addValue(language, forHTTPHeaderField: "Accept-Language")
-        
-        webView.load(request)
-    }
-    
-    public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        self.delegate?.didFinishLoading(success: false)
-        self.delegate?.didFinishLoading(success: false, url: webView.url!)
-        UIApplication.shared.isNetworkActivityIndicatorVisible = false
-        updateToolbarItems()
-    }
-    
-    public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
-        if let serverTrust = challenge.protectionSpace.serverTrust {
-            completionHandler(Foundation.URLSession.AuthChallengeDisposition.useCredential, URLCredential(trust: serverTrust))
-        } else {
-            completionHandler(URLSession.AuthChallengeDisposition.useCredential, nil);
-        }
-    }
-    
-}

iOSClient/Library/SwiftWebVC/SwiftWebVCActivity.swift

@@ -1,46 +0,0 @@
-//
-//  SwiftWebVCActivity.swift
-//
-//  Created by Myles Ringle on 24/06/2015.
-//  Transcribed from code used in SVWebViewController.
-//  Copyright (c) 2015 Myles Ringle & Sam Vermette. All rights reserved.
-//
-
-import UIKit
-
-
-class SwiftWebVCActivity: UIActivity {
-
-    var URLToOpen: URL?
-    var schemePrefix: String?
-    
-    override var activityType : UIActivity.ActivityType? {
-        let typeArray = "\(Swift.type(of: self))".components(separatedBy: ".")
-        let type: String = typeArray[typeArray.count-1]
-        return UIActivity.ActivityType(rawValue: type)
-    }
-        
-    override var activityImage : UIImage {
-        if let type = activityType?.rawValue {
-            if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) {
-                return SwiftWebVC.bundledImage(named: "\(type)-iPad")!
-            }
-            else {
-                return SwiftWebVC.bundledImage(named: "\(type)")!
-            }
-        }
-        else{
-            assert(false, "Unknow type")
-            return UIImage()
-        }
-    }
-            
-    override func prepare(withActivityItems activityItems: [Any]) {
-        for activityItem in activityItems {
-            if activityItem is URL {
-                URLToOpen = activityItem as? URL
-            }
-        }
-    }
-
-}

iOSClient/Library/SwiftWebVC/SwiftWebVCActivityChrome.swift

@@ -1,52 +0,0 @@
-//
-//  SwiftWebVCActivityChrome.swift
-//
-//  Created by Myles Ringle on 24/06/2015.
-//  Transcribed from code used in SVWebViewController.
-//  Copyright (c) 2015 Myles Ringle & Sam Vermette. All rights reserved.
-//
-
-import UIKit
-
-class SwiftWebVCActivityChrome : SwiftWebVCActivity {
-
-    override var activityTitle : String {
-        return NSLocalizedString("Open in Chrome", tableName: "SwiftWebVC", comment: "")
-    }
-    
-    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
-        for activityItem in activityItems {
-            if activityItem is URL, UIApplication.shared.canOpenURL(URL(string: "googlechrome://")!) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    override func perform() {
-        let inputURL: URL! = URLToOpen! as URL
-        let scheme: String! = inputURL.scheme
-        
-        // Replace the URL Scheme with the Chrome equivalent.
-        var chromeScheme: String? = nil;
-        if scheme == "http" {
-            chromeScheme = "googlechrome"
-        }
-        else if scheme == "https" {
-            chromeScheme = "googlechromes"
-        }
-        
-        // Proceed only if a valid Google Chrome URI Scheme is available.
-        if chromeScheme != nil {
-            let absoluteString: NSString! = inputURL!.absoluteString as NSString
-            let rangeForScheme: NSRange! = absoluteString.range(of: ":")
-            let urlNoScheme: String! = absoluteString.substring(from: rangeForScheme.location)
-            let chromeURLString: String! = chromeScheme!+urlNoScheme
-            let chromeURL: URL! = URL(string: chromeURLString)
-            
-            // Open the URL with Chrome.
-            UIApplication.shared.open(chromeURL, options: [:], completionHandler: nil)
-        }
-    }
-    
-}

iOSClient/Library/SwiftWebVC/SwiftWebVCActivitySafari.swift

@@ -1,33 +0,0 @@
-//
-//  SwiftWebVCActivitySafari.swift
-//
-//  Created by Myles Ringle on 24/06/2015.
-//  Transcribed from code used in SVWebViewController.
-//  Copyright (c) 2015 Myles Ringle & Sam Vermette. All rights reserved.
-//
-
-import UIKit
-
-class SwiftWebVCActivitySafari : SwiftWebVCActivity {
-    
-    override var activityTitle : String {
-        return NSLocalizedString("Open in Safari", tableName: "SwiftWebVC", comment: "")
-    }
-    
-    override func canPerform(withActivityItems activityItems: [Any]) -> Bool {
-        for activityItem in activityItems {
-            if let activityItem = activityItem as? URL, UIApplication.shared.canOpenURL(activityItem) {
-                return true
-            }
-        }
-        return false
-    }
-    
-    override func perform() {
-        
-        UIApplication.shared.open(URLToOpen!, options: [ : ]) { (completed) in
-            self.activityDidFinish(completed)
-        }
-    }
-    
-}

iOSClient/Library/SwiftWebVC/WKCookieWebView.swift

@@ -1,114 +0,0 @@
-//
-//  WKCookieWebView.swift
-//
-
-
-import Foundation
-import WebKit
-
-class WKCookieWebView : WKWebView {
-
-    private let useRedirectCookieHandling: Bool
-
-    init(frame: CGRect, configuration: WKWebViewConfiguration, useRedirectCookieHandling: Bool = false) {
-        self.useRedirectCookieHandling = useRedirectCookieHandling
-        super.init(frame: frame, configuration: configuration)
-    }
-    
-    required init?(coder: NSCoder) {
-        self.useRedirectCookieHandling = false
-        super.init(coder: coder)
-    }
-
-    override func load(_ request: URLRequest) -> WKNavigation? {
-        
-        guard useRedirectCookieHandling else {
-            return super.load(request)
-        }
-
-        requestWithCookieHandling(request, success: { (newRequest , response, data) in
-            DispatchQueue.main.async {
-                self.syncCookiesInJS(for: newRequest)
-                if let data = data, let response = response {
-                    let _ = self.webViewLoad(data: data, response: response)
-                }
-            }
-        }, failure: {
-            DispatchQueue.main.async {
-                let _ = super.load(request)
-            }
-        })
-
-        return nil
-    }
-
-    private func requestWithCookieHandling(_ request: URLRequest, success: @escaping (URLRequest, HTTPURLResponse?, Data?) -> Void, failure: @escaping () -> Void) {
-        let sessionConfig = URLSessionConfiguration.default
-        let session = URLSession(configuration: sessionConfig, delegate: self, delegateQueue: nil)
-        let task = session.dataTask(with: request) { (data, response, error) in
-            if let _ = error {
-                failure()
-            } else {
-                if let response = response as? HTTPURLResponse {
-                    success(request, response, data)
-                }
-            }
-        }
-        task.resume()
-    }
-
-    private func webViewLoad(data: Data, response: URLResponse) -> WKNavigation! {
-        guard let url = response.url else {
-            return nil
-        }
-
-        let encode = response.textEncodingName ?? "utf8"
-        let mine = response.mimeType ?? "text/html"
-
-        return self.load(data, mimeType: mine, characterEncodingName: encode, baseURL: url)
-    }
-}
-
-extension WKCookieWebView {
-   
-    // MARK: - JS Cookie handling
-    private func syncCookiesInJS(for request: URLRequest? = nil) {
-        if let url = request?.url,
-            let cookies = HTTPCookieStorage.shared.cookies(for: url) {
-            let script = jsCookiesString(for: cookies)
-            let cookieScript = WKUserScript(source: script, injectionTime: .atDocumentStart, forMainFrameOnly: false)
-            self.configuration.userContentController.addUserScript(cookieScript)
-
-        } else if let cookies = HTTPCookieStorage.shared.cookies {
-            let script = jsCookiesString(for: cookies)
-            let cookieScript = WKUserScript(source: script, injectionTime: .atDocumentStart, forMainFrameOnly: false)
-            self.configuration.userContentController.addUserScript(cookieScript)
-        }
-    }
-
-    private func jsCookiesString(for cookies: [HTTPCookie]) -> String {
-        var result = ""
-        let dateFormatter = DateFormatter()
-        dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
-        dateFormatter.dateFormat = "EEE, d MMM yyyy HH:mm:ss zzz"
-
-        for cookie in cookies {
-            result += "document.cookie='\(cookie.name)=\(cookie.value); domain=\(cookie.domain); path=\(cookie.path); "
-            if let date = cookie.expiresDate {
-                result += "expires=\(dateFormatter.string(from: date)); "
-            }
-            if (cookie.isSecure) {
-                result += "secure; "
-            }
-            result += "'; "
-        }
-        return result
-    }
-}
-
-extension WKCookieWebView : URLSessionTaskDelegate {
-
-    func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
-        completionHandler(request)
-    }
-}

iOSClient/Login/CCLogin.m

@@ -27,7 +27,7 @@
 #import "NCBridgeSwift.h"
 #import "NCNetworkingEndToEnd.h"
 
-@interface CCLogin () <NCLoginDelegateWeb, NCLoginQRCodeDelegate>
+@interface CCLogin () <NCLoginWebDelegate, NCLoginQRCodeDelegate>
 {
     AppDelegate *appDelegate;
     UIView *rootView;
@@ -301,7 +301,7 @@
 }
 
 #pragma --------------------------------------------------------------------------------------------
-#pragma mark === NCLoginDelegateWeb ===
+#pragma mark === NCLoginWebDelegate ===
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)loginSuccess:(NSInteger)loginType

iOSClient/Login/NCLoginWeb.swift

@@ -21,10 +21,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-
 import Foundation
 
-@objc protocol NCLoginDelegateWeb: class {
+@objc protocol NCLoginWebDelegate: class {
     func loginSuccess(_: NSInteger)
     @objc optional func webDismiss()
 }
@@ -36,7 +35,7 @@ class NCLoginWeb: UIViewController {
 
     @objc var urlBase = ""
     @objc var loginType: Int = 0
-    @objc weak var delegate: NCLoginDelegateWeb?
+    @objc weak var delegate: NCLoginWebDelegate?
 
     @IBOutlet weak var buttonExit: UIButton!
 

iOSClient/Main/CCMain.m

@@ -36,7 +36,7 @@
 #import "NCNetworkingEndToEnd.h"
 #import "PKDownloadButton.h"
 
-@interface CCMain () <UITextViewDelegate, createFormUploadAssetsDelegate, MGSwipeTableCellDelegate, CCLoginDelegate, NCLoginDelegateWeb, NCSelectDelegate, UITextFieldDelegate>
+@interface CCMain () <UITextViewDelegate, createFormUploadAssetsDelegate, MGSwipeTableCellDelegate, CCLoginDelegate, NCLoginWebDelegate, NCSelectDelegate, UITextFieldDelegate>
 {
     AppDelegate *appDelegate;
         

iOSClient/Main/CCMore.swift

@@ -24,7 +24,7 @@
 
 import UIKit
 
-class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLoginDelegate, NCLoginDelegateWeb {
+class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLoginDelegate, NCLoginWebDelegate {
 
     @IBOutlet weak var themingBackground: UIImageView!
     @IBOutlet weak var disclosureIndicator: UIImageView!
@@ -410,16 +410,20 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             
             if (self.splitViewController?.isCollapsed)! {
                 
+                /*
                 let webVC = SwiftWebVC(urlString: item.url, hideToolbar: false)
                 webVC.delegate = self
                 self.navigationController?.pushViewController(webVC, animated: true)
                 self.navigationController?.navigationBar.isHidden = false
+                */
                 
             } else {
                 
+                /*
                 let webVC = SwiftModalWebVC(urlString: item.url, colorText: UIColor.white, colorDoneButton: UIColor.black, doneButtonVisible: true)
                 webVC.delegateWeb = self
                 self.present(webVC, animated: true, completion: nil)
+                */
             }
             
         } else if item.url == "logout" {
@@ -452,16 +456,21 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             
             if (self.splitViewController?.isCollapsed)! {
                 
+                /*
                 let webVC = SwiftWebVC(urlString: item.url, hideToolbar: true)
                 webVC.delegate = self
                 self.navigationController?.pushViewController(webVC, animated: true)
                 self.navigationController?.navigationBar.isHidden = false
+                */
                 
             } else {
                 
+                /*
                 let webVC = SwiftModalWebVC(urlString: item.url, colorText: UIColor.white, colorDoneButton: UIColor.black, doneButtonVisible: true, hideToolbar: false)
                 webVC.delegateWeb = self
                 self.present(webVC, animated: true, completion: nil)
+                */
+                
             }
         }
     }
@@ -481,40 +490,6 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
     }
 }
 
-extension CCMore: SwiftModalWebVCDelegate, SwiftWebVCDelegate{
-    
-    public func didStartLoading() {
-        //print("Started loading.")
-    }
-    
-    public func didReceiveServerRedirectForProvisionalNavigation(url: URL) {
-        
-        let urlString: String = url.absoluteString.lowercased()
-        
-        // Protocol close webVC
-        if (urlString.contains(NCBrandOptions.sharedInstance.webCloseViewProtocolPersonalized) == true) {
-            
-            if (self.presentingViewController != nil) {
-                self.dismiss(animated: true, completion: nil)
-            } else {
-                self.navigationController?.popToRootViewController(animated: true)
-            }
-        }
-    }
-    
-    public func didFinishLoading(success: Bool) {
-        //print("Finished loading. Success: \(success).")
-    }
-    
-    public func didFinishLoading(success: Bool, url: URL) {
-        //print("Finished loading. Success: \(success).")
-    }
-    
-    public func webDismiss() {
-        //print("Web dismiss.")
-    }
-}
-
 class CCCellMore: UITableViewCell {
     
     @IBOutlet weak var labelText: UILabel!

iOSClient/Main/CCSplit.m

@@ -27,7 +27,7 @@
 #import "NCAutoUpload.h"
 #import "NCBridgeSwift.h"
 
-@interface CCSplit () <CCLoginDelegate, NCLoginDelegateWeb>
+@interface CCSplit () <CCLoginDelegate, NCLoginWebDelegate>
 {
     AppDelegate *appDelegate;
     BOOL prevRunningInFullScreen;

iOSClient/Settings/CCManageAccount.m

@@ -29,7 +29,7 @@
 
 #define actionSheetCancellaAccount 1
 
-@interface CCManageAccount () <CCLoginDelegate, NCLoginDelegateWeb>
+@interface CCManageAccount () <CCLoginDelegate, NCLoginWebDelegate>
 {
     AppDelegate *appDelegate;
 }