TagSpaces is an offline, open source, document manager with tagging support
publish to AppStore
stanimir29686673ea2f
diff --git a/cordova/config.xml b/cordova/config.xmlindex c26f2678f..c0728daf4 100644--- a/cordova/config.xml+++ b/cordova/config.xml@@ -25,6 +25,11 @@<icon density="xxxhdpi" src="res/icon/android/mipmap-xxxhdpi/ic_launcher.png" /></platform><platform name="ios">+ <preference name="WKWebViewOnly" value="true" />+ <feature name="CDVWKWebViewEngine">+ <param name="ios-package" value="CDVWKWebViewEngine" />+ </feature>+ <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" /><allow-intent href="itms:*" /><allow-intent href="itms-apps:*" /></platform>diff --git a/cordova/package.json b/cordova/package.jsonindex 3f9054019..c1d2e54c6 100644--- a/cordova/package.json+++ b/cordova/package.json@@ -1,7 +1,7 @@{"name": "org.tagspaces.mobile","displayName": "TagSpaces",- "version": "1.0.0",+ "version": "1.0.3","description": "A sample Apache Cordova application that responds to the deviceready event.","main": "index.js","scripts": {@@ -18,6 +18,7 @@"cordova-plugin-file": "6.0.2","cordova-plugin-file-opener2": "^3.0.3","cordova-plugin-whitelist": "^1.3.4",+ "cordova-plugin-wkwebview-engine": "^1.2.1","cordova-plugin-x-socialsharing": "^5.6.8","es6-promise-plugin": "^4.2.2"},@@ -32,11 +33,12 @@"cordova-plugin-file": {},"cordova-plugin-file-opener2": {"ANDROID_SUPPORT_V4_VERSION": "27.+"- }+ },+ "cordova-plugin-wkwebview-engine": {}},"platforms": ["android","ios"]}-}\ No newline at end of file+}diff --git a/cordova/platforms/android/android.json b/cordova/platforms/android/android.jsonindex d069f91cb..0f2a6d2a1 100644--- a/cordova/platforms/android/android.json+++ b/cordova/platforms/android/android.json@@ -130,6 +130,9 @@"cordova-plugin-file-opener2": {"ANDROID_SUPPORT_V4_VERSION": "27.+","PACKAGE_NAME": "org.tagspaces.mobile"+ },+ "cordova-plugin-wkwebview-engine": {+ "PACKAGE_NAME": "org.tagspaces.mobile"}},"dependent_plugins": {},@@ -387,6 +390,7 @@"cordova-plugin-whitelist": "1.3.4","es6-promise-plugin": "4.2.2","cordova-plugin-x-socialsharing": "5.6.8",- "cordova-plugin-file-opener2": "3.0.3"+ "cordova-plugin-file-opener2": "3.0.3",+ "cordova-plugin-wkwebview-engine": "1.2.1"}-}+}\ No newline at end of filediff --git a/cordova/platforms/android/platform_www/cordova_plugins.js b/cordova/platforms/android/platform_www/cordova_plugins.jsindex 825eaebf2..d72a6ac0c 100644--- a/cordova/platforms/android/platform_www/cordova_plugins.js+++ b/cordova/platforms/android/platform_www/cordova_plugins.js@@ -255,7 +255,8 @@ module.exports.metadata ="cordova-plugin-whitelist": "1.3.4","es6-promise-plugin": "4.2.2","cordova-plugin-x-socialsharing": "5.6.8",- "cordova-plugin-file-opener2": "3.0.3"+ "cordova-plugin-file-opener2": "3.0.3",+ "cordova-plugin-wkwebview-engine": "1.2.1"};// BOTTOM OF METADATA});\ No newline at end of filediff --git a/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxprojindex cb6716388..024a9e608 100644--- a/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxproj+++ b/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/project.pbxproj@@ -587,6 +587,7 @@buildSettings = {PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;TARGETED_DEVICE_FAMILY = "1,2";+ WK_WEB_VIEW_ONLY = 1;};name = Debug;};@@ -595,6 +596,7 @@buildSettings = {PUBLIC_HEADERS_FOLDER_PATH = include/Cordova;TARGETED_DEVICE_FAMILY = "1,2";+ WK_WEB_VIEW_ONLY = 1;};name = Release;};@@ -660,7 +662,7 @@PRODUCT_NAME = Cordova;SDKROOT = iphoneos;SKIP_INSTALL = YES;- WK_WEB_VIEW_ONLY = 0;+ WK_WEB_VIEW_ONLY = 1;};name = Debug;};@@ -723,7 +725,7 @@SDKROOT = iphoneos;SKIP_INSTALL = YES;VALIDATE_PRODUCT = YES;- WK_WEB_VIEW_ONLY = 0;+ WK_WEB_VIEW_ONLY = 1;};name = Release;};@@ -739,6 +741,7 @@TARGETED_DEVICE_FAMILY = "1,2";VERSIONING_SYSTEM = "apple-generic";VERSION_INFO_PREFIX = "";+ WK_WEB_VIEW_ONLY = 1;};name = Debug;};@@ -754,6 +757,7 @@TARGETED_DEVICE_FAMILY = "1,2";VERSIONING_SYSTEM = "apple-generic";VERSION_INFO_PREFIX = "";+ WK_WEB_VIEW_ONLY = 1;};name = Release;};diff --git a/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist b/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plistindex 33ba33c28..e3071f032 100644--- a/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist+++ b/cordova/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist@@ -7,12 +7,12 @@<key>Cordova.xcscheme_^#shared#^_</key><dict><key>orderHint</key>- <integer>2</integer>+ <integer>1</integer></dict><key>CordovaLib.xcscheme_^#shared#^_</key><dict><key>orderHint</key>- <integer>1</integer>+ <integer>2</integer></dict></dict></dict>diff --git a/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxproj b/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxprojindex 72f1d55ea..08b915c5c 100755--- a/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxproj+++ b/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxproj@@ -8,26 +8,30 @@/* Begin PBXBuildFile section */0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; };+ 16B2D55C46694FAB859B04D1 /* CDVFile.m in Sources */ = {isa = PBXBuildFile; fileRef = B8464A38DD2D4F7FADA4A05D /* CDVFile.m */; };1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; };1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };301BF552109A68D80062928A /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 301BF535109A57CC0062928A /* libCordova.a */; settings = {ATTRIBUTES = (Required, ); }; };302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; };302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /* MainViewController.xib */; };- 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };- FD08D10174C049C9B2AF1045 /* CDVDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4B8429E3AA4CCABA3483C2 /* CDVDevice.m */; };- 55E6C374E3FD4A4CABBDF7A2 /* APPBackgroundMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A95936F2A674A518C47DC9D /* APPBackgroundMode.m */; };- D542412872474BA08645A2B6 /* APPMethodMagic.m in Sources */ = {isa = PBXBuildFile; fileRef = D68F7DFBF1BD4A08A2CA9BB5 /* APPMethodMagic.m */; };- 721F0E8CD32D41C399A0407B /* appbeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 101925A545E94A63B15DB828 /* appbeep.wav */; };- 5330031C98004A548A04FB04 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 49D060970246496597C22CAD /* UIImage+CropScaleOrientation.m */; };- CDBEA11FAD00489CAAD7BCB3 /* CDVCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = 93FC43CFD33C4C9B89754A11 /* CDVCamera.m */; };- 44ACB9D58C8147E2AECFD8E3 /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EC446528AF448AB9C17958C /* CDVJpegHeaderWriter.m */; };3419DFF8E26C40049D27FEF9 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40A26423D0AF4AE598297D25 /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; };- 68EEB8A986134A178EACDC51 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C212A0B05B3406590A5DE1A /* CoreLocation.framework */; };+ 44ACB9D58C8147E2AECFD8E3 /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EC446528AF448AB9C17958C /* CDVJpegHeaderWriter.m */; };+ 5330031C98004A548A04FB04 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 49D060970246496597C22CAD /* UIImage+CropScaleOrientation.m */; };53F98373E0254B50ADFC7482 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 720D38A8FC114FB9860E24F1 /* AVFoundation.framework */; };- 16B2D55C46694FAB859B04D1 /* CDVFile.m in Sources */ = {isa = PBXBuildFile; fileRef = B8464A38DD2D4F7FADA4A05D /* CDVFile.m */; };+ 55E6C374E3FD4A4CABBDF7A2 /* APPBackgroundMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A95936F2A674A518C47DC9D /* APPBackgroundMode.m */; };+ 68EEB8A986134A178EACDC51 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C212A0B05B3406590A5DE1A /* CoreLocation.framework */; };+ 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };+ 721F0E8CD32D41C399A0407B /* appbeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 101925A545E94A63B15DB828 /* appbeep.wav */; };+ 9160B31B3A944071B00DBEAA /* FileOpener2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5AE9F692F74481BC1E0C86 /* FileOpener2.m */; };93C68FEC56FE482C8A4A2E86 /* CDVLocalFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 476A44F1A9C44535A0A00615 /* CDVLocalFilesystem.m */; };+ CDBEA11FAD00489CAAD7BCB3 /* CDVCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = 93FC43CFD33C4C9B89754A11 /* CDVCamera.m */; };+ D542412872474BA08645A2B6 /* APPMethodMagic.m in Sources */ = {isa = PBXBuildFile; fileRef = D68F7DFBF1BD4A08A2CA9BB5 /* APPMethodMagic.m */; };ED2346D5DC534F0E8A5C4B72 /* CDVAssetLibraryFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B70DBAD7A3346F4A04BEB0D /* CDVAssetLibraryFilesystem.m */; };- 9160B31B3A944071B00DBEAA /* FileOpener2.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5AE9F692F74481BC1E0C86 /* FileOpener2.m */; };+ FD08D10174C049C9B2AF1045 /* CDVDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4B8429E3AA4CCABA3483C2 /* CDVDevice.m */; };+ FD813F4BF3564D7286CEC694 /* CDVWKWebViewEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BAE8F2712124FE9A9CA0C3F /* CDVWKWebViewEngine.m */; };+ FC3FD5B10EE249F8BCAE2897 /* CDVWKWebViewUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FE0EEB88E3548539E8DB7BF /* CDVWKWebViewUIDelegate.m */; };+ F0EF40AA3831439690728A0F /* CDVWKProcessPoolFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = B559D10CCDB7435DB450FCE8 /* CDVWKProcessPoolFactory.m */; };+ 8EA0B645CECC433081B8E848 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1785AEC413494EC89B548B1E /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };/* End PBXBuildFile section *//* Begin PBXContainerItemProxy section */@@ -55,10 +59,16 @@/* End PBXContainerItemProxy section *//* Begin PBXFileReference section */+ 00BBD8B96CA64BC19D7F67BE /* CDVExif.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVExif.h; path = "cordova-plugin-camera/CDVExif.h"; sourceTree = "<group>"; };0207DA571B56EA530066E2B4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "TagSpaces Beta/Images.xcassets"; sourceTree = SOURCE_ROOT; };+ 032B343EF5F94282A58A7531 /* FileOpener2.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = FileOpener2.h; path = "cordova-plugin-file-opener2/FileOpener2.h"; sourceTree = "<group>"; };+ 0B70DBAD7A3346F4A04BEB0D /* CDVAssetLibraryFilesystem.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVAssetLibraryFilesystem.m; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.m"; sourceTree = "<group>"; };+ 0C212A0B05B3406590A5DE1A /* CoreLocation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };+ 101925A545E94A63B15DB828 /* appbeep.wav */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; path = appbeep.wav; sourceTree = "<group>"; };1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };1D6058910D05DD3D006BFB54 /* TagSpaces Beta.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TagSpaces Beta.app"; sourceTree = BUILT_PRODUCTS_DIR; };+ 1EC446528AF448AB9C17958C /* CDVJpegHeaderWriter.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVJpegHeaderWriter.m; path = "cordova-plugin-camera/CDVJpegHeaderWriter.m"; sourceTree = "<group>"; };29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = "<group>"; };301BF56E109A69640062928A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = SOURCE_ROOT; };@@ -69,37 +79,38 @@3047A5101AB8059700498E2A /* build-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-release.xcconfig"; path = "cordova/build-release.xcconfig"; sourceTree = SOURCE_ROOT; };3047A5111AB8059700498E2A /* build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = build.xcconfig; path = cordova/build.xcconfig; sourceTree = SOURCE_ROOT; };32CA4F630368D1EE00C91783 /* TagSpaces Beta-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TagSpaces Beta-Prefix.pch"; sourceTree = "<group>"; };+ 3D4B8429E3AA4CCABA3483C2 /* CDVDevice.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVDevice.m; path = "cordova-plugin-device/CDVDevice.m"; sourceTree = "<group>"; };+ 3F8642D53B1A40708D0784D1 /* CDVCamera.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVCamera.h; path = "cordova-plugin-camera/CDVCamera.h"; sourceTree = "<group>"; };+ 40A26423D0AF4AE598297D25 /* ImageIO.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };+ 450308C53A3E4D278EC4286B /* APPMethodMagic.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = APPMethodMagic.h; path = "cordova-plugin-background-mode/APPMethodMagic.h"; sourceTree = "<group>"; };+ 476A44F1A9C44535A0A00615 /* CDVLocalFilesystem.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVLocalFilesystem.m; path = "cordova-plugin-file/CDVLocalFilesystem.m"; sourceTree = "<group>"; };+ 49D060970246496597C22CAD /* UIImage+CropScaleOrientation.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = "UIImage+CropScaleOrientation.m"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.m"; sourceTree = "<group>"; };+ 4A95936F2A674A518C47DC9D /* APPBackgroundMode.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = APPBackgroundMode.m; path = "cordova-plugin-background-mode/APPBackgroundMode.m"; sourceTree = "<group>"; };+ 4B5AE9F692F74481BC1E0C86 /* FileOpener2.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = FileOpener2.m; path = "cordova-plugin-file-opener2/FileOpener2.m"; sourceTree = "<group>"; };6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = "TagSpaces Beta/CDVLaunchScreen.storyboard"; sourceTree = SOURCE_ROOT; };+ 720D38A8FC114FB9860E24F1 /* AVFoundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };+ 7FD56FBDFA8B4E0A906A97B0 /* UIImage+CropScaleOrientation.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "UIImage+CropScaleOrientation.h"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.h"; sourceTree = "<group>"; };8D1107310486CEB800E47090 /* TagSpaces Beta-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "TagSpaces Beta-Info.plist"; path = "TagSpaces Beta/TagSpaces Beta-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = SOURCE_ROOT; };+ 93FC43CFD33C4C9B89754A11 /* CDVCamera.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVCamera.m; path = "cordova-plugin-camera/CDVCamera.m"; sourceTree = "<group>"; };+ B1E38A50DE384D2BB20890EB /* CDVDevice.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVDevice.h; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = "<group>"; };+ B8464A38DD2D4F7FADA4A05D /* CDVFile.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVFile.m; path = "cordova-plugin-file/CDVFile.m"; sourceTree = "<group>"; };+ BBE6D0DB8D0C48C3A48B5D6A /* CDVLocalFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVLocalFilesystem.h; path = "cordova-plugin-file/CDVLocalFilesystem.h"; sourceTree = "<group>"; };+ D68F7DFBF1BD4A08A2CA9BB5 /* APPMethodMagic.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = APPMethodMagic.m; path = "cordova-plugin-background-mode/APPMethodMagic.m"; sourceTree = "<group>"; };EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = "<group>"; };EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = "<group>"; };- ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "Bridging-Header.h"; sourceTree = "<group>"; };+ ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };+ F0F164CAE6E346428F43D0C9 /* APPBackgroundMode.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = APPBackgroundMode.h; path = "cordova-plugin-background-mode/APPBackgroundMode.h"; sourceTree = "<group>"; };+ F69E9D0C17334829B9EA3A3F /* CDVAssetLibraryFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVAssetLibraryFilesystem.h; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.h"; sourceTree = "<group>"; };F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "TagSpaces Beta/config.xml"; sourceTree = "<group>"; };- 3D4B8429E3AA4CCABA3483C2 /* CDVDevice.m */ = {isa = PBXFileReference; name = "CDVDevice.m"; path = "cordova-plugin-device/CDVDevice.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- B1E38A50DE384D2BB20890EB /* CDVDevice.h */ = {isa = PBXFileReference; name = "CDVDevice.h"; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 4A95936F2A674A518C47DC9D /* APPBackgroundMode.m */ = {isa = PBXFileReference; name = "APPBackgroundMode.m"; path = "cordova-plugin-background-mode/APPBackgroundMode.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- D68F7DFBF1BD4A08A2CA9BB5 /* APPMethodMagic.m */ = {isa = PBXFileReference; name = "APPMethodMagic.m"; path = "cordova-plugin-background-mode/APPMethodMagic.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- F0F164CAE6E346428F43D0C9 /* APPBackgroundMode.h */ = {isa = PBXFileReference; name = "APPBackgroundMode.h"; path = "cordova-plugin-background-mode/APPBackgroundMode.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 450308C53A3E4D278EC4286B /* APPMethodMagic.h */ = {isa = PBXFileReference; name = "APPMethodMagic.h"; path = "cordova-plugin-background-mode/APPMethodMagic.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 101925A545E94A63B15DB828 /* appbeep.wav */ = {isa = PBXFileReference; name = "appbeep.wav"; path = "appbeep.wav"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };- 49D060970246496597C22CAD /* UIImage+CropScaleOrientation.m */ = {isa = PBXFileReference; name = "UIImage+CropScaleOrientation.m"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 93FC43CFD33C4C9B89754A11 /* CDVCamera.m */ = {isa = PBXFileReference; name = "CDVCamera.m"; path = "cordova-plugin-camera/CDVCamera.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 1EC446528AF448AB9C17958C /* CDVJpegHeaderWriter.m */ = {isa = PBXFileReference; name = "CDVJpegHeaderWriter.m"; path = "cordova-plugin-camera/CDVJpegHeaderWriter.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 7FD56FBDFA8B4E0A906A97B0 /* UIImage+CropScaleOrientation.h */ = {isa = PBXFileReference; name = "UIImage+CropScaleOrientation.h"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 3F8642D53B1A40708D0784D1 /* CDVCamera.h */ = {isa = PBXFileReference; name = "CDVCamera.h"; path = "cordova-plugin-camera/CDVCamera.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- FDB5379162244D3F92106617 /* CDVJpegHeaderWriter.h */ = {isa = PBXFileReference; name = "CDVJpegHeaderWriter.h"; path = "cordova-plugin-camera/CDVJpegHeaderWriter.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 00BBD8B96CA64BC19D7F67BE /* CDVExif.h */ = {isa = PBXFileReference; name = "CDVExif.h"; path = "cordova-plugin-camera/CDVExif.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 40A26423D0AF4AE598297D25 /* ImageIO.framework */ = {isa = PBXFileReference; name = "ImageIO.framework"; path = "System/Library/Frameworks/ImageIO.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };- 0C212A0B05B3406590A5DE1A /* CoreLocation.framework */ = {isa = PBXFileReference; name = "CoreLocation.framework"; path = "System/Library/Frameworks/CoreLocation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };- 720D38A8FC114FB9860E24F1 /* AVFoundation.framework */ = {isa = PBXFileReference; name = "AVFoundation.framework"; path = "System/Library/Frameworks/AVFoundation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };- B8464A38DD2D4F7FADA4A05D /* CDVFile.m */ = {isa = PBXFileReference; name = "CDVFile.m"; path = "cordova-plugin-file/CDVFile.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 476A44F1A9C44535A0A00615 /* CDVLocalFilesystem.m */ = {isa = PBXFileReference; name = "CDVLocalFilesystem.m"; path = "cordova-plugin-file/CDVLocalFilesystem.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 0B70DBAD7A3346F4A04BEB0D /* CDVAssetLibraryFilesystem.m */ = {isa = PBXFileReference; name = "CDVAssetLibraryFilesystem.m"; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- FFEEE9F8C3654B1D80D32A88 /* CDVFile.h */ = {isa = PBXFileReference; name = "CDVFile.h"; path = "cordova-plugin-file/CDVFile.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- BBE6D0DB8D0C48C3A48B5D6A /* CDVLocalFilesystem.h */ = {isa = PBXFileReference; name = "CDVLocalFilesystem.h"; path = "cordova-plugin-file/CDVLocalFilesystem.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- F69E9D0C17334829B9EA3A3F /* CDVAssetLibraryFilesystem.h */ = {isa = PBXFileReference; name = "CDVAssetLibraryFilesystem.h"; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };- 4B5AE9F692F74481BC1E0C86 /* FileOpener2.m */ = {isa = PBXFileReference; name = "FileOpener2.m"; path = "cordova-plugin-file-opener2/FileOpener2.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };- 032B343EF5F94282A58A7531 /* FileOpener2.h */ = {isa = PBXFileReference; name = "FileOpener2.h"; path = "cordova-plugin-file-opener2/FileOpener2.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };+ FDB5379162244D3F92106617 /* CDVJpegHeaderWriter.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVJpegHeaderWriter.h; path = "cordova-plugin-camera/CDVJpegHeaderWriter.h"; sourceTree = "<group>"; };+ FFEEE9F8C3654B1D80D32A88 /* CDVFile.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVFile.h; path = "cordova-plugin-file/CDVFile.h"; sourceTree = "<group>"; };+ 1BAE8F2712124FE9A9CA0C3F /* CDVWKWebViewEngine.m */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };+ 1FE0EEB88E3548539E8DB7BF /* CDVWKWebViewUIDelegate.m */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };+ B559D10CCDB7435DB450FCE8 /* CDVWKProcessPoolFactory.m */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.m"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };+ 4E41725864554075A3FC52DE /* CDVWKWebViewEngine.h */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };+ E777FC5C974D4356A3FD36CD /* CDVWKWebViewUIDelegate.h */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };+ 52525C431A294171B3CC274C /* CDVWKProcessPoolFactory.h */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.h"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };+ 1785AEC413494EC89B548B1E /* WebKit.framework */ = {isa = PBXFileReference; name = "WebKit.framework"; path = "System/Library/Frameworks/WebKit.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };/* End PBXFileReference section *//* Begin PBXFrameworksBuildPhase section */@@ -111,6 +122,7 @@3419DFF8E26C40049D27FEF9 /* ImageIO.framework in Frameworks */,68EEB8A986134A178EACDC51 /* CoreLocation.framework in Frameworks */,53F98373E0254B50ADFC7482 /* AVFoundation.framework in Frameworks */,+ 8EA0B645CECC433081B8E848 /* WebKit.framework in Frameworks */,);runOnlyForDeploymentPostprocessing = 0;};@@ -185,6 +197,7 @@40A26423D0AF4AE598297D25 /* ImageIO.framework */,0C212A0B05B3406590A5DE1A /* CoreLocation.framework */,720D38A8FC114FB9860E24F1 /* AVFoundation.framework */,+ 1785AEC413494EC89B548B1E /* WebKit.framework */,);name = Frameworks;sourceTree = "<group>";@@ -232,6 +245,12 @@F69E9D0C17334829B9EA3A3F /* CDVAssetLibraryFilesystem.h */,4B5AE9F692F74481BC1E0C86 /* FileOpener2.m */,032B343EF5F94282A58A7531 /* FileOpener2.h */,+ 1BAE8F2712124FE9A9CA0C3F /* CDVWKWebViewEngine.m */,+ 1FE0EEB88E3548539E8DB7BF /* CDVWKWebViewUIDelegate.m */,+ B559D10CCDB7435DB450FCE8 /* CDVWKProcessPoolFactory.m */,+ 4E41725864554075A3FC52DE /* CDVWKWebViewEngine.h */,+ E777FC5C974D4356A3FD36CD /* CDVWKWebViewUIDelegate.h */,+ 52525C431A294171B3CC274C /* CDVWKProcessPoolFactory.h */,);name = Plugins;path = "TagSpaces Beta/Plugins";@@ -277,6 +296,7 @@LastUpgradeCheck = 510;TargetAttributes = {1D6058900D05DD3D006BFB54 = {+ DevelopmentTeam = DLK22E2679;ProvisioningStyle = Automatic;};};@@ -285,6 +305,11 @@compatibilityVersion = "Xcode 3.2";developmentRegion = English;hasScannedForEncodings = 1;+ knownRegions = (+ English,+ en,+ Base,+ );mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;projectDirPath = "";projectReferences = (@@ -367,6 +392,9 @@93C68FEC56FE482C8A4A2E86 /* CDVLocalFilesystem.m in Sources */,ED2346D5DC534F0E8A5C4B72 /* CDVAssetLibraryFilesystem.m in Sources */,9160B31B3A944071B00DBEAA /* FileOpener2.m in Sources */,+ FD813F4BF3564D7286CEC694 /* CDVWKWebViewEngine.m in Sources */,+ FC3FD5B10EE249F8BCAE2897 /* CDVWKWebViewUIDelegate.m in Sources */,+ F0EF40AA3831439690728A0F /* CDVWKProcessPoolFactory.m in Sources */,);runOnlyForDeploymentPostprocessing = 0;};@@ -391,6 +419,7 @@CLANG_ENABLE_MODULES = YES;CLANG_ENABLE_OBJC_ARC = YES;COPY_PHASE_STRIP = NO;+ DEVELOPMENT_TEAM = DLK22E2679;GCC_DYNAMIC_NO_PIC = NO;GCC_OPTIMIZATION_LEVEL = 0;GCC_PRECOMPILE_PREFIX_HEADER = YES;@@ -400,9 +429,10 @@INFOPLIST_FILE = "TagSpaces Beta/TagSpaces Beta-Info.plist";IPHONEOS_DEPLOYMENT_TARGET = 10.0;LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";- PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;+ PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.iosn;PRODUCT_NAME = "$(TARGET_NAME)";TARGETED_DEVICE_FAMILY = "1,2";+ WK_WEB_VIEW_ONLY = 1;};name = Debug;};@@ -426,6 +456,7 @@PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;PRODUCT_NAME = "$(TARGET_NAME)";TARGETED_DEVICE_FAMILY = "1,2";+ WK_WEB_VIEW_ONLY = 1;};name = Release;};@@ -465,10 +496,10 @@GCC_WARN_UNUSED_FUNCTION = YES;GCC_WARN_UNUSED_VARIABLE = YES;ONLY_ACTIVE_ARCH = YES;+ PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;SDKROOT = iphoneos;SKIP_INSTALL = NO;- WK_WEB_VIEW_ONLY = 0;- PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;+ WK_WEB_VIEW_ONLY = 1;};name = Debug;};@@ -506,10 +537,10 @@GCC_WARN_UNINITIALIZED_AUTOS = YES;GCC_WARN_UNUSED_FUNCTION = YES;GCC_WARN_UNUSED_VARIABLE = YES;+ PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;SDKROOT = iphoneos;SKIP_INSTALL = NO;- WK_WEB_VIEW_ONLY = 0;- PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;+ WK_WEB_VIEW_ONLY = 1;};name = Release;};diff --git a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcshareddata/xcschemes/TagSpaces Beta.xcscheme b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcshareddata/xcschemes/TagSpaces Beta.xcschemeindex 7ae666f35..ea8c0e532 100644--- a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcshareddata/xcschemes/TagSpaces Beta.xcscheme+++ b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcshareddata/xcschemes/TagSpaces Beta.xcscheme@@ -27,8 +27,6 @@selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"shouldUseLaunchSchemeArgsEnv = "YES">- <Testables>- </Testables><MacroExpansion><BuildableReferenceBuildableIdentifier = "primary"@@ -38,8 +36,8 @@ReferencedContainer = "container:TagSpaces Beta.xcodeproj"></BuildableReference></MacroExpansion>- <AdditionalOptions>- </AdditionalOptions>+ <Testables>+ </Testables></TestAction><LaunchActionbuildConfiguration = "Debug"@@ -61,8 +59,6 @@ReferencedContainer = "container:TagSpaces Beta.xcodeproj"></BuildableReference></BuildableProductRunnable>- <AdditionalOptions>- </AdditionalOptions></LaunchAction><ProfileActionbuildConfiguration = "Release"@@ -85,7 +81,7 @@buildConfiguration = "Debug"></AnalyzeAction><ArchiveAction- buildConfiguration = "Release"+ buildConfiguration = "Debug"revealArchiveInOrganizer = "YES"></ArchiveAction></Scheme>diff --git a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/UserInterfaceState.xcuserstate b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/UserInterfaceState.xcuserstateindex edca4e942..40fc0ae61 100644Binary files a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/UserInterfaceState.xcuserstate and b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/UserInterfaceState.xcuserstate differdiff --git a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plistindex 06a18638c..ebb89c9a7 100644--- a/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist+++ b/cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/xcschemes/xcschememanagement.plist@@ -6,6 +6,8 @@<dict><key>TagSpaces Beta.xcscheme_^#shared#^_</key><dict>+ <key>isShown</key>+ <true/><key>orderHint</key><integer>0</integer></dict>diff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.hnew file mode 100644index 000000000..f4f8816e0--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h@@ -0,0 +1,27 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import <WebKit/WebKit.h>++@interface CDVWKProcessPoolFactory : NSObject+@property (nonatomic, retain) WKProcessPool* sharedPool;+++(instancetype) sharedFactory;+-(WKProcessPool*) sharedProcessPool;+@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.mnew file mode 100644index 000000000..48ac09e66--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m@@ -0,0 +1,49 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import <Foundation/Foundation.h>+#import <WebKit/WebKit.h>+#import "CDVWKProcessPoolFactory.h"++static CDVWKProcessPoolFactory *factory = nil;++@implementation CDVWKProcessPoolFactory+++ (instancetype)sharedFactory+{+ static dispatch_once_t onceToken;+ dispatch_once(&onceToken, ^{+ factory = [[CDVWKProcessPoolFactory alloc] init];+ });++ return factory;+}++- (instancetype)init+{+ if (self = [super init]) {+ _sharedPool = [[WKProcessPool alloc] init];+ }+ return self;+}++- (WKProcessPool*) sharedProcessPool {+ return _sharedPool;+}+@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.hnew file mode 100644index 000000000..c71f4e21b--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h@@ -0,0 +1,29 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import <WebKit/WebKit.h>+#import <Cordova/CDV.h>++@interface CDVWKWebViewEngine : CDVPlugin <CDVWebViewEngineProtocol, WKScriptMessageHandler, WKNavigationDelegate>++@property (nonatomic, strong, readonly) id <WKUIDelegate> uiDelegate;++- (void)allowsBackForwardNavigationGestures:(CDVInvokedUrlCommand*)command;++@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.mnew file mode 100644index 000000000..16a0cb7d6--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m@@ -0,0 +1,494 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import "CDVWKWebViewEngine.h"+#import "CDVWKWebViewUIDelegate.h"+#import "CDVWKProcessPoolFactory.h"+#import <Cordova/NSDictionary+CordovaPreferences.h>++#import <objc/message.h>++#define CDV_BRIDGE_NAME @"cordova"+#define CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR @"loadFileURL:allowingReadAccessToURL:"++@interface CDVWKWeakScriptMessageHandler : NSObject <WKScriptMessageHandler>++@property (nonatomic, weak, readonly) id<WKScriptMessageHandler>scriptMessageHandler;++- (instancetype)initWithScriptMessageHandler:(id<WKScriptMessageHandler>)scriptMessageHandler;++@end+++@interface CDVWKWebViewEngine ()++@property (nonatomic, strong, readwrite) UIView* engineWebView;+@property (nonatomic, strong, readwrite) id <WKUIDelegate> uiDelegate;+@property (nonatomic, weak) id <WKScriptMessageHandler> weakScriptMessageHandler;++@end++// see forwardingTargetForSelector: selector comment for the reason for this pragma+#pragma clang diagnostic ignored "-Wprotocol"++@implementation CDVWKWebViewEngine++@synthesize engineWebView = _engineWebView;++- (instancetype)initWithFrame:(CGRect)frame+{+ self = [super init];+ if (self) {+ if (NSClassFromString(@"WKWebView") == nil) {+ return nil;+ }++ self.engineWebView = [[WKWebView alloc] initWithFrame:frame];+ }++ return self;+}++- (WKWebViewConfiguration*) createConfigurationFromSettings:(NSDictionary*)settings+{+ WKWebViewConfiguration* configuration = [[WKWebViewConfiguration alloc] init];+ configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool];+ if (settings == nil) {+ return configuration;+ }++ configuration.allowsInlineMediaPlayback = [settings cordovaBoolSettingForKey:@"AllowInlineMediaPlayback" defaultValue:NO];+ configuration.mediaPlaybackRequiresUserAction = [settings cordovaBoolSettingForKey:@"MediaPlaybackRequiresUserAction" defaultValue:YES];+ configuration.suppressesIncrementalRendering = [settings cordovaBoolSettingForKey:@"SuppressesIncrementalRendering" defaultValue:NO];+ configuration.mediaPlaybackAllowsAirPlay = [settings cordovaBoolSettingForKey:@"MediaPlaybackAllowsAirPlay" defaultValue:YES];+ return configuration;+}++- (void)pluginInitialize+{+ // viewController would be available now. we attempt to set all possible delegates to it, by default+ NSDictionary* settings = self.commandDelegate.settings;++ self.uiDelegate = [[CDVWKWebViewUIDelegate alloc] initWithTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]];++ CDVWKWeakScriptMessageHandler *weakScriptMessageHandler = [[CDVWKWeakScriptMessageHandler alloc] initWithScriptMessageHandler:self];++ WKUserContentController* userContentController = [[WKUserContentController alloc] init];+ [userContentController addScriptMessageHandler:weakScriptMessageHandler name:CDV_BRIDGE_NAME];++ WKWebViewConfiguration* configuration = [self createConfigurationFromSettings:settings];+ configuration.userContentController = userContentController;++ // re-create WKWebView, since we need to update configuration+ WKWebView* wkWebView = [[WKWebView alloc] initWithFrame:self.engineWebView.frame configuration:configuration];+ wkWebView.UIDelegate = self.uiDelegate;+ self.engineWebView = wkWebView;++ if (IsAtLeastiOSVersion(@"9.0") && [self.viewController isKindOfClass:[CDVViewController class]]) {+ wkWebView.customUserAgent = ((CDVViewController*) self.viewController).userAgent;+ }++ if ([self.viewController conformsToProtocol:@protocol(WKUIDelegate)]) {+ wkWebView.UIDelegate = (id <WKUIDelegate>)self.viewController;+ }++ if ([self.viewController conformsToProtocol:@protocol(WKNavigationDelegate)]) {+ wkWebView.navigationDelegate = (id <WKNavigationDelegate>)self.viewController;+ } else {+ wkWebView.navigationDelegate = (id <WKNavigationDelegate>)self;+ }++ if ([self.viewController conformsToProtocol:@protocol(WKScriptMessageHandler)]) {+ [wkWebView.configuration.userContentController addScriptMessageHandler:(id < WKScriptMessageHandler >)self.viewController name:CDV_BRIDGE_NAME];+ }++ [self updateSettings:settings];++ // check if content thread has died on resume+ NSLog(@"%@", @"CDVWKWebViewEngine will reload WKWebView if required on resume");+ [[NSNotificationCenter defaultCenter]+ addObserver:self+ selector:@selector(onAppWillEnterForeground:)+ name:UIApplicationWillEnterForegroundNotification object:nil];++ NSLog(@"Using WKWebView");++ [self addURLObserver];+}++- (void)onReset {+ [self addURLObserver];+}++static void * KVOContext = &KVOContext;++- (void)addURLObserver {+ if(!IsAtLeastiOSVersion(@"9.0")){+ [self.webView addObserver:self forKeyPath:@"URL" options:0 context:KVOContext];+ }+}++- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context+{+ if (context == KVOContext) {+ if (object == [self webView] && [keyPath isEqualToString: @"URL"] && [object valueForKeyPath:keyPath] == nil){+ NSLog(@"URL is nil. Reloading WKWebView");+ [(WKWebView*)_engineWebView reload];+ }+ } else {+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];+ }+}++- (void) onAppWillEnterForeground:(NSNotification*)notification {+ if ([self shouldReloadWebView]) {+ NSLog(@"%@", @"CDVWKWebViewEngine reloading!");+ [(WKWebView*)_engineWebView reload];+ }+}++- (BOOL)shouldReloadWebView+{+ WKWebView* wkWebView = (WKWebView*)_engineWebView;+ return [self shouldReloadWebView:wkWebView.URL title:wkWebView.title];+}++- (BOOL)shouldReloadWebView:(NSURL*)location title:(NSString*)title+{+ BOOL title_is_nil = (title == nil);+ BOOL location_is_blank = [[location absoluteString] isEqualToString:@"about:blank"];++ BOOL reload = (title_is_nil || location_is_blank);++#ifdef DEBUG+ NSLog(@"%@", @"CDVWKWebViewEngine shouldReloadWebView::");+ NSLog(@"CDVWKWebViewEngine shouldReloadWebView title: %@", title);+ NSLog(@"CDVWKWebViewEngine shouldReloadWebView location: %@", [location absoluteString]);+ NSLog(@"CDVWKWebViewEngine shouldReloadWebView reload: %u", reload);+#endif++ return reload;+}+++- (id)loadRequest:(NSURLRequest*)request+{+ if ([self canLoadRequest:request]) { // can load, differentiate between file urls and other schemes+ if (request.URL.fileURL) {+ SEL wk_sel = NSSelectorFromString(CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR);+ NSURL* readAccessUrl = [request.URL URLByDeletingLastPathComponent];+ return ((id (*)(id, SEL, id, id))objc_msgSend)(_engineWebView, wk_sel, request.URL, readAccessUrl);+ } else {+ return [(WKWebView*)_engineWebView loadRequest:request];+ }+ } else { // can't load, print out error+ NSString* errorHtml = [NSString stringWithFormat:+ @"<!doctype html>"+ @"<title>Error</title>"+ @"<div style='font-size:2em'>"+ @" <p>The WebView engine '%@' is unable to load the request: %@</p>"+ @" <p>Most likely the cause of the error is that the loading of file urls is not supported in iOS %@.</p>"+ @"</div>",+ NSStringFromClass([self class]),+ [request.URL description],+ [[UIDevice currentDevice] systemVersion]+ ];+ return [self loadHTMLString:errorHtml baseURL:nil];+ }+}++- (id)loadHTMLString:(NSString*)string baseURL:(NSURL*)baseURL+{+ return [(WKWebView*)_engineWebView loadHTMLString:string baseURL:baseURL];+}++- (NSURL*) URL+{+ return [(WKWebView*)_engineWebView URL];+}++- (BOOL) canLoadRequest:(NSURLRequest*)request+{+ // See: https://issues.apache.org/jira/browse/CB-9636+ SEL wk_sel = NSSelectorFromString(CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR);++ // if it's a file URL, check whether WKWebView has the selector (which is in iOS 9 and up only)+ if (request.URL.fileURL) {+ return [_engineWebView respondsToSelector:wk_sel];+ } else {+ return YES;+ }+}++- (void)updateSettings:(NSDictionary*)settings+{+ WKWebView* wkWebView = (WKWebView*)_engineWebView;++ wkWebView.configuration.preferences.minimumFontSize = [settings cordovaFloatSettingForKey:@"MinimumFontSize" defaultValue:0.0];++ /*+ wkWebView.configuration.preferences.javaScriptEnabled = [settings cordovaBoolSettingForKey:@"JavaScriptEnabled" default:YES];+ wkWebView.configuration.preferences.javaScriptCanOpenWindowsAutomatically = [settings cordovaBoolSettingForKey:@"JavaScriptCanOpenWindowsAutomatically" default:NO];+ */++ // By default, DisallowOverscroll is false (thus bounce is allowed)+ BOOL bounceAllowed = !([settings cordovaBoolSettingForKey:@"DisallowOverscroll" defaultValue:NO]);++ // prevent webView from bouncing+ if (!bounceAllowed) {+ if ([wkWebView respondsToSelector:@selector(scrollView)]) {+ ((UIScrollView*)[wkWebView scrollView]).bounces = NO;+ } else {+ for (id subview in wkWebView.subviews) {+ if ([[subview class] isSubclassOfClass:[UIScrollView class]]) {+ ((UIScrollView*)subview).bounces = NO;+ }+ }+ }+ }++ NSString* decelerationSetting = [settings cordovaSettingForKey:@"WKWebViewDecelerationSpeed"];+ if (!decelerationSetting) {+ // Fallback to the UIWebView-named preference+ decelerationSetting = [settings cordovaSettingForKey:@"UIWebViewDecelerationSpeed"];+ }++ if (![@"fast" isEqualToString:decelerationSetting]) {+ [wkWebView.scrollView setDecelerationRate:UIScrollViewDecelerationRateNormal];+ } else {+ [wkWebView.scrollView setDecelerationRate:UIScrollViewDecelerationRateFast];+ }++ wkWebView.allowsBackForwardNavigationGestures = [settings cordovaBoolSettingForKey:@"AllowBackForwardNavigationGestures" defaultValue:NO];+ wkWebView.allowsLinkPreview = [settings cordovaBoolSettingForKey:@"Allow3DTouchLinkPreview" defaultValue:YES];+}++- (void)updateWithInfo:(NSDictionary*)info+{+ NSDictionary* scriptMessageHandlers = [info objectForKey:kCDVWebViewEngineScriptMessageHandlers];+ NSDictionary* settings = [info objectForKey:kCDVWebViewEngineWebViewPreferences];+ id navigationDelegate = [info objectForKey:kCDVWebViewEngineWKNavigationDelegate];+ id uiDelegate = [info objectForKey:kCDVWebViewEngineWKUIDelegate];++ WKWebView* wkWebView = (WKWebView*)_engineWebView;++ if (scriptMessageHandlers && [scriptMessageHandlers isKindOfClass:[NSDictionary class]]) {+ NSArray* allKeys = [scriptMessageHandlers allKeys];++ for (NSString* key in allKeys) {+ id object = [scriptMessageHandlers objectForKey:key];+ if ([object conformsToProtocol:@protocol(WKScriptMessageHandler)]) {+ [wkWebView.configuration.userContentController addScriptMessageHandler:object name:key];+ }+ }+ }++ if (navigationDelegate && [navigationDelegate conformsToProtocol:@protocol(WKNavigationDelegate)]) {+ wkWebView.navigationDelegate = navigationDelegate;+ }++ if (uiDelegate && [uiDelegate conformsToProtocol:@protocol(WKUIDelegate)]) {+ wkWebView.UIDelegate = uiDelegate;+ }++ if (settings && [settings isKindOfClass:[NSDictionary class]]) {+ [self updateSettings:settings];+ }+}++// This forwards the methods that are in the header that are not implemented here.+// Both WKWebView and UIWebView implement the below:+// loadHTMLString:baseURL:+// loadRequest:+- (id)forwardingTargetForSelector:(SEL)aSelector+{+ return _engineWebView;+}++- (UIView*)webView+{+ return self.engineWebView;+}++#pragma mark WKScriptMessageHandler implementation++- (void)userContentController:(WKUserContentController*)userContentController didReceiveScriptMessage:(WKScriptMessage*)message+{+ if (![message.name isEqualToString:CDV_BRIDGE_NAME]) {+ return;+ }++ CDVViewController* vc = (CDVViewController*)self.viewController;++ NSArray* jsonEntry = message.body; // NSString:callbackId, NSString:service, NSString:action, NSArray:args+ CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonEntry];+ CDV_EXEC_LOG(@"Exec(%@): Calling %@.%@", command.callbackId, command.className, command.methodName);++ if (![vc.commandQueue execute:command]) {+#ifdef DEBUG+ NSError* error = nil;+ NSString* commandJson = nil;+ NSData* jsonData = [NSJSONSerialization dataWithJSONObject:jsonEntry+ options:0+ error:&error];++ if (error == nil) {+ commandJson = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];+ }++ static NSUInteger maxLogLength = 1024;+ NSString* commandString = ([commandJson length] > maxLogLength) ?+ [NSString stringWithFormat : @"%@[...]", [commandJson substringToIndex:maxLogLength]] :+ commandJson;++ NSLog(@"FAILED pluginJSON = %@", commandString);+#endif+ }+}++#pragma mark WKNavigationDelegate implementation++- (void)webView:(WKWebView*)webView didStartProvisionalNavigation:(WKNavigation*)navigation+{+ [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginResetNotification object:webView]];+}++- (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation+{+ CDVViewController* vc = (CDVViewController*)self.viewController;+ [CDVUserAgentUtil releaseLock:vc.userAgentLockToken];++ [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPageDidLoadNotification object:webView]];+}++- (void)webView:(WKWebView*)theWebView didFailProvisionalNavigation:(WKNavigation*)navigation withError:(NSError*)error+{+ [self webView:theWebView didFailNavigation:navigation withError:error];+}++- (void)webView:(WKWebView*)theWebView didFailNavigation:(WKNavigation*)navigation withError:(NSError*)error+{+ CDVViewController* vc = (CDVViewController*)self.viewController;+ [CDVUserAgentUtil releaseLock:vc.userAgentLockToken];++ NSString* message = [NSString stringWithFormat:@"Failed to load webpage with error: %@", [error localizedDescription]];+ NSLog(@"%@", message);++ NSURL* errorUrl = vc.errorURL;+ if (errorUrl) {+ errorUrl = [NSURL URLWithString:[NSString stringWithFormat:@"?error=%@", [message stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] relativeToURL:errorUrl];+ NSLog(@"%@", [errorUrl absoluteString]);+ [theWebView loadRequest:[NSURLRequest requestWithURL:errorUrl]];+ }+}++- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView+{+ [webView reload];+}++- (BOOL)defaultResourcePolicyForURL:(NSURL*)url+{+ // all file:// urls are allowed+ if ([url isFileURL]) {+ return YES;+ }++ return NO;+}++- (void) webView: (WKWebView *) webView decidePolicyForNavigationAction: (WKNavigationAction*) navigationAction decisionHandler: (void (^)(WKNavigationActionPolicy)) decisionHandler+{+ NSURL* url = [navigationAction.request URL];+ CDVViewController* vc = (CDVViewController*)self.viewController;++ /*+ * Give plugins the chance to handle the url+ */+ BOOL anyPluginsResponded = NO;+ BOOL shouldAllowRequest = NO;++ for (NSString* pluginName in vc.pluginObjects) {+ CDVPlugin* plugin = [vc.pluginObjects objectForKey:pluginName];+ SEL selector = NSSelectorFromString(@"shouldOverrideLoadWithRequest:navigationType:");+ if ([plugin respondsToSelector:selector]) {+ anyPluginsResponded = YES;+ // https://issues.apache.org/jira/browse/CB-12497+ int navType = (int)navigationAction.navigationType;+ if (WKNavigationTypeOther == navigationAction.navigationType) {+ navType = (int)UIWebViewNavigationTypeOther;+ }+ shouldAllowRequest = (((BOOL (*)(id, SEL, id, int))objc_msgSend)(plugin, selector, navigationAction.request, navType));+ if (!shouldAllowRequest) {+ break;+ }+ }+ }++ if (anyPluginsResponded) {+ return decisionHandler(shouldAllowRequest);+ }++ /*+ * Handle all other types of urls (tel:, sms:), and requests to load a url in the main webview.+ */+ BOOL shouldAllowNavigation = [self defaultResourcePolicyForURL:url];+ if (shouldAllowNavigation) {+ return decisionHandler(YES);+ } else {+ [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]];+ }++ return decisionHandler(NO);+}++#pragma mark - Plugin interface++- (void)allowsBackForwardNavigationGestures:(CDVInvokedUrlCommand*)command;+{+ id value = [command argumentAtIndex:0];+ if (!([value isKindOfClass:[NSNumber class]])) {+ value = [NSNumber numberWithBool:NO];+ }++ WKWebView* wkWebView = (WKWebView*)_engineWebView;+ wkWebView.allowsBackForwardNavigationGestures = [value boolValue];+}++@end++#pragma mark - CDVWKWeakScriptMessageHandler++@implementation CDVWKWeakScriptMessageHandler++- (instancetype)initWithScriptMessageHandler:(id<WKScriptMessageHandler>)scriptMessageHandler+{+ self = [super init];+ if (self) {+ _scriptMessageHandler = scriptMessageHandler;+ }+ return self;+}++- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message+{+ [self.scriptMessageHandler userContentController:userContentController didReceiveScriptMessage:message];+}++@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.hnew file mode 100644index 000000000..33a179b0c--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h@@ -0,0 +1,28 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import <WebKit/WebKit.h>++@interface CDVWKWebViewUIDelegate : NSObject <WKUIDelegate>++@property (nonatomic, copy) NSString* title;++- (instancetype)initWithTitle:(NSString*)title;++@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.mnew file mode 100644index 000000000..a7a16f2c6--- /dev/null+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m@@ -0,0 +1,123 @@+/*+ Licensed to the Apache Software Foundation (ASF) under one+ or more contributor license agreements. See the NOTICE file+ distributed with this work for additional information+ regarding copyright ownership. The ASF licenses this file+ to you under the Apache License, Version 2.0 (the+ "License"); you may not use this file except in compliance+ with the License. You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing,+ software distributed under the License is distributed on an+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ KIND, either express or implied. See the License for the+ specific language governing permissions and limitations+ under the License.+ */++#import "CDVWKWebViewUIDelegate.h"++@implementation CDVWKWebViewUIDelegate++- (instancetype)initWithTitle:(NSString*)title+{+ self = [super init];+ if (self) {+ self.title = title;+ }++ return self;+}++- (void) webView:(WKWebView*)webView runJavaScriptAlertPanelWithMessage:(NSString*)message+ initiatedByFrame:(WKFrameInfo*)frame completionHandler:(void (^)(void))completionHandler+{+ UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title+ message:message+ preferredStyle:UIAlertControllerStyleAlert];++ UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")+ style:UIAlertActionStyleDefault+ handler:^(UIAlertAction* action)+ {+ completionHandler();+ [alert dismissViewControllerAnimated:YES completion:nil];+ }];++ [alert addAction:ok];++ UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController;++ [rootController presentViewController:alert animated:YES completion:nil];+}++- (void) webView:(WKWebView*)webView runJavaScriptConfirmPanelWithMessage:(NSString*)message+ initiatedByFrame:(WKFrameInfo*)frame completionHandler:(void (^)(BOOL result))completionHandler+{+ UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title+ message:message+ preferredStyle:UIAlertControllerStyleAlert];++ UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")+ style:UIAlertActionStyleDefault+ handler:^(UIAlertAction* action)+ {+ completionHandler(YES);+ [alert dismissViewControllerAnimated:YES completion:nil];+ }];++ [alert addAction:ok];++ UIAlertAction* cancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"Cancel")+ style:UIAlertActionStyleDefault+ handler:^(UIAlertAction* action)+ {+ completionHandler(NO);+ [alert dismissViewControllerAnimated:YES completion:nil];+ }];+ [alert addAction:cancel];++ UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController;++ [rootController presentViewController:alert animated:YES completion:nil];+}++- (void) webView:(WKWebView*)webView runJavaScriptTextInputPanelWithPrompt:(NSString*)prompt+ defaultText:(NSString*)defaultText initiatedByFrame:(WKFrameInfo*)frame+ completionHandler:(void (^)(NSString* result))completionHandler+{+ UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title+ message:prompt+ preferredStyle:UIAlertControllerStyleAlert];++ UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK")+ style:UIAlertActionStyleDefault+ handler:^(UIAlertAction* action)+ {+ completionHandler(((UITextField*)alert.textFields[0]).text);+ [alert dismissViewControllerAnimated:YES completion:nil];+ }];++ [alert addAction:ok];++ UIAlertAction* cancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"Cancel")+ style:UIAlertActionStyleDefault+ handler:^(UIAlertAction* action)+ {+ completionHandler(nil);+ [alert dismissViewControllerAnimated:YES completion:nil];+ }];+ [alert addAction:cancel];++ [alert addTextFieldWithConfigurationHandler:^(UITextField* textField) {+ textField.text = defaultText;+ }];++ UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController;++ [rootController presentViewController:alert animated:YES completion:nil];+}++@enddiff --git a/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist b/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plistindex 476adf9c5..14de8c33a 100644--- a/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist+++ b/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist@@ -17,17 +17,30 @@<key>CFBundlePackageType</key><string>APPL</string><key>CFBundleShortVersionString</key>- <string>1.0.0</string>+ <string>1.0.3</string><key>CFBundleSignature</key><string>????</string><key>CFBundleVersion</key>- <string>1.0.0</string>+ <string>1.0.3</string><key>LSRequiresIPhoneOS</key><true/>+ <key>NSAppTransportSecurity</key>+ <dict>+ <key>NSAllowsArbitraryLoads</key>+ <true/>+ </dict><key>NSMainNibFile</key>- <string/>+ <string></string><key>NSMainNibFile~ipad</key>- <string/>+ <string></string>+ <key>NSPhotoLibraryUsageDescription</key>+ <string>This app requires access to the photo library.</string>+ <key>NSCameraUsageDescription</key>+ <string>This app requires access to the camera.</string>+ <key>UIBackgroundModes</key>+ <array>+ <string>audio</string>+ </array><key>UIRequiresFullScreen</key><true/><key>UISupportedInterfaceOrientations</key>@@ -43,14 +56,5 @@<string>UIInterfaceOrientationPortraitUpsideDown</string><string>UIInterfaceOrientationLandscapeRight</string></array>- <key>NSAppTransportSecurity</key>- <dict>- <key>NSAllowsArbitraryLoads</key>- <true/>- </dict>- <key>UIBackgroundModes</key>- <array>- <string>audio</string>- </array></dict>-</plist>\ No newline at end of file+</plist>diff --git a/cordova/platforms/ios/TagSpaces Beta/config.xml b/cordova/platforms/ios/TagSpaces Beta/config.xmlindex 23ca76da5..b6f6dbe99 100755--- a/cordova/platforms/ios/TagSpaces Beta/config.xml+++ b/cordova/platforms/ios/TagSpaces Beta/config.xml@@ -36,6 +36,9 @@<feature name="FileOpener2"><param name="ios-package" value="FileOpener2" /></feature>+ <feature name="CDVWKWebViewEngine">+ <param name="ios-package" value="CDVWKWebViewEngine" />+ </feature><name>TagSpaces Beta</name><description>Offline file organizer and browser with tagging support.@@ -70,4 +73,6 @@<preference name="AndroidPersistentFileLocation" value="Compatibility" /><preference name="iosExtraFilesystems" value="library,library-nosync,documents,documents-nosync,cache,bundle,root" /><preference name="AndroidExtraFilesystems" value="files,files-external,documents,sdcard,cache,cache-external,assets,root" />+ <preference name="WKWebViewOnly" value="true" />+ <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" /></widget>diff --git a/cordova/platforms/ios/frameworks.json b/cordova/platforms/ios/frameworks.jsonindex dba8af258..bdec65c8d 100644--- a/cordova/platforms/ios/frameworks.json+++ b/cordova/platforms/ios/frameworks.json@@ -1,5 +1,6 @@{"ImageIO.framework": 1,"CoreLocation.framework": 1,- "AVFoundation.framework": 1+ "AVFoundation.framework": 1,+ "WebKit.framework": 1}\ No newline at end of filediff --git a/cordova/platforms/ios/ios.json b/cordova/platforms/ios/ios.jsonindex 4b7c4fde2..a8030a7be 100644--- a/cordova/platforms/ios/ios.json+++ b/cordova/platforms/ios/ios.json@@ -31,6 +31,14 @@{"xml": "<feature name=\"FileOpener2\"><param name=\"ios-package\" value=\"FileOpener2\" /></feature>","count": 1+ },+ {+ "xml": "<feature name=\"CDVWKWebViewEngine\"><param name=\"ios-package\" value=\"CDVWKWebViewEngine\" /></feature>",+ "count": 1+ },+ {+ "xml": "<preference name=\"CordovaWebViewEngine\" value=\"CDVWKWebViewEngine\" />",+ "count": 1}]}@@ -65,6 +73,9 @@},"cordova-plugin-whitelist": {"PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"+ },+ "cordova-plugin-wkwebview-engine": {+ "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"}},"dependent_plugins": {},@@ -298,6 +309,22 @@"clobbers": ["cordova.plugins.fileOpener2"]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "cordova.exec"+ ]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "window.WkWebView"+ ]}],"plugin_metadata": {@@ -306,6 +333,7 @@"cordova-plugin-camera": "4.1.0","cordova-plugin-file": "6.0.2","cordova-plugin-file-opener2": "3.0.4",- "cordova-plugin-whitelist": "1.3.4"+ "cordova-plugin-whitelist": "1.3.4",+ "cordova-plugin-wkwebview-engine": "1.2.1"}}diff --git a/cordova/platforms/ios/platform_www/cordova_plugins.js b/cordova/platforms/ios/platform_www/cordova_plugins.jsindex e8ef01fbe..023731eb1 100644--- a/cordova/platforms/ios/platform_www/cordova_plugins.js+++ b/cordova/platforms/ios/platform_www/cordova_plugins.js@@ -229,6 +229,22 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {"clobbers": ["cordova.plugins.fileOpener2"]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "cordova.exec"+ ]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "window.WkWebView"+ ]}];module.exports.metadata = {@@ -237,6 +253,7 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {"cordova-plugin-camera": "4.1.0","cordova-plugin-file": "6.0.2","cordova-plugin-file-opener2": "3.0.4",- "cordova-plugin-whitelist": "1.3.4"+ "cordova-plugin-whitelist": "1.3.4",+ "cordova-plugin-wkwebview-engine": "1.2.1"};});\ No newline at end of filediff --git a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.jsnew file mode 100644index 000000000..dc7595da2--- /dev/null+++ b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js@@ -0,0 +1,177 @@+cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview-exec", function(require, exports, module) {+/*+ *+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ *+*/++/**+ * Creates the exec bridge used to notify the native code of+ * commands.+ */+var cordova = require('cordova');+var utils = require('cordova/utils');+var base64 = require('cordova/base64');++function massageArgsJsToNative (args) {+ if (!args || utils.typeName(args) !== 'Array') {+ return args;+ }+ var ret = [];+ args.forEach(function (arg, i) {+ if (utils.typeName(arg) === 'ArrayBuffer') {+ ret.push({+ 'CDVType': 'ArrayBuffer',+ 'data': base64.fromArrayBuffer(arg)+ });+ } else {+ ret.push(arg);+ }+ });+ return ret;+}++function massageMessageNativeToJs (message) {+ if (message.CDVType === 'ArrayBuffer') {+ var stringToArrayBuffer = function (str) {+ var ret = new Uint8Array(str.length);+ for (var i = 0; i < str.length; i++) {+ ret[i] = str.charCodeAt(i);+ }+ return ret.buffer;+ };+ var base64ToArrayBuffer = function (b64) {+ return stringToArrayBuffer(atob(b64)); // eslint-disable-line no-undef+ };+ message = base64ToArrayBuffer(message.data);+ }+ return message;+}++function convertMessageToArgsNativeToJs (message) {+ var args = [];+ if (!message || !message.hasOwnProperty('CDVType')) {+ args.push(message);+ } else if (message.CDVType === 'MultiPart') {+ message.messages.forEach(function (e) {+ args.push(massageMessageNativeToJs(e));+ });+ } else {+ args.push(massageMessageNativeToJs(message));+ }+ return args;+}++var iOSExec = function () {+ // detect change in bridge, if there is a change, we forward to new bridge++ // if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) {+ // bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING;+ // }++ var successCallback, failCallback, service, action, actionArgs;+ var callbackId = null;+ if (typeof arguments[0] !== 'string') {+ // FORMAT ONE+ successCallback = arguments[0];+ failCallback = arguments[1];+ service = arguments[2];+ action = arguments[3];+ actionArgs = arguments[4];++ // Since we need to maintain backwards compatibility, we have to pass+ // an invalid callbackId even if no callback was provided since plugins+ // will be expecting it. The Cordova.exec() implementation allocates+ // an invalid callbackId and passes it even if no callbacks were given.+ callbackId = 'INVALID';+ } else {+ throw new Error('The old format of this exec call has been removed (deprecated since 2.1). Change to: ' + // eslint-disable-line+ 'cordova.exec(null, null, \'Service\', \'action\', [ arg1, arg2 ]);');+ }++ // If actionArgs is not provided, default to an empty array+ actionArgs = actionArgs || [];++ // Register the callbacks and add the callbackId to the positional+ // arguments if given.+ if (successCallback || failCallback) {+ callbackId = service + cordova.callbackId++;+ cordova.callbacks[callbackId] =+ {success: successCallback, fail: failCallback};+ }++ actionArgs = massageArgsJsToNative(actionArgs);++ // CB-10133 DataClone DOM Exception 25 guard (fast function remover)+ var command = [callbackId, service, action, JSON.parse(JSON.stringify(actionArgs))];+ window.webkit.messageHandlers.cordova.postMessage(command);+};++iOSExec.nativeCallback = function (callbackId, status, message, keepCallback, debug) {+ var success = status === 0 || status === 1;+ var args = convertMessageToArgsNativeToJs(message);+ Promise.resolve().then(function () {+ cordova.callbackFromNative(callbackId, success, status, args, keepCallback); // eslint-disable-line+ });+};++// for backwards compatibility+iOSExec.nativeEvalAndFetch = function (func) {+ try {+ func();+ } catch (e) {+ console.log(e);+ }+};++// Proxy the exec for bridge changes. See CB-10106++function cordovaExec () {+ var cexec = require('cordova/exec');+ var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function');+ return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec;+}++function execProxy () {+ cordovaExec().apply(null, arguments);+}++execProxy.nativeFetchMessages = function () {+ return cordovaExec().nativeFetchMessages.apply(null, arguments);+};++execProxy.nativeEvalAndFetch = function () {+ return cordovaExec().nativeEvalAndFetch.apply(null, arguments);+};++execProxy.nativeCallback = function () {+ return cordovaExec().nativeCallback.apply(null, arguments);+};++module.exports = execProxy;++if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) {+ // unregister the old bridge+ cordova.define.remove('cordova/exec');+ // redefine bridge to our new bridge+ cordova.define('cordova/exec', function (require, exports, module) {+ module.exports = execProxy;+ });+}++});diff --git a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.jsnew file mode 100644index 000000000..0dac749bd--- /dev/null+++ b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js@@ -0,0 +1,33 @@+cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview", function(require, exports, module) {+/*+ *+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ *+*/++var exec = require('cordova/exec');++var WkWebKit = {+ allowsBackForwardNavigationGestures: function (allow) {+ exec(null, null, 'CDVWKWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]);+ }+};++module.exports = WkWebKit;++});diff --git a/cordova/platforms/ios/www/cordova_plugins.js b/cordova/platforms/ios/www/cordova_plugins.jsindex e8ef01fbe..023731eb1 100644--- a/cordova/platforms/ios/www/cordova_plugins.js+++ b/cordova/platforms/ios/www/cordova_plugins.js@@ -229,6 +229,22 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {"clobbers": ["cordova.plugins.fileOpener2"]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "cordova.exec"+ ]+ },+ {+ "id": "cordova-plugin-wkwebview-engine.ios-wkwebview",+ "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js",+ "pluginId": "cordova-plugin-wkwebview-engine",+ "clobbers": [+ "window.WkWebView"+ ]}];module.exports.metadata = {@@ -237,6 +253,7 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {"cordova-plugin-camera": "4.1.0","cordova-plugin-file": "6.0.2","cordova-plugin-file-opener2": "3.0.4",- "cordova-plugin-whitelist": "1.3.4"+ "cordova-plugin-whitelist": "1.3.4",+ "cordova-plugin-wkwebview-engine": "1.2.1"};});\ No newline at end of filediff --git a/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js b/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.jsnew file mode 100644index 000000000..dc7595da2--- /dev/null+++ b/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js@@ -0,0 +1,177 @@+cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview-exec", function(require, exports, module) {+/*+ *+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ *+*/++/**+ * Creates the exec bridge used to notify the native code of+ * commands.+ */+var cordova = require('cordova');+var utils = require('cordova/utils');+var base64 = require('cordova/base64');++function massageArgsJsToNative (args) {+ if (!args || utils.typeName(args) !== 'Array') {+ return args;+ }+ var ret = [];+ args.forEach(function (arg, i) {+ if (utils.typeName(arg) === 'ArrayBuffer') {+ ret.push({+ 'CDVType': 'ArrayBuffer',+ 'data': base64.fromArrayBuffer(arg)+ });+ } else {+ ret.push(arg);+ }+ });+ return ret;+}++function massageMessageNativeToJs (message) {+ if (message.CDVType === 'ArrayBuffer') {+ var stringToArrayBuffer = function (str) {+ var ret = new Uint8Array(str.length);+ for (var i = 0; i < str.length; i++) {+ ret[i] = str.charCodeAt(i);+ }+ return ret.buffer;+ };+ var base64ToArrayBuffer = function (b64) {+ return stringToArrayBuffer(atob(b64)); // eslint-disable-line no-undef+ };+ message = base64ToArrayBuffer(message.data);+ }+ return message;+}++function convertMessageToArgsNativeToJs (message) {+ var args = [];+ if (!message || !message.hasOwnProperty('CDVType')) {+ args.push(message);+ } else if (message.CDVType === 'MultiPart') {+ message.messages.forEach(function (e) {+ args.push(massageMessageNativeToJs(e));+ });+ } else {+ args.push(massageMessageNativeToJs(message));+ }+ return args;+}++var iOSExec = function () {+ // detect change in bridge, if there is a change, we forward to new bridge++ // if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) {+ // bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING;+ // }++ var successCallback, failCallback, service, action, actionArgs;+ var callbackId = null;+ if (typeof arguments[0] !== 'string') {+ // FORMAT ONE+ successCallback = arguments[0];+ failCallback = arguments[1];+ service = arguments[2];+ action = arguments[3];+ actionArgs = arguments[4];++ // Since we need to maintain backwards compatibility, we have to pass+ // an invalid callbackId even if no callback was provided since plugins+ // will be expecting it. The Cordova.exec() implementation allocates+ // an invalid callbackId and passes it even if no callbacks were given.+ callbackId = 'INVALID';+ } else {+ throw new Error('The old format of this exec call has been removed (deprecated since 2.1). Change to: ' + // eslint-disable-line+ 'cordova.exec(null, null, \'Service\', \'action\', [ arg1, arg2 ]);');+ }++ // If actionArgs is not provided, default to an empty array+ actionArgs = actionArgs || [];++ // Register the callbacks and add the callbackId to the positional+ // arguments if given.+ if (successCallback || failCallback) {+ callbackId = service + cordova.callbackId++;+ cordova.callbacks[callbackId] =+ {success: successCallback, fail: failCallback};+ }++ actionArgs = massageArgsJsToNative(actionArgs);++ // CB-10133 DataClone DOM Exception 25 guard (fast function remover)+ var command = [callbackId, service, action, JSON.parse(JSON.stringify(actionArgs))];+ window.webkit.messageHandlers.cordova.postMessage(command);+};++iOSExec.nativeCallback = function (callbackId, status, message, keepCallback, debug) {+ var success = status === 0 || status === 1;+ var args = convertMessageToArgsNativeToJs(message);+ Promise.resolve().then(function () {+ cordova.callbackFromNative(callbackId, success, status, args, keepCallback); // eslint-disable-line+ });+};++// for backwards compatibility+iOSExec.nativeEvalAndFetch = function (func) {+ try {+ func();+ } catch (e) {+ console.log(e);+ }+};++// Proxy the exec for bridge changes. See CB-10106++function cordovaExec () {+ var cexec = require('cordova/exec');+ var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function');+ return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec;+}++function execProxy () {+ cordovaExec().apply(null, arguments);+}++execProxy.nativeFetchMessages = function () {+ return cordovaExec().nativeFetchMessages.apply(null, arguments);+};++execProxy.nativeEvalAndFetch = function () {+ return cordovaExec().nativeEvalAndFetch.apply(null, arguments);+};++execProxy.nativeCallback = function () {+ return cordovaExec().nativeCallback.apply(null, arguments);+};++module.exports = execProxy;++if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) {+ // unregister the old bridge+ cordova.define.remove('cordova/exec');+ // redefine bridge to our new bridge+ cordova.define('cordova/exec', function (require, exports, module) {+ module.exports = execProxy;+ });+}++});diff --git a/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js b/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.jsnew file mode 100644index 000000000..0dac749bd--- /dev/null+++ b/cordova/platforms/ios/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js@@ -0,0 +1,33 @@+cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview", function(require, exports, module) {+/*+ *+ * Licensed to the Apache Software Foundation (ASF) under one+ * or more contributor license agreements. See the NOTICE file+ * distributed with this work for additional information+ * regarding copyright ownership. The ASF licenses this file+ * to you under the Apache License, Version 2.0 (the+ * "License"); you may not use this file except in compliance+ * with the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing,+ * software distributed under the License is distributed on an+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY+ * KIND, either express or implied. See the License for the+ * specific language governing permissions and limitations+ * under the License.+ *+*/++var exec = require('cordova/exec');++var WkWebKit = {+ allowsBackForwardNavigationGestures: function (allow) {+ exec(null, null, 'CDVWKWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]);+ }+};++module.exports = WkWebKit;++});diff --git a/cordova/yarn.lock b/cordova/yarn.lockindex 92d5365d1..1057e6ddb 100644--- a/cordova/yarn.lock+++ b/cordova/yarn.lock@@ -29,16 +29,45 @@ [email protected]:resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=+base64-js@^1.2.3:+ version "1.3.1"+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"+ integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==+version "1.6.32"resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.32.tgz#5867458b25ecd5bcb36b627c30bb501a13c07e89"integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==+big-integer@^1.6.44:+ version "1.6.48"+ resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"+ integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==+big-integer@^1.6.7:version "1.6.40"resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.40.tgz#02e4cd4d6e266c4d9ece2469c05cb6439149fc78"integrity sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==+ version "0.0.8"+ resolved "https://registry.yarnpkg.com/bplist-creator/-/bplist-creator-0.0.8.tgz#56b2a6e79e9aec3fc33bf831d09347d73794e79c"+ integrity sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==+ dependencies:+ stream-buffers "~2.2.0"++ version "0.2.0"+ resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"+ integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==+ dependencies:+ big-integer "^1.6.44"++bplist-parser@^0.0.6:+ version "0.0.6"+ resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.0.6.tgz#38da3471817df9d44ab3892e27707bbbd75a11b9"+ integrity sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk=+bplist-parser@^0.1.0:version "0.1.1"resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"@@ -97,6 +126,41 @@ [email protected]:underscore "^1.8.3"unorm "^1.3.3"+cordova-common@^3.1.0:+ version "3.2.1"+ resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-3.2.1.tgz#f4fdbeb40d9049fe28a09fa901756ed66d246661"+ integrity sha512-xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q==+ dependencies:+ ansi "^0.3.1"+ bplist-parser "^0.1.0"+ cross-spawn "^6.0.5"+ elementtree "0.1.7"+ endent "^1.1.1"+ fs-extra "^8.0.0"+ glob "^7.1.2"+ minimatch "^3.0.0"+ plist "^3.0.1"+ q "^1.4.1"+ strip-bom "^3.0.0"+ underscore "^1.8.3"+ which "^1.3.0"++cordova-ios@^5.1.1:+ version "5.1.1"+ resolved "https://registry.yarnpkg.com/cordova-ios/-/cordova-ios-5.1.1.tgz#31b8a8e5a45bc604e46dab60fa25faf50543356f"+ integrity sha512-asZMCj44JMe/PMrDIRC97GStPCH+GpaMNVe8hdmu8WWXJzMzRNRRJ339YYU89jitWf9ZKMdyBgrnSnQi5bJ/ZQ==+ dependencies:+ cordova-common "^3.1.0"+ ios-sim "^8.0.1"+ nopt "^4.0.1"+ plist "^3.0.1"+ q "^1.5.1"+ semver "^6.3.0"+ shelljs "^0.5.3"+ unorm "^1.4.1"+ xcode "^2.0.0"+ xml-escape "^1.1.0"+cordova-plugin-background-mode@^0.7.3:version "0.7.3"resolved "https://registry.yarnpkg.com/cordova-plugin-background-mode/-/cordova-plugin-background-mode-0.7.3.tgz#066f92c99f403b3ed3d6fb91f281a0a7ccbc84ba"@@ -127,6 +191,11 @@ cordova-plugin-whitelist@^1.3.4:resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.4.tgz#31938545c7c3e7de35c20ab08c2c3afa06e8a3f9"integrity sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ==+cordova-plugin-wkwebview-engine@^1.2.1:+ version "1.2.1"+ resolved "https://registry.yarnpkg.com/cordova-plugin-wkwebview-engine/-/cordova-plugin-wkwebview-engine-1.2.1.tgz#f8972282969355d2d2f3458b23f604210e45eaf3"+ integrity sha512-usp6pu+tJ1y0btVAXOjE5+tMjbvTY6hsiLfHJPMdyzkgHvxoNSePZ/NavTGj4CBJJlUjnMsN3TUq25+SeTZCow==+cordova-plugin-x-socialsharing@^5.6.8:version "5.6.8"resolved "https://registry.yarnpkg.com/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.6.8.tgz#81993336fa4260eb76a23ed1680cd63e1c72b040"@@ -137,6 +206,22 @@ cordova-registry-mapper@^1.1.8:resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=+cross-spawn@^6.0.5:+ version "6.0.5"+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"+ integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==+ dependencies:+ nice-try "^1.0.4"+ path-key "^2.0.1"+ semver "^5.5.0"+ shebang-command "^1.2.0"+ which "^1.2.9"++dedent@^0.7.0:+ version "0.7.0"+ resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"+ integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=+version "0.1.6"resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"@@ -144,11 +229,46 @@ [email protected]:dependencies:sax "0.3.5"+ version "0.1.7"+ resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.7.tgz#9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"+ integrity sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=+ dependencies:+ sax "1.1.4"++endent@^1.1.1:+ version "1.4.1"+ resolved "https://registry.yarnpkg.com/endent/-/endent-1.4.1.tgz#c58cc13dfc432d0b2c7faf74c13ffdca60b2d1c8"+ integrity sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==+ dependencies:+ dedent "^0.7.0"+ fast-json-parse "^1.0.3"+ objectorarray "^1.0.4"+es6-promise-plugin@^4.2.2:version "4.2.2"resolved "https://registry.yarnpkg.com/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz#cfa0cc1383d91f999a62a2bbf4bd97bec305e0ac"integrity sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA==+fast-json-parse@^1.0.3:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"+ integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==++fs-extra@^8.0.0:+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==+ dependencies:+ graceful-fs "^4.2.0"+ jsonfile "^4.0.0"+ universalify "^0.1.0"++fs.realpath@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=+[email protected], glob@^5.0.13:version "5.0.15"resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"@@ -160,6 +280,23 @@ [email protected], glob@^5.0.13:once "^1.3.0"path-is-absolute "^1.0.0"+glob@^7.1.2:+ version "7.1.6"+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"+ integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==+ dependencies:+ fs.realpath "^1.0.0"+ inflight "^1.0.4"+ inherits "2"+ minimatch "^3.0.4"+ once "^1.3.0"+ path-is-absolute "^1.0.0"++graceful-fs@^4.1.6, graceful-fs@^4.2.0:+ version "4.2.4"+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==+inflight@^1.0.4:version "1.0.6"resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"@@ -173,13 +310,47 @@ inherits@2:resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=-"minimatch@2 || 3", minimatch@^3.0.0:+ios-sim@^8.0.1:+ version "8.0.2"+ resolved "https://registry.yarnpkg.com/ios-sim/-/ios-sim-8.0.2.tgz#e2394acb6db4378f75f4c3ff8610bbf4f4795c43"+ integrity sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==+ dependencies:+ bplist-parser "^0.0.6"+ nopt "1.0.9"+ plist "^3.0.1"+ simctl "^2"++isexe@^2.0.0:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=++jsonfile@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"+ integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=+ optionalDependencies:+ graceful-fs "^4.1.6"++"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:version "3.0.4"resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==dependencies:brace-expansion "^1.1.7"+nice-try@^1.0.4:+ version "1.0.5"+ resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"+ integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==++ version "1.0.9"+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.9.tgz#3bc0d7cba7bfb0d5a676dbed7c0ebe48a4fd454e"+ integrity sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=+ dependencies:+ abbrev "1"+version "3.0.1"resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.1.tgz#bce5c42446a3291f47622a370abbf158fbbacbfd"@@ -187,6 +358,19 @@ [email protected]:dependencies:abbrev "1"+nopt@^4.0.1:+ version "4.0.3"+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"+ integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==+ dependencies:+ abbrev "1"+ osenv "^0.1.4"++objectorarray@^1.0.4:+ version "1.0.4"+ resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483"+ integrity sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==+once@^1.3.0:version "1.4.0"resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"@@ -194,11 +378,34 @@ once@^1.3.0:dependencies:wrappy "1"+os-homedir@^1.0.0:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"+ integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=++os-tmpdir@^1.0.0:+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"+ integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=++osenv@^0.1.4:+ version "0.1.5"+ resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"+ integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==+ dependencies:+ os-homedir "^1.0.0"+ os-tmpdir "^1.0.0"+[email protected], path-is-absolute@^1.0.0:version "1.0.1"resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=+path-key@^2.0.1:+ version "2.0.1"+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"+ integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=+[email protected], plist@^2.1.0:version "2.1.0"resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"@@ -208,6 +415,15 @@ [email protected], plist@^2.1.0:xmlbuilder "8.2.2"xmldom "0.1.x"+plist@^3.0.1:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"+ integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==+ dependencies:+ base64-js "^1.2.3"+ xmlbuilder "^9.0.7"+ xmldom "0.1.x"+version "0.2.3"resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f"@@ -218,7 +434,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=-q@^1.4.1:+q@^1.4.1, q@^1.5.1:version "1.5.1"resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=@@ -228,6 +444,11 @@ [email protected]:resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"integrity sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0=+ version "1.1.4"+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.4.tgz#74b6d33c9ae1e001510f179a91168588f1aedaa9"+ integrity sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=+version "5.5.0"resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"@@ -238,31 +459,125 @@ semver@^5.4.1:resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==+semver@^5.5.0:+ version "5.7.1"+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"+ integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==++semver@^6.3.0:+ version "6.3.0"+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==++shebang-command@^1.2.0:+ version "1.2.0"+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"+ integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=+ dependencies:+ shebang-regex "^1.0.0"++shebang-regex@^1.0.0:+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"+ integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=+[email protected], shelljs@^0.5.3:version "0.5.3"resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=+shelljs@^0.2.6:+ version "0.2.6"+ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.2.6.tgz#90492d72ffcc8159976baba62fb0f6884f0c3378"+ integrity sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=++simctl@^2:+ version "2.0.0"+ resolved "https://registry.yarnpkg.com/simctl/-/simctl-2.0.0.tgz#e3f1c6908735969e23e0922b0cb1161843dd0c59"+ integrity sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==+ dependencies:+ shelljs "^0.2.6"+ tail "^0.4.0"++simple-plist@^1.0.0:+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.1.0.tgz#8354ab63eb3922a054c78ce96c209c532e907a23"+ integrity sha512-2i5Tc0BYAqppM7jVzmNrI+aEUntPolIq4fDgji6WuNNn1D/qYdn2KwoLhZdzQkE04lu9L5tUoeJsjuJAvd+lFg==+ dependencies:+ bplist-creator "0.0.8"+ bplist-parser "0.2.0"+ plist "^3.0.1"++stream-buffers@~2.2.0:+ version "2.2.0"+ resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"+ integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=++strip-bom@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"+ integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=++tail@^0.4.0:+ version "0.4.0"+ resolved "https://registry.yarnpkg.com/tail/-/tail-0.4.0.tgz#d29de72750cc99db1e053aff13c359ecfb713002"+ integrity sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI=+underscore@^1.8.3:version "1.9.1"resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==-unorm@^1.3.3:+universalify@^0.1.0:+ version "0.1.2"+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==++unorm@^1.3.3, unorm@^1.4.1:version "1.6.0"resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==+uuid@^3.3.2:+ version "3.4.0"+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"+ integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==++which@^1.2.9, which@^1.3.0:+ version "1.3.1"+ resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"+ integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==+ dependencies:+ isexe "^2.0.0"+wrappy@1:version "1.0.2"resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=+xcode@^2.0.0:+ version "2.1.0"+ resolved "https://registry.yarnpkg.com/xcode/-/xcode-2.1.0.tgz#bab64a7e954bb50ca8d19da7e09531c65a43ecfe"+ integrity sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==+ dependencies:+ simple-plist "^1.0.0"+ uuid "^3.3.2"++xml-escape@^1.1.0:+ version "1.1.0"+ resolved "https://registry.yarnpkg.com/xml-escape/-/xml-escape-1.1.0.tgz#3904c143fa8eb3a0030ec646d2902a2f1b706c44"+ integrity sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ=+version "8.2.2"resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=+xmlbuilder@^9.0.7:+ version "9.0.7"+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"+ integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=+version "0.1.27"resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"