Skip to content

TagSpaces is an offline, open source, document manager with tagging support

change bundle id: org.tagspaces.iosn

stanimiraf90cb714e94
diff --git a/cordova/config.xml b/cordova/config.xml
index 1e41c3cbf..dd3e666bb 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="org.tagspaces.mobile" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.tagspaces.iosn" version="1.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>TagSpaces Beta</name>
<description>
Offline file organizer and browser with tagging support.
@@ -25,7 +25,7 @@
<icon density="xxxhdpi" src="res/icon/android/mipmap-xxxhdpi/ic_launcher.png" />
</platform>
<platform name="ios">
- <preference name="InterceptRemoteRequests" value="all" />
+ <preference name="NativeXHRLogging" value="full" />
<preference name="allowFileAccessFromFileURLs" value="true" />
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
@@ -36,8 +36,5 @@
<plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-background-mode" spec="^0.7.3" />
- <plugin name="cordova-plugin-camera" spec="4.1.0">
- <variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
- </plugin>
<plugin name="cordova-plugin-file" spec="6.0.2" />
</widget>
diff --git a/cordova/package.json b/cordova/package.json
index e958f5c98..0221673b0 100644
--- a/cordova/package.json
+++ b/cordova/package.json
@@ -1,5 +1,5 @@
{
- "name": "org.tagspaces.mobile",
+ "name": "org.tagspaces.iosn",
"displayName": "TagSpaces",
"version": "1.0.4",
"description": "A sample Apache Cordova application that responds to the deviceready event.",
@@ -11,7 +11,6 @@
"license": "Apache-2.0",
"dependencies": {
"cordova-plugin-background-mode": "^0.7.3",
- "cordova-plugin-camera": "4.1.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "^3.0.3",
@@ -23,9 +22,6 @@
"cordova-plugin-whitelist": {},
"cordova-plugin-device": {},
"cordova-plugin-background-mode": {},
- "cordova-plugin-camera": {
- "ANDROID_SUPPORT_V4_VERSION": "27.+"
- },
"cordova-plugin-file": {},
"cordova-plugin-file-opener2": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
@@ -36,6 +32,9 @@
"PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
},
+ "cordova-plugin-camera": {
+ "ANDROID_SUPPORT_V4_VERSION": "27.+"
+ },
"cordova-plugin-ios-xhr": {}
},
"platforms": [
@@ -44,9 +43,9 @@
]
},
"devDependencies": {
- "@globules-io/cordova-plugin-ios-xhr": "^1.0.3",
+ "@globules-io/cordova-plugin-ios-xhr": "^1.0.4",
"bamboo.cordova.plugin.downloader": "git+https://github.com/sytolk/cordova-plugin-downloader.git",
"cordova-android": "^9.0.0",
"cordova-ios": "^6.1.0"
}
-}
+}
\ No newline at end of file
diff --git a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/BuildHelper.java b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/BuildHelper.java
index 02d9ea003..94fe96120 100644
--- a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/BuildHelper.java
+++ b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/BuildHelper.java
@@ -70,4 +70,4 @@ public class BuildHelper {
return null;
}
-}
+}
\ No newline at end of file
diff --git a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaClientCertRequest.java b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaClientCertRequest.java
index e68225b44..1417a156c 100644
--- a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaClientCertRequest.java
+++ b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaClientCertRequest.java
@@ -63,4 +63,4 @@ public interface ICordovaClientCertRequest {
* @param chain The certificate chain
*/
public void proceed(PrivateKey privateKey, X509Certificate[] chain);
-}
+}
\ No newline at end of file
diff --git a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaHttpAuthHandler.java b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaHttpAuthHandler.java
index bc443a2b2..c89e5b9a2 100644
--- a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaHttpAuthHandler.java
+++ b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/ICordovaHttpAuthHandler.java
@@ -35,4 +35,4 @@ package org.apache.cordova;
* @param password The password
*/
public void proceed (String username, String password);
-}
+}
\ No newline at end of file
diff --git a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebChromeClient.java b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebChromeClient.java
index 03816ddec..cad098e45 100755
--- a/cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/cordova/platforms/android/CordovaLib/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -220,7 +220,7 @@ public class SystemWebChromeClient extends WebChromeClient {
}
Intent intent = fileChooserParams.createIntent();
intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, selectMultiple);
-
+
// Uses Intent.EXTRA_MIME_TYPES to pass multiple mime types.
String[] acceptTypes = fileChooserParams.getAcceptTypes();
if (acceptTypes.length > 1) {
diff --git a/cordova/platforms/android/android.json b/cordova/platforms/android/android.json
index d725bf491..7b1e6868a 100644
--- a/cordova/platforms/android/android.json
+++ b/cordova/platforms/android/android.json
@@ -5,109 +5,109 @@
},
"config_munge": {
"files": {
- "res/xml/config.xml": {
+ "AndroidManifest.xml": {
"parents": {
- "/*": [
+ "/manifest": [
{
- "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
+ "xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
"count": 1
},
{
- "xml": "<feature name=\"BackgroundMode\"><param name=\"android-package\" value=\"de.appplant.cordova.plugin.background.BackgroundMode\" /></feature>",
+ "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
"count": 1
},
{
- "xml": "<feature name=\"BackgroundModeExt\"><param name=\"android-package\" value=\"de.appplant.cordova.plugin.background.BackgroundModeExt\" /></feature>",
+ "xml": "<uses-permission android:name=\"android.permission.WAKE_LOCK\" />",
"count": 1
- },
+ }
+ ],
+ "/manifest/application": [
{
- "xml": "<preference name=\"KeepRunning\" value=\"true\" />",
+ "xml": "<service android:name=\"de.appplant.cordova.plugin.background.ForegroundService\" />",
"count": 1
},
{
- "xml": "<feature name=\"Camera\"><param name=\"android-package\" value=\"org.apache.cordova.camera.CameraLauncher\" /></feature>",
+ "xml": "<provider android:authorities=\"${applicationId}.sharing.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"nl.xservices.plugins.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/sharing_paths\" /></provider>",
"count": 1
- },
+ }
+ ],
+ "/*": [
{
- "xml": "<feature name=\"File\"><param name=\"android-package\" value=\"org.apache.cordova.file.FileUtils\" /><param name=\"onload\" value=\"true\" /></feature>",
- "count": 1
+ "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+ "count": 3
},
{
- "xml": "<allow-navigation href=\"cdvfile:*\" />",
+ "xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
"count": 1
},
{
- "xml": "<feature name=\"FileOpener2\"><param name=\"android-package\" value=\"io.github.pwlin.cordova.plugins.fileopener2.FileOpener2\" /></feature>",
+ "xml": "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
"count": 1
- },
+ }
+ ],
+ "application": [
{
- "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
+ "xml": "<provider android:authorities=\"${applicationId}.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"org.apache.cordova.camera.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/camera_provider_paths\" /></provider>",
"count": 1
},
{
- "xml": "<feature name=\"Downloader\"><param name=\"android-package\" value=\"com.whebcraft.android.plugin.Downloader\" /></feature>",
+ "xml": "<provider android:authorities=\"${applicationId}.fileOpener2.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"io.github.pwlin.cordova.plugins.fileopener2.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/opener_paths\" /></provider>",
"count": 1
- },
+ }
+ ],
+ "/*/application": [
{
- "xml": "<feature name=\"SocialSharing\"><param name=\"android-package\" value=\"nl.xservices.plugins.SocialSharing\" /></feature>",
+ "xml": "<receiver android:enabled=\"true\" android:name=\"nl.xservices.plugins.ShareChooserPendingIntent\"><intent-filter><action android:name=\"android.intent.action.SEND\" /></intent-filter></receiver>",
"count": 1
}
]
}
},
- "AndroidManifest.xml": {
+ "res/xml/config.xml": {
"parents": {
- "/manifest/application": [
+ "/*": [
{
- "xml": "<service android:name=\"de.appplant.cordova.plugin.background.ForegroundService\" />",
+ "xml": "<feature name=\"Downloader\"><param name=\"android-package\" value=\"com.whebcraft.android.plugin.Downloader\" /></feature>",
"count": 1
},
{
- "xml": "<provider android:authorities=\"${applicationId}.sharing.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"nl.xservices.plugins.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/sharing_paths\" /></provider>",
+ "xml": "<feature name=\"Device\"><param name=\"android-package\" value=\"org.apache.cordova.device.Device\" /></feature>",
"count": 1
- }
- ],
- "/manifest": [
+ },
{
- "xml": "<uses-permission android:name=\"android.permission.WAKE_LOCK\" />",
+ "xml": "<feature name=\"BackgroundMode\"><param name=\"android-package\" value=\"de.appplant.cordova.plugin.background.BackgroundMode\" /></feature>",
"count": 1
},
{
- "xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
+ "xml": "<feature name=\"BackgroundModeExt\"><param name=\"android-package\" value=\"de.appplant.cordova.plugin.background.BackgroundModeExt\" /></feature>",
"count": 1
},
{
- "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+ "xml": "<preference name=\"KeepRunning\" value=\"true\" />",
"count": 1
- }
- ],
- "/*": [
+ },
{
- "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
- "count": 3
+ "xml": "<feature name=\"Camera\"><param name=\"android-package\" value=\"org.apache.cordova.camera.CameraLauncher\" /></feature>",
+ "count": 1
},
{
- "xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
+ "xml": "<feature name=\"File\"><param name=\"android-package\" value=\"org.apache.cordova.file.FileUtils\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
},
{
- "xml": "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
+ "xml": "<allow-navigation href=\"cdvfile:*\" />",
"count": 1
- }
- ],
- "application": [
+ },
{
- "xml": "<provider android:authorities=\"${applicationId}.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"org.apache.cordova.camera.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/camera_provider_paths\" /></provider>",
+ "xml": "<feature name=\"FileOpener2\"><param name=\"android-package\" value=\"io.github.pwlin.cordova.plugins.fileopener2.FileOpener2\" /></feature>",
"count": 1
},
{
- "xml": "<provider android:authorities=\"${applicationId}.fileOpener2.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"io.github.pwlin.cordova.plugins.fileopener2.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/opener_paths\" /></provider>",
+ "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
- }
- ],
- "/*/application": [
+ },
{
- "xml": "<receiver android:enabled=\"true\" android:name=\"nl.xservices.plugins.ShareChooserPendingIntent\"><intent-filter><action android:name=\"android.intent.action.SEND\" /></intent-filter></receiver>",
+ "xml": "<feature name=\"SocialSharing\"><param name=\"android-package\" value=\"nl.xservices.plugins.SocialSharing\" /></feature>",
"count": 1
}
]
@@ -116,42 +116,50 @@
}
},
"installed_plugins": {
+ "com.whebcraft.cordova.plugin.downloader": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
+ },
"cordova-plugin-device": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-background-mode": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-camera": {
"ANDROID_SUPPORT_V4_VERSION": "27.+",
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-file": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-file-opener2": {
"ANDROID_SUPPORT_V4_VERSION": "27.+",
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
- "cordova-plugin-whitelist": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "cordova-plugin-ios-xhr": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
- "com.whebcraft.cordova.plugin.downloader": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "cordova-plugin-whitelist": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"es6-promise-plugin": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-x-socialsharing": {
"ANDROID_SUPPORT_V4_VERSION": "24.1.1+",
- "PACKAGE_NAME": "org.tagspaces.mobile"
- },
- "cordova-plugin-ios-xhr": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
}
},
"dependent_plugins": {},
"modules": [
+ {
+ "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
+ "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
+ "pluginId": "com.whebcraft.cordova.plugin.downloader",
+ "clobbers": [
+ "plugins.Downloader"
+ ]
+ },
{
"id": "cordova-plugin-device.device",
"file": "plugins/cordova-plugin-device/www/device.js",
@@ -382,14 +390,6 @@
"cordova.plugins.fileOpener2"
]
},
- {
- "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
- "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
- "pluginId": "com.whebcraft.cordova.plugin.downloader",
- "clobbers": [
- "plugins.Downloader"
- ]
- },
{
"id": "es6-promise-plugin.Promise",
"file": "plugins/es6-promise-plugin/www/promise.js",
@@ -406,15 +406,15 @@
}
],
"plugin_metadata": {
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"cordova-plugin-device": "2.0.3",
"cordova-plugin-background-mode": "0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "3.0.4",
+ "cordova-plugin-ios-xhr": "1.0.0",
"cordova-plugin-whitelist": "1.3.4",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"es6-promise-plugin": "4.2.2",
- "cordova-plugin-x-socialsharing": "5.6.8",
- "cordova-plugin-ios-xhr": "1.0.0"
+ "cordova-plugin-x-socialsharing": "5.6.8"
}
}
diff --git a/cordova/platforms/android/app/src/main/AndroidManifest.xml b/cordova/platforms/android/app/src/main/AndroidManifest.xml
index 29c2538c2..2737661c3 100644
--- a/cordova/platforms/android/app/src/main/AndroidManifest.xml
+++ b/cordova/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10000" android:versionName="1.0.0" package="org.tagspaces.mobile" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10004" android:versionName="1.0.4" package="org.tagspaces.iosn" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true">
@@ -25,8 +25,8 @@
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/sharing_paths" />
</provider>
</application>
- <uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
</manifest>
diff --git a/cordova/platforms/android/app/src/main/java/org/tagspaces/mobile/MainActivity.java b/cordova/platforms/android/app/src/main/java/org/tagspaces/iosn/MainActivity.java
similarity index 97%
rename from cordova/platforms/android/app/src/main/java/org/tagspaces/mobile/MainActivity.java
rename to cordova/platforms/android/app/src/main/java/org/tagspaces/iosn/MainActivity.java
index 76558b5d0..d89b1587a 100644
--- a/cordova/platforms/android/app/src/main/java/org/tagspaces/mobile/MainActivity.java
+++ b/cordova/platforms/android/app/src/main/java/org/tagspaces/iosn/MainActivity.java
@@ -17,7 +17,7 @@
under the License.
*/
-package org.tagspaces.mobile;
+package org.tagspaces.iosn;
import android.os.Bundle;
import org.apache.cordova.*;
diff --git a/cordova/platforms/android/app/src/main/res/xml/config.xml b/cordova/platforms/android/app/src/main/res/xml/config.xml
index b4e4eafd5..d871992a9 100644
--- a/cordova/platforms/android/app/src/main/res/xml/config.xml
+++ b/cordova/platforms/android/app/src/main/res/xml/config.xml
@@ -1,5 +1,8 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="org.tagspaces.mobile" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.tagspaces.iosn" version="1.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+ <feature name="Downloader">
+ <param name="android-package" value="com.whebcraft.android.plugin.Downloader" />
+ </feature>
<feature name="Device">
<param name="android-package" value="org.apache.cordova.device.Device" />
</feature>
@@ -24,9 +27,6 @@
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
<param name="onload" value="true" />
</feature>
- <feature name="Downloader">
- <param name="android-package" value="com.whebcraft.android.plugin.Downloader" />
- </feature>
<feature name="SocialSharing">
<param name="android-package" value="nl.xservices.plugins.SocialSharing" />
</feature>
diff --git a/cordova/platforms/android/cordova/lib/install-device.bat b/cordova/platforms/android/cordova/lib/install-device.bat
index fe5d74304..0be9ebd03 100644
--- a/cordova/platforms/android/cordova/lib/install-device.bat
+++ b/cordova/platforms/android/cordova/lib/install-device.bat
@@ -23,4 +23,4 @@ IF EXIST %script_path% (
ECHO.
ECHO ERROR: Could not find 'install-device' script in 'cordova\lib' folder, aborting...>&2
EXIT /B 1
-)
+)
\ No newline at end of file
diff --git a/cordova/platforms/android/cordova/lib/install-emulator.bat b/cordova/platforms/android/cordova/lib/install-emulator.bat
index c9e56fc5a..21e88c530 100644
--- a/cordova/platforms/android/cordova/lib/install-emulator.bat
+++ b/cordova/platforms/android/cordova/lib/install-emulator.bat
@@ -23,4 +23,4 @@ IF EXIST %script_path% (
ECHO.
ECHO ERROR: Could not find 'install-emulator' script in 'cordova\lib' folder, aborting...>&2
EXIT /B 1
-)
+)
\ No newline at end of file
diff --git a/cordova/platforms/android/cordova/lib/list-devices.bat b/cordova/platforms/android/cordova/lib/list-devices.bat
index 04abda8e1..7e04cf946 100644
--- a/cordova/platforms/android/cordova/lib/list-devices.bat
+++ b/cordova/platforms/android/cordova/lib/list-devices.bat
@@ -23,4 +23,4 @@ IF EXIST %script_path% (
ECHO.
ECHO ERROR: Could not find 'list-devices' script in 'cordova\lib' folder, aborting...>&2
EXIT /B 1
-)
+)
\ No newline at end of file
diff --git a/cordova/platforms/android/cordova/lib/list-started-emulators.bat b/cordova/platforms/android/cordova/lib/list-started-emulators.bat
index 56243fc2b..99547aa4d 100644
--- a/cordova/platforms/android/cordova/lib/list-started-emulators.bat
+++ b/cordova/platforms/android/cordova/lib/list-started-emulators.bat
@@ -23,4 +23,4 @@ IF EXIST %script_path% (
ECHO.
ECHO ERROR: Could not find 'list-started-emulators' script in 'cordova\lib' folder, aborting...>&2
EXIT /B 1
-)
+)
\ No newline at end of file
diff --git a/cordova/platforms/android/cordova/lib/start-emulator.bat b/cordova/platforms/android/cordova/lib/start-emulator.bat
index bf341b72c..82c6f8908 100644
--- a/cordova/platforms/android/cordova/lib/start-emulator.bat
+++ b/cordova/platforms/android/cordova/lib/start-emulator.bat
@@ -23,4 +23,4 @@ IF EXIST %script_path% (
ECHO.
ECHO ERROR: Could not find 'start-emulator' script in 'cordova\lib' folder, aborting...>&2
EXIT /B 1
-)
+)
\ No newline at end of file
diff --git a/cordova/platforms/android/gradle.properties b/cordova/platforms/android/gradle.properties
index 821729695..3ad35a4ab 100644
--- a/cordova/platforms/android/gradle.properties
+++ b/cordova/platforms/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.daemon=true
org.gradle.jvmargs=-Xmx2048m
android.useAndroidX=false
android.enableJetifier=false
-cdvMinSdkVersion=23
+cdvMinSdkVersion=23
\ No newline at end of file
diff --git a/cordova/platforms/android/platform_www/cordova_plugins.js b/cordova/platforms/android/platform_www/cordova_plugins.js
index ae3bc4eb1..ddbde48b4 100644
--- a/cordova/platforms/android/platform_www/cordova_plugins.js
+++ b/cordova/platforms/android/platform_www/cordova_plugins.js
@@ -1,5 +1,13 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
+ {
+ "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
+ "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
+ "pluginId": "com.whebcraft.cordova.plugin.downloader",
+ "clobbers": [
+ "plugins.Downloader"
+ ]
+ },
{
"id": "cordova-plugin-device.device",
"file": "plugins/cordova-plugin-device/www/device.js",
@@ -230,14 +238,6 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
"cordova.plugins.fileOpener2"
]
},
- {
- "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
- "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
- "pluginId": "com.whebcraft.cordova.plugin.downloader",
- "clobbers": [
- "plugins.Downloader"
- ]
- },
{
"id": "es6-promise-plugin.Promise",
"file": "plugins/es6-promise-plugin/www/promise.js",
@@ -254,15 +254,15 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
}
];
module.exports.metadata = {
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"cordova-plugin-device": "2.0.3",
"cordova-plugin-background-mode": "0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "3.0.4",
+ "cordova-plugin-ios-xhr": "1.0.0",
"cordova-plugin-whitelist": "1.3.4",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"es6-promise-plugin": "4.2.2",
- "cordova-plugin-x-socialsharing": "5.6.8",
- "cordova-plugin-ios-xhr": "1.0.0"
+ "cordova-plugin-x-socialsharing": "5.6.8"
};
-});
+});
\ No newline at end of file
diff --git a/cordova/platforms/android/project.properties b/cordova/platforms/android/project.properties
index 579479a1b..764faeb21 100644
--- a/cordova/platforms/android/project.properties
+++ b/cordova/platforms/android/project.properties
@@ -13,4 +13,4 @@ android.library.reference.1=CordovaLib
android.library.reference.2=app
cordova.system.library.1=com.android.support:support-v4:27.+
cordova.system.library.2=com.android.support:support-v4:27.+
-cordova.system.library.3=com.android.support:support-v4:24.1.1+
+cordova.system.library.3=com.android.support:support-v4:24.1.1+
\ No newline at end of file
diff --git a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m
index 251a73616..6fd389ef9 100644
--- a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m
+++ b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewEngine.m
@@ -142,7 +142,7 @@
} else if ([contentMode isEqual: @"desktop"]) {
configuration.defaultWebpagePreferences.preferredContentMode = WKContentModeDesktop;
}
-
+
}
return configuration;
diff --git a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.h b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.h
index 2397efa3a..b15628914 100644
--- a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.h
+++ b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.h
@@ -6,9 +6,9 @@
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
diff --git a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.m b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.m
index afda72509..577624e0f 100644
--- a/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.m
+++ b/cordova/platforms/ios/CordovaLib/Classes/Private/Plugins/CDVWebViewEngine/CDVWebViewProcessPoolFactory.m
@@ -6,9 +6,9 @@
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
@@ -31,7 +31,7 @@ static CDVWebViewProcessPoolFactory *factory = nil;
dispatch_once(&onceToken, ^{
factory = [[CDVWebViewProcessPoolFactory alloc] init];
});
-
+
return factory;
}
diff --git a/cordova/platforms/ios/CordovaLib/Classes/Public/CDVCommandDelegateImpl.m b/cordova/platforms/ios/CordovaLib/Classes/Public/CDVCommandDelegateImpl.m
index 4ced59955..649d30dbb 100644
--- a/cordova/platforms/ios/CordovaLib/Classes/Public/CDVCommandDelegateImpl.m
+++ b/cordova/platforms/ios/CordovaLib/Classes/Public/CDVCommandDelegateImpl.m
@@ -138,7 +138,7 @@
BOOL keepCallback = [result.keepCallback boolValue];
NSString* argumentsAsJSON = [result argumentsAsJSON];
BOOL debug = NO;
-
+
#ifdef DEBUG
debug = YES;
#endif
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.plist
index 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.pbxproj
index 10156b0f7..c71d9474b 100755
--- a/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxproj
+++ b/cordova/platforms/ios/TagSpaces Beta.xcodeproj/project.pbxproj
@@ -8,33 +8,33 @@
/* Begin PBXBuildFile section */
0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; };
+ 073D3A66C8A14898B5F5AAA8 /* CDVFile.m in Sources */ = {isa = PBXBuildFile; fileRef = BDC2833C0F2540B087F62B68 /* CDVFile.m */; };
+ 0940D5A501F243598C325D9C /* APPMethodMagic.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B1B5B7F089C41D9A04D6AF8 /* APPMethodMagic.m */; };
+ 0ACEAA81A1B14DA4B4FA9AFA /* NSString+SSURLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ADA41A099364A258EB86F89 /* NSString+SSURLEncoding.m */; };
+ 0F8082FF83914F9E99A8E6D9 /* APPBackgroundMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6381CA026ADE485E85CF5328 /* APPBackgroundMode.m */; };
+ 178E338704A14BA391229723 /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2274DB4084444354AF26BD03 /* CDVJpegHeaderWriter.m */; };
1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; };
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
- 2ECBCFEFA8A14C0EB682FAB0 /* appbeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 856852A9946B4DA7BF4EDC62 /* appbeep.wav */; };
+ 2794900EFA364A07A3234448 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B627557606EC4D94B186F4A8 /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+ 2ABBBAE151AB4DD89C762B9A /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = CDD656DD5EF748EA935D819C /* UIImage+CropScaleOrientation.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 */; };
- 3912058EB13E485BB506E071 /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4923C134A48F48CF8E8EC47F /* CDVJpegHeaderWriter.m */; };
- 41C0872421BD4657B31F7C60 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E73A2C7396C94680B1CFF239 /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
- 4C912013458B4E34A6BEBFDF /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92C5D5470BCB43B191A3755E /* AVFoundation.framework */; };
- 4ED540FB26504C7EBC5F2310 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A8061B9E2584C6F9BFA435B /* CoreLocation.framework */; };
- 6A47B1C2D9D5498C92FD79A4 /* FileOpener2.m in Sources */ = {isa = PBXBuildFile; fileRef = 38DE4A52BF3A428CB85A01D3 /* FileOpener2.m */; };
+ 3E4DC195C1A64C2AA34CE787 /* CDVDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = C4858AF80EB94C94A3E67277 /* CDVDevice.m */; };
+ 430C7B3D05C048A096EEA69E /* CDVCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7B6C93B0294D46AD5AA880 /* CDVCamera.m */; };
+ 4D1E218B45B54839AF8A4C80 /* SocialSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 73DA06C8C94841398C49D286 /* SocialSharing.m */; };
+ 5593FE35FC014E8EB4C8FF96 /* CDVAssetLibraryFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 263BC8106989436B955E4FC6 /* CDVAssetLibraryFilesystem.m */; };
+ 57799DD2E84042B9A09D1654 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BCF389046F64001AA186149 /* AVFoundation.framework */; };
+ 587BBEE867EE42B5809AA535 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E00A3FA792DB4C7BB23D704E /* MessageUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+ 662326DD3A2144F295072559 /* appbeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = F8411ABEAD054E28AFE89BE1 /* appbeep.wav */; };
+ 6A26D0286D2D44649751831C /* FileOpener2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D7F2F2B4E544B19880DFF3E /* FileOpener2.m */; };
+ 6AD3555421354B1DAE56A40C /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D93A5BB27654D45B91A9D84 /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };
- 71C228DE9D4F41FF8AFBC4F6 /* CDVLocalFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 98D2D7F7AB794421990E8FC5 /* CDVLocalFilesystem.m */; };
- 78B9CD3FBED74924A25196E2 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9963CE05D2C745349F080238 /* Downloader.swift */; };
- 7C6065AB08F9429A8C4E974C /* CDVFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D9B854200814AE3A9C2E770 /* CDVFile.m */; };
- 90B55385075445E8AFF6E723 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 834C76EB13ED4B4D9F0E6F5C /* UIImage+CropScaleOrientation.m */; };
- 98F6A5526062497CB73A1B0A /* CDVDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = A0CD0395A4C34F10BAAB0237 /* CDVDevice.m */; };
- DA515680F8F14C71B59F498F /* APPBackgroundMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 671C10DB25DA4F2AA5974527 /* APPBackgroundMode.m */; };
- DA68256931E643F9A3BF0909 /* CDVCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B78C661E5A48FE99AB7230 /* CDVCamera.m */; };
- DCC01C38133C46BBA9BFE8C6 /* CDVAssetLibraryFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 37F82A6CC29C4503B5AB6765 /* CDVAssetLibraryFilesystem.m */; };
- F0E7F6EF3B734A7094F48E3F /* APPMethodMagic.m in Sources */ = {isa = PBXBuildFile; fileRef = A242041FBB71452BA3630292 /* APPMethodMagic.m */; };
- 11837AAE46E24B8DA394DF19 /* NSString+SSURLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D46E5FC6B44B8796CD0432 /* NSString+SSURLEncoding.m */; };
- 4451916358BD49A8A7644D56 /* SocialSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = B3ED20DEF712481D94438616 /* SocialSharing.m */; };
- A452553E07F64C0CAA35D96C /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E61147BE1945D5A406B430 /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
- 64DF0AC9557C494C80C9B7B4 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 374D90B51F7945D892F3EF98 /* MessageUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
- EE38F8704D0B42B7A525EF73 /* CDVWKWebViewFileXhr.m in Sources */ = {isa = PBXBuildFile; fileRef = 20B409CCA31946F6A58ECC19 /* CDVWKWebViewFileXhr.m */; };
- 2C8E5B76AA29404A99E9CACD /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A5FDD2F614B465AB09E339E /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+ 7E8728346F8943BCA0B46625 /* CDVLocalFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 59713991817F4F1787F20396 /* CDVLocalFilesystem.m */; };
+ 8A4DB4E42EE14F7487AC9E86 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D74AB46CD060414FAC9DDD2A /* CoreLocation.framework */; };
+ A9835C228DA94823929396D7 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DA27B0E06994A878E9EEC74 /* Downloader.swift */; };
+ AB59D1DB06D44EA8B7BFB28B /* CDVWKWebViewFileXhr.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB0C8C5A9D8404F9C8724CB /* CDVWKWebViewFileXhr.m */; };
+ EC70D655085243AD9EBC277D /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE2902540E54E83AE8E4C22 /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -62,15 +62,21 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 01F70CA7BFB447AEA7504E5B /* 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>"; };
0207DA571B56EA530066E2B4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = "TagSpaces Beta/Images.xcassets"; sourceTree = SOURCE_ROOT; };
+ 0B54D4831CED447FA1D057A1 /* 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>"; };
+ 0BB0C8C5A9D8404F9C8724CB /* CDVWKWebViewFileXhr.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVWKWebViewFileXhr.m; path = "cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m"; sourceTree = "<group>"; };
+ 0DA27B0E06994A878E9EEC74 /* Downloader.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = Downloader.swift; path = com.whebcraft.cordova.plugin.downloader/Downloader.swift; sourceTree = "<group>"; };
+ 1803FA2A4F354A51A1E8AD5B /* 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>"; };
+ 1889382C5E50427C9844CA42 /* 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>"; };
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; };
- 21B8ADFA4658428FBB1F7958 /* 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>"; };
- 25E8D9BCF59A432CB579644E /* 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>"; };
- 27B78C661E5A48FE99AB7230 /* 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>"; };
+ 1D7F2F2B4E544B19880DFF3E /* 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>"; };
+ 2274DB4084444354AF26BD03 /* 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>"; };
+ 263BC8106989436B955E4FC6 /* 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>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 2D9B854200814AE3A9C2E770 /* 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>"; };
+ 2D93A5BB27654D45B91A9D84 /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
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; };
302D95EE14D2391D003F00A1 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
@@ -80,43 +86,37 @@
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>"; };
- 37F82A6CC29C4503B5AB6765 /* 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>"; };
- 38DE4A52BF3A428CB85A01D3 /* 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>"; };
- 3A8061B9E2584C6F9BFA435B /* CoreLocation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
- 43DBA31C36DC40A29CDE164C /* 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>"; };
- 4923C134A48F48CF8E8EC47F /* 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>"; };
- 5CBE442109A44548BFA1204B /* 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>"; };
- 5F5B13AA0E7A45928786E136 /* 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>"; };
- 671C10DB25DA4F2AA5974527 /* 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>"; };
+ 3866EF2A67C9488F86969AD0 /* SocialSharing.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = SocialSharing.h; path = "cordova-plugin-x-socialsharing/SocialSharing.h"; sourceTree = "<group>"; };
+ 4ADA41A099364A258EB86F89 /* NSString+SSURLEncoding.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = "NSString+SSURLEncoding.m"; path = "cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m"; sourceTree = "<group>"; };
+ 4B1B5B7F089C41D9A04D6AF8 /* 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>"; };
+ 59713991817F4F1787F20396 /* 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>"; };
+ 6381CA026ADE485E85CF5328 /* 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>"; };
6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = "TagSpaces Beta/CDVLaunchScreen.storyboard"; sourceTree = SOURCE_ROOT; };
- 6B1891CB1153452DB5F33F33 /* 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>"; };
- 834C76EB13ED4B4D9F0E6F5C /* 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>"; };
- 856852A9946B4DA7BF4EDC62 /* appbeep.wav */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; path = appbeep.wav; sourceTree = "<group>"; };
+ 703105E50C7446A695B09E6C /* 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>"; };
+ 73DA06C8C94841398C49D286 /* SocialSharing.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = SocialSharing.m; path = "cordova-plugin-x-socialsharing/SocialSharing.m"; sourceTree = "<group>"; };
+ 75AA9FFA794C4A6197805DE0 /* 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>"; };
+ 8BCF389046F64001AA186149 /* AVFoundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
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; };
- 92C5D5470BCB43B191A3755E /* AVFoundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
- 943EE43957C44D10AE8DF7E2 /* 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>"; };
- 98D2D7F7AB794421990E8FC5 /* 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>"; };
- 9963CE05D2C745349F080238 /* Downloader.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = Downloader.swift; path = com.whebcraft.cordova.plugin.downloader/Downloader.swift; sourceTree = "<group>"; };
- 9D58C635D56F4E4FA8361ABD /* 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>"; };
- A0CD0395A4C34F10BAAB0237 /* 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>"; };
- A242041FBB71452BA3630292 /* 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>"; };
- BB314C1742724790963463E2 /* 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>"; };
- D0D35D8448024980B5C3FC47 /* 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>"; };
- E73A2C7396C94680B1CFF239 /* ImageIO.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
+ A24E29C7B1D04E61B4BA0386 /* 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>"; };
+ B627557606EC4D94B186F4A8 /* ImageIO.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
+ BB8B200A0E05445C9F780B0C /* 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>"; };
+ BDC2833C0F2540B087F62B68 /* 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>"; };
+ C026AEA90EAB44CC8E9A7EE9 /* CDVWKWebViewFileXhr.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVWKWebViewFileXhr.h; path = "cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.h"; sourceTree = "<group>"; };
+ C4858AF80EB94C94A3E67277 /* 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>"; };
+ C6AB2400EEBD4874BB3A5D7D /* 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>"; };
+ CDD656DD5EF748EA935D819C /* 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>"; };
+ CE7B6C93B0294D46AD5AA880 /* 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>"; };
+ D331E749193D4C8186B50627 /* NSString+SSURLEncoding.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "NSString+SSURLEncoding.h"; path = "cordova-plugin-x-socialsharing/NSString+SSURLEncoding.h"; sourceTree = "<group>"; };
+ D74AB46CD060414FAC9DDD2A /* CoreLocation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
+ DDE2902540E54E83AE8E4C22 /* Social.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
+ E00A3FA792DB4C7BB23D704E /* MessageUI.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
+ E3F82EDC930C4C80865A5BBC /* 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>"; };
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; path = "Bridging-Header.h"; sourceTree = "<group>"; };
+ F7AAE5A7C89546EB81D8F2F6 /* 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>"; };
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "TagSpaces Beta/config.xml"; sourceTree = "<group>"; };
- FE4894ACD2AC49A5B929D1D4 /* 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>"; };
- 91D46E5FC6B44B8796CD0432 /* NSString+SSURLEncoding.m */ = {isa = PBXFileReference; name = "NSString+SSURLEncoding.m"; path = "cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
- B3ED20DEF712481D94438616 /* SocialSharing.m */ = {isa = PBXFileReference; name = "SocialSharing.m"; path = "cordova-plugin-x-socialsharing/SocialSharing.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
- 16D856FDFCB74CA28463BBDD /* NSString+SSURLEncoding.h */ = {isa = PBXFileReference; name = "NSString+SSURLEncoding.h"; path = "cordova-plugin-x-socialsharing/NSString+SSURLEncoding.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
- A74406C0855A4EB68DD2005B /* SocialSharing.h */ = {isa = PBXFileReference; name = "SocialSharing.h"; path = "cordova-plugin-x-socialsharing/SocialSharing.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
- E7E61147BE1945D5A406B430 /* Social.framework */ = {isa = PBXFileReference; name = "Social.framework"; path = "System/Library/Frameworks/Social.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
- 374D90B51F7945D892F3EF98 /* MessageUI.framework */ = {isa = PBXFileReference; name = "MessageUI.framework"; path = "System/Library/Frameworks/MessageUI.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
- 20B409CCA31946F6A58ECC19 /* CDVWKWebViewFileXhr.m */ = {isa = PBXFileReference; name = "CDVWKWebViewFileXhr.m"; path = "cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; };
- E9C631D5858F46CE9E086CB1 /* CDVWKWebViewFileXhr.h */ = {isa = PBXFileReference; name = "CDVWKWebViewFileXhr.h"; path = "cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.h"; sourceTree = "<group>"; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; };
- 0A5FDD2F614B465AB09E339E /* WebKit.framework */ = {isa = PBXFileReference; name = "WebKit.framework"; path = "System/Library/Frameworks/WebKit.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
+ F8411ABEAD054E28AFE89BE1 /* appbeep.wav */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; path = appbeep.wav; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -125,12 +125,12 @@
buildActionMask = 2147483647;
files = (
301BF552109A68D80062928A /* libCordova.a in Frameworks */,
- 41C0872421BD4657B31F7C60 /* ImageIO.framework in Frameworks */,
- 4ED540FB26504C7EBC5F2310 /* CoreLocation.framework in Frameworks */,
- 4C912013458B4E34A6BEBFDF /* AVFoundation.framework in Frameworks */,
- A452553E07F64C0CAA35D96C /* Social.framework in Frameworks */,
- 64DF0AC9557C494C80C9B7B4 /* MessageUI.framework in Frameworks */,
- 2C8E5B76AA29404A99E9CACD /* WebKit.framework in Frameworks */,
+ 2794900EFA364A07A3234448 /* ImageIO.framework in Frameworks */,
+ 8A4DB4E42EE14F7487AC9E86 /* CoreLocation.framework in Frameworks */,
+ 57799DD2E84042B9A09D1654 /* AVFoundation.framework in Frameworks */,
+ 6AD3555421354B1DAE56A40C /* WebKit.framework in Frameworks */,
+ EC70D655085243AD9EBC277D /* Social.framework in Frameworks */,
+ 587BBEE867EE42B5809AA535 /* MessageUI.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -193,7 +193,7 @@
3047A50E1AB8057F00498E2A /* config */,
8D1107310486CEB800E47090 /* TagSpaces Beta-Info.plist */,
6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */,
- 856852A9946B4DA7BF4EDC62 /* appbeep.wav */,
+ F8411ABEAD054E28AFE89BE1 /* appbeep.wav */,
);
name = Resources;
path = "TagSpaces Beta/Resources";
@@ -202,12 +202,12 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- E73A2C7396C94680B1CFF239 /* ImageIO.framework */,
- 3A8061B9E2584C6F9BFA435B /* CoreLocation.framework */,
- 92C5D5470BCB43B191A3755E /* AVFoundation.framework */,
- E7E61147BE1945D5A406B430 /* Social.framework */,
- 374D90B51F7945D892F3EF98 /* MessageUI.framework */,
- 0A5FDD2F614B465AB09E339E /* WebKit.framework */,
+ B627557606EC4D94B186F4A8 /* ImageIO.framework */,
+ D74AB46CD060414FAC9DDD2A /* CoreLocation.framework */,
+ 8BCF389046F64001AA186149 /* AVFoundation.framework */,
+ 2D93A5BB27654D45B91A9D84 /* WebKit.framework */,
+ DDE2902540E54E83AE8E4C22 /* Social.framework */,
+ E00A3FA792DB4C7BB23D704E /* MessageUI.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -234,34 +234,34 @@
307C750510C5A3420062BCA9 /* Plugins */ = {
isa = PBXGroup;
children = (
- A0CD0395A4C34F10BAAB0237 /* CDVDevice.m */,
- 943EE43957C44D10AE8DF7E2 /* CDVDevice.h */,
- 671C10DB25DA4F2AA5974527 /* APPBackgroundMode.m */,
- A242041FBB71452BA3630292 /* APPMethodMagic.m */,
- 5F5B13AA0E7A45928786E136 /* APPBackgroundMode.h */,
- 43DBA31C36DC40A29CDE164C /* APPMethodMagic.h */,
- 834C76EB13ED4B4D9F0E6F5C /* UIImage+CropScaleOrientation.m */,
- 27B78C661E5A48FE99AB7230 /* CDVCamera.m */,
- 4923C134A48F48CF8E8EC47F /* CDVJpegHeaderWriter.m */,
- 6B1891CB1153452DB5F33F33 /* UIImage+CropScaleOrientation.h */,
- D0D35D8448024980B5C3FC47 /* CDVCamera.h */,
- FE4894ACD2AC49A5B929D1D4 /* CDVJpegHeaderWriter.h */,
- 9D58C635D56F4E4FA8361ABD /* CDVExif.h */,
- 2D9B854200814AE3A9C2E770 /* CDVFile.m */,
- 98D2D7F7AB794421990E8FC5 /* CDVLocalFilesystem.m */,
- 37F82A6CC29C4503B5AB6765 /* CDVAssetLibraryFilesystem.m */,
- 5CBE442109A44548BFA1204B /* CDVFile.h */,
- BB314C1742724790963463E2 /* CDVLocalFilesystem.h */,
- 21B8ADFA4658428FBB1F7958 /* CDVAssetLibraryFilesystem.h */,
- 38DE4A52BF3A428CB85A01D3 /* FileOpener2.m */,
- 25E8D9BCF59A432CB579644E /* FileOpener2.h */,
- 9963CE05D2C745349F080238 /* Downloader.swift */,
- 91D46E5FC6B44B8796CD0432 /* NSString+SSURLEncoding.m */,
- B3ED20DEF712481D94438616 /* SocialSharing.m */,
- 16D856FDFCB74CA28463BBDD /* NSString+SSURLEncoding.h */,
- A74406C0855A4EB68DD2005B /* SocialSharing.h */,
- 20B409CCA31946F6A58ECC19 /* CDVWKWebViewFileXhr.m */,
- E9C631D5858F46CE9E086CB1 /* CDVWKWebViewFileXhr.h */,
+ 0DA27B0E06994A878E9EEC74 /* Downloader.swift */,
+ C4858AF80EB94C94A3E67277 /* CDVDevice.m */,
+ F7AAE5A7C89546EB81D8F2F6 /* CDVDevice.h */,
+ 6381CA026ADE485E85CF5328 /* APPBackgroundMode.m */,
+ 4B1B5B7F089C41D9A04D6AF8 /* APPMethodMagic.m */,
+ 1889382C5E50427C9844CA42 /* APPBackgroundMode.h */,
+ BB8B200A0E05445C9F780B0C /* APPMethodMagic.h */,
+ CDD656DD5EF748EA935D819C /* UIImage+CropScaleOrientation.m */,
+ CE7B6C93B0294D46AD5AA880 /* CDVCamera.m */,
+ 2274DB4084444354AF26BD03 /* CDVJpegHeaderWriter.m */,
+ 75AA9FFA794C4A6197805DE0 /* UIImage+CropScaleOrientation.h */,
+ 1803FA2A4F354A51A1E8AD5B /* CDVCamera.h */,
+ A24E29C7B1D04E61B4BA0386 /* CDVJpegHeaderWriter.h */,
+ 703105E50C7446A695B09E6C /* CDVExif.h */,
+ BDC2833C0F2540B087F62B68 /* CDVFile.m */,
+ 59713991817F4F1787F20396 /* CDVLocalFilesystem.m */,
+ 263BC8106989436B955E4FC6 /* CDVAssetLibraryFilesystem.m */,
+ 0B54D4831CED447FA1D057A1 /* CDVFile.h */,
+ C6AB2400EEBD4874BB3A5D7D /* CDVLocalFilesystem.h */,
+ 01F70CA7BFB447AEA7504E5B /* CDVAssetLibraryFilesystem.h */,
+ 1D7F2F2B4E544B19880DFF3E /* FileOpener2.m */,
+ E3F82EDC930C4C80865A5BBC /* FileOpener2.h */,
+ 0BB0C8C5A9D8404F9C8724CB /* CDVWKWebViewFileXhr.m */,
+ C026AEA90EAB44CC8E9A7EE9 /* CDVWKWebViewFileXhr.h */,
+ 4ADA41A099364A258EB86F89 /* NSString+SSURLEncoding.m */,
+ 73DA06C8C94841398C49D286 /* SocialSharing.m */,
+ D331E749193D4C8186B50627 /* NSString+SSURLEncoding.h */,
+ 3866EF2A67C9488F86969AD0 /* SocialSharing.h */,
);
name = Plugins;
path = "TagSpaces Beta/Plugins";
@@ -307,7 +307,6 @@
LastUpgradeCheck = 1130;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
- LastSwiftMigration = 1160;
ProvisioningStyle = Automatic;
};
};
@@ -360,7 +359,7 @@
302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */,
0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */,
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */,
- 2ECBCFEFA8A14C0EB682FAB0 /* appbeep.wav in Resources */,
+ 662326DD3A2144F295072559 /* appbeep.wav in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -392,20 +391,20 @@
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1D3623260D0F684500981E51 /* AppDelegate.m in Sources */,
302D95F114D2391D003F00A1 /* MainViewController.m in Sources */,
- 98F6A5526062497CB73A1B0A /* CDVDevice.m in Sources */,
- DA515680F8F14C71B59F498F /* APPBackgroundMode.m in Sources */,
- F0E7F6EF3B734A7094F48E3F /* APPMethodMagic.m in Sources */,
- 90B55385075445E8AFF6E723 /* UIImage+CropScaleOrientation.m in Sources */,
- DA68256931E643F9A3BF0909 /* CDVCamera.m in Sources */,
- 3912058EB13E485BB506E071 /* CDVJpegHeaderWriter.m in Sources */,
- 7C6065AB08F9429A8C4E974C /* CDVFile.m in Sources */,
- 71C228DE9D4F41FF8AFBC4F6 /* CDVLocalFilesystem.m in Sources */,
- DCC01C38133C46BBA9BFE8C6 /* CDVAssetLibraryFilesystem.m in Sources */,
- 6A47B1C2D9D5498C92FD79A4 /* FileOpener2.m in Sources */,
- 78B9CD3FBED74924A25196E2 /* Downloader.swift in Sources */,
- 11837AAE46E24B8DA394DF19 /* NSString+SSURLEncoding.m in Sources */,
- 4451916358BD49A8A7644D56 /* SocialSharing.m in Sources */,
- EE38F8704D0B42B7A525EF73 /* CDVWKWebViewFileXhr.m in Sources */,
+ A9835C228DA94823929396D7 /* Downloader.swift in Sources */,
+ 3E4DC195C1A64C2AA34CE787 /* CDVDevice.m in Sources */,
+ 0F8082FF83914F9E99A8E6D9 /* APPBackgroundMode.m in Sources */,
+ 0940D5A501F243598C325D9C /* APPMethodMagic.m in Sources */,
+ 2ABBBAE151AB4DD89C762B9A /* UIImage+CropScaleOrientation.m in Sources */,
+ 430C7B3D05C048A096EEA69E /* CDVCamera.m in Sources */,
+ 178E338704A14BA391229723 /* CDVJpegHeaderWriter.m in Sources */,
+ 073D3A66C8A14898B5F5AAA8 /* CDVFile.m in Sources */,
+ 7E8728346F8943BCA0B46625 /* CDVLocalFilesystem.m in Sources */,
+ 5593FE35FC014E8EB4C8FF96 /* CDVAssetLibraryFilesystem.m in Sources */,
+ 6A26D0286D2D44649751831C /* FileOpener2.m in Sources */,
+ AB59D1DB06D44EA8B7BFB28B /* CDVWKWebViewFileXhr.m in Sources */,
+ 0ACEAA81A1B14DA4B4FA9AFA /* NSString+SSURLEncoding.m in Sources */,
+ 4D1E218B45B54839AF8A4C80 /* SocialSharing.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -429,6 +428,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;
@@ -438,7 +438,7 @@
INFOPLIST_FILE = "TagSpaces Beta/TagSpaces Beta-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;
+ PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.iosn;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -461,7 +461,7 @@
INFOPLIST_FILE = "TagSpaces Beta/TagSpaces Beta-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.mobile;
+ PRODUCT_BUNDLE_IDENTIFIER = org.tagspaces.iosn;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -507,9 +507,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
- SWIFT_VERSION = 4.0;
WK_WEB_VIEW_ONLY = 1;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
};
name = Debug;
};
@@ -550,9 +548,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
- SWIFT_VERSION = 4.0;
WK_WEB_VIEW_ONLY = 1;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
};
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.xcscheme
index 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>
<BuildableReference
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
ReferencedContainer = "container:TagSpaces Beta.xcodeproj">
</BuildableReference>
</MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
+ <Testables>
+ </Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
ReferencedContainer = "container:TagSpaces Beta.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "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.xcuserstate
index b8fec3dc1..d93ab9d70 100644
Binary 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 differ
diff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/com.whebcraft.cordova.plugin.downloader/Downloader.swift b/cordova/platforms/ios/TagSpaces Beta/Plugins/com.whebcraft.cordova.plugin.downloader/Downloader.swift
index 3e30eda66..bf0b71aeb 100644
--- a/cordova/platforms/ios/TagSpaces Beta/Plugins/com.whebcraft.cordova.plugin.downloader/Downloader.swift
+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/com.whebcraft.cordova.plugin.downloader/Downloader.swift
@@ -5,7 +5,7 @@ import Foundation
var pluginResult = CDVPluginResult(
status: CDVCommandStatus_ERROR
)
-
+
var isError = false
let args = command.arguments[0] as! NSDictionary
@@ -25,12 +25,12 @@ import Foundation
status: CDVCommandStatus_ERROR,
messageAs: error.localizedDescription
)
-
+
self.commandDelegate!.send(
pluginResult,
callbackId: command.callbackId
)
-
+
isError = true
}
}
@@ -48,7 +48,7 @@ import Foundation
status: CDVCommandStatus_OK,
messageAs: documentsUrl?.path
)
-
+
self.commandDelegate!.send(
pluginResult,
callbackId: command.callbackId
diff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m
index bbfea8ad6..ba9f1bf88 100644
--- a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m
+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-ios-xhr/CDVWKWebViewFileXhr.m
@@ -70,41 +70,41 @@ NS_ASSUME_NONNULL_BEGIN
-(void) pluginInitialize {
[super pluginInitialize];
-
+
if (![self.webView isKindOfClass:WKWebView.class])
- return;
+ return;
- WKWebView *wkWebView = (WKWebView *) self.webView;
+ WKWebView *wkWebView = (WKWebView *) self.webView;
// added : allowFileAccessFromFileURLs allowUniversalAccessFromFileURLs
- NSString *value = [self.commandDelegate.settings cdvwkStringForKey:@"allowfileaccessfromfileurls"];
-
- if (value != nil && [value isEqualToString:@"true"]){
- _allowFileAccessFromFileURLs = YES;
- NSLog(@"WARNING: File access allowed due to preference allowFileAccessFromFileURLs=true");
+ NSString *value = [self.commandDelegate.settings cdvwkStringForKey:@"allowfileaccessfromfileurls"];
+
+ if (value != nil && [value isEqualToString:@"true"]){
+ _allowFileAccessFromFileURLs = YES;
+ NSLog(@"WARNING: File access allowed due to preference allowFileAccessFromFileURLs=true");
}else{
_allowFileAccessFromFileURLs = NO;
}
[wkWebView.configuration.preferences setValue:@(_allowFileAccessFromFileURLs) forKey:@"allowFileAccessFromFileURLs"];
-
+
value = [self.commandDelegate.settings cdvwkStringForKey:@"allowuniversalaccessfromfileurls"];
- if (value != nil && [value isEqualToString:@"true"]){
- _allowUniversalAccessFromFileURLs = YES;
+ if (value != nil && [value isEqualToString:@"true"]){
+ _allowUniversalAccessFromFileURLs = YES;
NSLog(@"WARNING: Universal access allowed due to preference allowUniversalAccessFromFileURLs=true");
}else{
- _allowUniversalAccessFromFileURLs = NO;
+ _allowUniversalAccessFromFileURLs = NO;
}
- [wkWebView.configuration setValue:@(_allowUniversalAccessFromFileURLs) forKey:@"allowUniversalAccessFromFileURLs"];
-
+ [wkWebView.configuration setValue:@(_allowUniversalAccessFromFileURLs) forKey:@"allowUniversalAccessFromFileURLs"];
+
// note: settings translates all preferences to lower case
value = [self.commandDelegate.settings cdvwkStringForKey:@"allowuntrustedcerts"];
if (value != nil && [value compare:@"on" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
_allowsInsecureLoads = YES;
NSLog(@"WARNING: NativeXHR is allowing untrusted certificates due to preference AllowUntrustedCerts=on");
}
-
+
value = [self.commandDelegate.settings cdvwkStringForKey:@"interceptremoterequests"];
- if (value != nil &&
+ if (value != nil &&
([value compare:@"all" options:NSCaseInsensitiveSearch] == NSOrderedSame ||
[value compare:@"secureOnly" options:NSCaseInsensitiveSearch] == NSOrderedSame ||
[value compare:@"none" options:NSCaseInsensitiveSearch] == NSOrderedSame)) {
@@ -112,7 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
} else {
_interceptRemoteRequests = @"secureOnly";
}
-
+
value = [self.commandDelegate.settings cdvwkStringForKey:@"nativexhrlogging"];
if (value != nil &&
([value compare:@"none" options:NSCaseInsensitiveSearch] == NSOrderedSame ||
@@ -121,8 +121,8 @@ NS_ASSUME_NONNULL_BEGIN
} else {
_nativeXHRLogging = @"none";
}
-
-
+
+
if ([_interceptRemoteRequests compare:@"all" options:NSCaseInsensitiveSearch] == NSOrderedSame ||
[_interceptRemoteRequests compare:@"secureOnly" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
@@ -135,9 +135,9 @@ NS_ASSUME_NONNULL_BEGIN
}
- (void) dispose {
-
+
if ([self.webView isKindOfClass:WKWebView.class]) {
-
+
WKWebView *wkWebView = (WKWebView *) self.webView;
[wkWebView.configuration.userContentController removeScriptMessageHandlerForName:@"nativeXHR"];
}
@@ -162,7 +162,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *wwwuri = [NSString stringWithFormat:@"www/%@", uri];
targetURL = [NSURL URLWithString:wwwuri relativeToURL:baseURL];
}
-
+
return targetURL;
}
@@ -178,7 +178,7 @@ NS_ASSUME_NONNULL_BEGIN
NSURL *baseURL = [NSURL URLWithString:@"www" relativeToURL:[[NSBundle mainBundle] resourceURL]];
NSString *basePath = [baseURL absoluteString];
NSString *targetPath = [[targetURL standardizedURL] absoluteString];
-
+
return [targetPath hasPrefix:basePath] ||
[targetPath hasPrefix:[[NSURL fileURLWithPath:
[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0]] absoluteString]];
@@ -198,34 +198,34 @@ NS_ASSUME_NONNULL_BEGIN
}
NSURL *targetURL = [self getWebContentResourceURL:uri];
-
+
if (![self isWebContentResourceSecure:targetURL]) {
-
+
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ILLEGAL_ACCESS_EXCEPTION messageAsInt:404];
[self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-
+
} else {
-
+
__weak CDVWKWebViewFileXhr* weakSelf = self;
[self.commandDelegate runInBackground:^ {
-
+
NSData* data = [[NSData alloc] initWithContentsOfURL:targetURL];
CDVPluginResult* result = nil;
-
+
if (data != nil) {
NSString* str = [[NSString alloc] initWithBytesNoCopy:(void*)[data bytes] length:[data length] encoding:NSUTF8StringEncoding freeWhenDone:NO];
-
+
// Check that UTF8 conversion did not fail.
if (str != nil) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:str];
result.associatedObject = data;
}
}
-
+
if (result == nil) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsInt:404];
}
-
+
[weakSelf.commandDelegate sendPluginResult:result callbackId:command.callbackId];
}];
}
@@ -242,47 +242,47 @@ NS_ASSUME_NONNULL_BEGIN
// this catches nil value or empty string
[self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsInt:404] callbackId:command.callbackId];
return;
- }
+ }
NSURL *targetURL = [self getWebContentResourceURL:uri];
-
+
if (![self isWebContentResourceSecure:targetURL]) {
-
+
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ILLEGAL_ACCESS_EXCEPTION messageAsInt:404];
[self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-
+
} else {
-
+
__weak CDVWKWebViewFileXhr* weakSelf = self;
[self.commandDelegate runInBackground:^ {
-
+
NSData* data = [[NSData alloc] initWithContentsOfURL:targetURL];
-
+
CDVPluginResult* result = nil;
if (data != nil) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArrayBuffer:data];
} else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION messageAsInt:404];
}
-
+
[weakSelf.commandDelegate sendPluginResult:result callbackId:command.callbackId];
}];
}
}
- (void)getConfig:(CDVInvokedUrlCommand*)command {
-
+
NSDictionary *dict = @{
@"InterceptRemoteRequests" : _interceptRemoteRequests,
@"NativeXHRLogging" : _nativeXHRLogging
};
-
+
[self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict] callbackId:command.callbackId];
}
- (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler {
-
+
if (_allowsInsecureLoads) {
SecTrustRef serverTrust = challenge.protectionSpace.serverTrust;
if (serverTrust) {
@@ -290,7 +290,7 @@ NS_ASSUME_NONNULL_BEGIN
SecTrustSetExceptions (serverTrust, exceptions);
CFRelease (exceptions);
completionHandler (NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:serverTrust]); // FortityFalsePositive
-
+
return;
}
}
@@ -315,65 +315,65 @@ NS_ASSUME_NONNULL_BEGIN
* body | string (base 64 encoded) | false | The http request body |
* timeout | number | false | Request timeout (seconds) | any positive value
*
- * The callback function takes two arguments. The first argument is the unique identifier supplied in the request
+ * The callback function takes two arguments. The first argument is the unique identifier supplied in the request
* object. The second argument is a java object defining the HTTP result.
*/
- (void) performNativeXHR:(NSDictionary<NSString *, id> *) body inWebView:(WKWebView *) webView {
-
+
NSString *requestId = [body cdvwkStringForKey:@"id"];
NSString *callbackFunction = [body cdvwkStringForKey:@"callback"];
NSString *urlString = [body cdvwkStringForKey:@"url"];
NSString *method = [body cdvwkStringForKey:@"method"];
-
+
__weak WKWebView* weakWebView = webView;
-
+
void(^sendResult)(NSDictionary *) = ^void(NSDictionary *result) {
dispatch_async(dispatch_get_main_queue(), ^{
-
+
NSError *jsonError;
NSData* json = [NSJSONSerialization dataWithJSONObject:result options:0 error:&jsonError];
-
+
if (jsonError != nil) {
NSLog(@"NativeXHR: Failed to encode response to json: %@", jsonError.localizedDescription); // FortityFalsePositive
-
+
NSString *script = [NSString stringWithFormat:@"try { %@('%@', {'error' : 'json serialization failed'}) } catch (e) { }", callbackFunction, requestId];
[weakWebView evaluateJavaScript:script completionHandler:nil];
return;
}
-
+
NSString *script = [NSString stringWithFormat:@"try { %@('%@', %@) } catch (e) { }", callbackFunction, requestId, [[NSString alloc] initWithData:json encoding:NSUTF8StringEncoding]];
[weakWebView evaluateJavaScript:script completionHandler:nil];
});
};
-
-
+
+
if (requestId.length == 0 || callbackFunction.length == 0 ) {
NSLog(@"NativeXHR: Required parameters id and callback url were not supplied.");
return;
}
-
+
if (urlString.length == 0) {
return sendResult( @{ @"error" : @"Invalid url"});
}
-
+
NSURL *url = [NSURL URLWithString:urlString];
-
+
if (![url.scheme.lowercaseString isEqualToString:@"http"] && ![url.scheme.lowercaseString isEqualToString:@"https"]) {
NSString *msg = [NSString stringWithFormat:@"NativeXHR: Invalid url scheme '%@'; only http and https are supported by NativeXHR", url.scheme];
return sendResult( @{ @"error" : msg});
}
-
+
__block NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url];
if (method.length)
request.HTTPMethod = [method uppercaseString];
-
+
id val = [body objectForKey:@"timeout"];
if ([val isKindOfClass:NSNumber.class]) {
request.timeoutInterval = [(NSNumber *) val doubleValue];
}
-
-
+
+
val = [body objectForKey:@"headers"];
if ([val isKindOfClass:NSDictionary.class]) {
[(NSDictionary *) val enumerateKeysAndObjectsUsingBlock:^(id _Nonnull key, id _Nonnull obj, BOOL * _Nonnull stop) {
@@ -382,16 +382,16 @@ NS_ASSUME_NONNULL_BEGIN
[request setValue:(NSString *)obj forHTTPHeaderField:(NSString *)key];
}];
}
-
+
NSString *body64 = [body cdvwkStringForKey:@"body"];
if (body64.length) {
request.HTTPBody = [[NSData alloc] initWithBase64EncodedString:body64 options:0];
}
-
+
NSURLSessionDataTask *task = [self.urlSession dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { // FortityFalsePositive
-
+
NSMutableDictionary* result = [NSMutableDictionary dictionary];
-
+
if (data != nil) {
result[@"data"] = [[NSString alloc] initWithData:[data base64EncodedDataWithOptions:0] encoding:NSUTF8StringEncoding];
}
@@ -406,25 +406,25 @@ NS_ASSUME_NONNULL_BEGIN
NSHTTPURLResponse* urlResponse = (NSHTTPURLResponse *) response;
dictionary[@"allHeaderFields"] = urlResponse.allHeaderFields;
dictionary[@"statusCode"] = @(urlResponse.statusCode);
- dictionary[@"localizedStatusCode"] = [NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode];
+ dictionary[@"localizedStatusCode"] = [NSHTTPURLResponse localizedStringForStatusCode:urlResponse.statusCode];
}
-
+
result[@"response"] = dictionary;
}
-
+
if (error != nil) {
result[@"error"] = [error localizedDescription];
result[@"underlyingErrorCode"] = @(error.code);
}
sendResult(result);
}];
-
+
task.taskDescription = requestId;
[task resume];
}
- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
-
+
if (![message.name isEqualToString:@"nativeXHR"] || ![message.body isKindOfClass:NSDictionary.class]) {
NSLog(@"NativeXHR: Invalid script message '%@' with body '%@' received. Ignoring.", message.name, message.body);
return;
@@ -435,7 +435,7 @@ NS_ASSUME_NONNULL_BEGIN
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
[self performNativeXHR:body inWebView:weakWebView];
});
-
+
}
@end
diff --git a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m
index 15c8f6fd4..d72effa08 100644
--- a/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m
+++ b/cordova/platforms/ios/TagSpaces Beta/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m
@@ -12,7 +12,7 @@
kCFStringEncodingUTF8
)
);
-
+
// we may have a URL with more than one '#' now - which iOS doesn't allow, so escape all but the first one
NSArray *parts = [result componentsSeparatedByString:@"#"];
NSString *finalResult = parts[0];
diff --git a/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist b/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
index ffb58f4e3..0edf7b4e3 100644
--- a/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
+++ b/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.0</string>
+ <string>1.0.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.0</string>
+ <string>1.0.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
diff --git a/cordova/platforms/ios/TagSpaces Beta/config.xml b/cordova/platforms/ios/TagSpaces Beta/config.xml
old mode 100755
new mode 100644
index f318ad2c7..123b15bcc
--- a/cordova/platforms/ios/TagSpaces Beta/config.xml
+++ b/cordova/platforms/ios/TagSpaces Beta/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="org.tagspaces.mobile" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.tagspaces.iosn" version="1.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="CDVWebViewEngine">
<param name="ios-package" value="CDVWebViewEngine" />
</feature>
@@ -25,6 +25,9 @@
<param name="ios-package" value="CDVGestureHandler" />
<param name="onload" value="true" />
</feature>
+ <feature name="Downloader">
+ <param name="ios-package" value="Downloader" />
+ </feature>
<feature name="Device">
<param name="ios-package" value="CDVDevice" />
</feature>
@@ -42,17 +45,14 @@
<feature name="FileOpener2">
<param name="ios-package" value="FileOpener2" />
</feature>
- <feature name="Downloader">
- <param name="ios-package" value="Downloader" />
+ <feature name="CDVWKWebViewFileXhr">
+ <param name="ios-package" value="CDVWKWebViewFileXhr" />
+ <param name="onload" value="true" />
</feature>
<feature name="SocialSharing">
<param name="ios-package" value="SocialSharing" />
<param name="onload" value="true" />
</feature>
- <feature name="CDVWKWebViewFileXhr">
- <param name="ios-package" value="CDVWKWebViewFileXhr" />
- <param name="onload" value="true" />
- </feature>
<name>TagSpaces Beta</name>
<description>
Offline file organizer and browser with tagging support.
@@ -87,6 +87,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="InterceptRemoteRequests" value="all" />
+ <preference name="NativeXHRLogging" value="full" />
<preference name="allowFileAccessFromFileURLs" value="true" />
</widget>
diff --git a/cordova/platforms/ios/cordova/Api.js b/cordova/platforms/ios/cordova/Api.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/build-debug.xcconfig b/cordova/platforms/ios/cordova/build-debug.xcconfig
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/build-extras.xcconfig b/cordova/platforms/ios/cordova/build-extras.xcconfig
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/build-release.xcconfig b/cordova/platforms/ios/cordova/build-release.xcconfig
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/build.xcconfig b/cordova/platforms/ios/cordova/build.xcconfig
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/defaults.xml b/cordova/platforms/ios/cordova/defaults.xml
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/BridgingHeader.js b/cordova/platforms/ios/cordova/lib/BridgingHeader.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/Podfile.js b/cordova/platforms/ios/cordova/lib/Podfile.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/PodsJson.js b/cordova/platforms/ios/cordova/lib/PodsJson.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/build.js b/cordova/platforms/ios/cordova/lib/build.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/check_reqs.js b/cordova/platforms/ios/cordova/lib/check_reqs.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/clean.js b/cordova/platforms/ios/cordova/lib/clean.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/plugman/pluginHandlers.js b/cordova/platforms/ios/cordova/lib/plugman/pluginHandlers.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/prepare.js b/cordova/platforms/ios/cordova/lib/prepare.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/projectFile.js b/cordova/platforms/ios/cordova/lib/projectFile.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/run.js b/cordova/platforms/ios/cordova/lib/run.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/lib/versions.js b/cordova/platforms/ios/cordova/lib/versions.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/cordova/loggingHelper.js b/cordova/platforms/ios/cordova/loggingHelper.js
old mode 100755
new mode 100644
diff --git a/cordova/platforms/ios/frameworks.json b/cordova/platforms/ios/frameworks.json
index ef13ba6a9..6dc84e887 100644
--- a/cordova/platforms/ios/frameworks.json
+++ b/cordova/platforms/ios/frameworks.json
@@ -2,7 +2,7 @@
"ImageIO.framework": 1,
"CoreLocation.framework": 1,
"AVFoundation.framework": 1,
+ "WebKit.framework": 1,
"Social.framework": 1,
- "MessageUI.framework": 1,
- "WebKit.framework": 1
-}
+ "MessageUI.framework": 1
+}
\ No newline at end of file
diff --git a/cordova/platforms/ios/ios.json b/cordova/platforms/ios/ios.json
index 05cf710e5..44e72154d 100644
--- a/cordova/platforms/ios/ios.json
+++ b/cordova/platforms/ios/ios.json
@@ -8,6 +8,10 @@
"config.xml": {
"parents": {
"/*": [
+ {
+ "xml": "<feature name=\"Downloader\"><param name=\"ios-package\" value=\"Downloader\" /></feature>",
+ "count": 1
+ },
{
"xml": "<feature name=\"Device\"><param name=\"ios-package\" value=\"CDVDevice\" /></feature>",
"count": 1
@@ -33,16 +37,12 @@
"count": 1
},
{
- "xml": "<feature name=\"Downloader\"><param name=\"ios-package\" value=\"Downloader\" /></feature>",
+ "xml": "<feature name=\"CDVWKWebViewFileXhr\"><param name=\"ios-package\" value=\"CDVWKWebViewFileXhr\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"SocialSharing\"><param name=\"ios-package\" value=\"SocialSharing\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
- },
- {
- "xml": "<feature name=\"CDVWKWebViewFileXhr\"><param name=\"ios-package\" value=\"CDVWKWebViewFileXhr\" /><param name=\"onload\" value=\"true\" /></feature>",
- "count": 1
}
]
}
@@ -72,41 +72,49 @@
}
},
"installed_plugins": {
+ "com.whebcraft.cordova.plugin.downloader": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
+ },
"cordova-plugin-device": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-background-mode": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-camera": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-file": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-file-opener2": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
- "cordova-plugin-whitelist": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "cordova-plugin-ios-xhr": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
- "com.whebcraft.cordova.plugin.downloader": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "cordova-plugin-whitelist": {
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"es6-promise-plugin": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
},
"cordova-plugin-x-socialsharing": {
"PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
- "PACKAGE_NAME": "org.tagspaces.mobile"
- },
- "cordova-plugin-ios-xhr": {
- "PACKAGE_NAME": "org.tagspaces.mobile"
+ "PACKAGE_NAME": "org.tagspaces.iosn"
}
},
"dependent_plugins": {},
"modules": [
+ {
+ "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
+ "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
+ "pluginId": "com.whebcraft.cordova.plugin.downloader",
+ "clobbers": [
+ "plugins.Downloader"
+ ]
+ },
{
"id": "cordova-plugin-device.device",
"file": "plugins/cordova-plugin-device/www/device.js",
@@ -337,28 +345,6 @@
"cordova.plugins.fileOpener2"
]
},
- {
- "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
- "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
- "pluginId": "com.whebcraft.cordova.plugin.downloader",
- "clobbers": [
- "plugins.Downloader"
- ]
- },
- {
- "id": "es6-promise-plugin.Promise",
- "file": "plugins/es6-promise-plugin/www/promise.js",
- "pluginId": "es6-promise-plugin",
- "runs": true
- },
- {
- "id": "cordova-plugin-x-socialsharing.SocialSharing",
- "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
- "pluginId": "cordova-plugin-x-socialsharing",
- "clobbers": [
- "window.plugins.socialsharing"
- ]
- },
{
"id": "cordova-plugin-ios-xhr.formdata-polyfill",
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js",
@@ -382,18 +368,32 @@
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/whatwg-fetch-2.0.3.js",
"pluginId": "cordova-plugin-ios-xhr",
"runs": true
+ },
+ {
+ "id": "es6-promise-plugin.Promise",
+ "file": "plugins/es6-promise-plugin/www/promise.js",
+ "pluginId": "es6-promise-plugin",
+ "runs": true
+ },
+ {
+ "id": "cordova-plugin-x-socialsharing.SocialSharing",
+ "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
+ "pluginId": "cordova-plugin-x-socialsharing",
+ "clobbers": [
+ "window.plugins.socialsharing"
+ ]
}
],
"plugin_metadata": {
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"cordova-plugin-device": "2.0.3",
"cordova-plugin-background-mode": "0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "3.0.4",
+ "cordova-plugin-ios-xhr": "1.0.0",
"cordova-plugin-whitelist": "1.3.4",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"es6-promise-plugin": "4.2.2",
- "cordova-plugin-x-socialsharing": "5.6.8",
- "cordova-plugin-ios-xhr": "1.0.0"
+ "cordova-plugin-x-socialsharing": "5.6.8"
}
}
diff --git a/cordova/platforms/ios/platform_www/cordova_plugins.js b/cordova/platforms/ios/platform_www/cordova_plugins.js
index ae4704a8a..f47ca9ffa 100644
--- a/cordova/platforms/ios/platform_www/cordova_plugins.js
+++ b/cordova/platforms/ios/platform_www/cordova_plugins.js
@@ -1,5 +1,13 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
+ {
+ "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
+ "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
+ "pluginId": "com.whebcraft.cordova.plugin.downloader",
+ "clobbers": [
+ "plugins.Downloader"
+ ]
+ },
{
"id": "cordova-plugin-device.device",
"file": "plugins/cordova-plugin-device/www/device.js",
@@ -230,28 +238,6 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
"cordova.plugins.fileOpener2"
]
},
- {
- "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
- "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
- "pluginId": "com.whebcraft.cordova.plugin.downloader",
- "clobbers": [
- "plugins.Downloader"
- ]
- },
- {
- "id": "es6-promise-plugin.Promise",
- "file": "plugins/es6-promise-plugin/www/promise.js",
- "pluginId": "es6-promise-plugin",
- "runs": true
- },
- {
- "id": "cordova-plugin-x-socialsharing.SocialSharing",
- "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
- "pluginId": "cordova-plugin-x-socialsharing",
- "clobbers": [
- "window.plugins.socialsharing"
- ]
- },
{
"id": "cordova-plugin-ios-xhr.formdata-polyfill",
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js",
@@ -275,18 +261,32 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/whatwg-fetch-2.0.3.js",
"pluginId": "cordova-plugin-ios-xhr",
"runs": true
+ },
+ {
+ "id": "es6-promise-plugin.Promise",
+ "file": "plugins/es6-promise-plugin/www/promise.js",
+ "pluginId": "es6-promise-plugin",
+ "runs": true
+ },
+ {
+ "id": "cordova-plugin-x-socialsharing.SocialSharing",
+ "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
+ "pluginId": "cordova-plugin-x-socialsharing",
+ "clobbers": [
+ "window.plugins.socialsharing"
+ ]
}
];
module.exports.metadata = {
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"cordova-plugin-device": "2.0.3",
"cordova-plugin-background-mode": "0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "3.0.4",
+ "cordova-plugin-ios-xhr": "1.0.0",
"cordova-plugin-whitelist": "1.3.4",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"es6-promise-plugin": "4.2.2",
- "cordova-plugin-x-socialsharing": "5.6.8",
- "cordova-plugin-ios-xhr": "1.0.0"
+ "cordova-plugin-x-socialsharing": "5.6.8"
};
-});
+});
\ No newline at end of file
diff --git a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
index 3db9ffdc7..ea01fe5aa 100644
--- a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
+++ b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
@@ -34,9 +34,9 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
*/
/*
- * Native Safari FormData only implements the append method. This polyfill is used in
+ * Native Safari FormData only implements the append method. This polyfill is used in
* tandem with the xhr-polyfill.
- *
+ *
* Two additional functions in this FormData implementation:
* 1) __getNative - returns the native Safari FormData object.
* 2) __getRequestParts - returns a promise resolving an object {contentType:string, body:string}.
@@ -191,7 +191,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
return __FormData._makeIterator(allentries);
};
-
+
__FormData.prototype.forEach = function(callback)
{
var eit = this.entries();
@@ -200,7 +200,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
{
callback.call(this, entry.value[1], entry.value[0], this);
entry = eit.next();
- }
+ }
};
__FormData.prototype.toString = function ()
@@ -215,7 +215,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
__FormData._getRequestValues(this.entries()).then(function (entries)
{
var parts = __FormData._getMultipartRequest(entries);
-
+
resolve(parts);
});
}.bind(this));
@@ -231,10 +231,10 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
while (!entry.done)
{
if (entry.value[1] && Blob.prototype.isPrototypeOf(entry.value[1]))
- fd.append(entry.value[0], entry.value[1], entry.value[1].name);
+ fd.append(entry.value[0], entry.value[1], entry.value[1].name);
else
fd.append(entry.value[0], entry.value[1]);
-
+
entry = eit.next();
}
@@ -250,13 +250,13 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
for (var i = 0; i < entries.length; i++)
{
var entry = entries[i];
- for (var data of __FormData._generateMultipartFormData(entry, boundary))
+ for (var data of __FormData._generateMultipartFormData(entry, boundary))
bodyEntries.push(data);
}
bodyEntries.push("--" + boundary + "--");
parts.body = new Blob(bodyEntries, {type: "application/octet-stream"});
-
+
return parts;
};
diff --git a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
index 4ba7a4269..e553ba26a 100644
--- a/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
+++ b/cordova/platforms/ios/platform_www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
@@ -173,16 +173,16 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
FileHandler.prototype._isTraceLoggingEnabled = function ()
{
- return this._config["NativeXHRLogging"] === "full";
+ return this._config["NativeXHRLogging"] === "full";
};
-
+
FileHandler._presend = function (reqContext)
{
reqContext.dispatchReadyStateChangeEvent(1); // OPEN
reqContext.dispatchProgressEvent("loadstart");
// no upload events for a GET
};
-
+
FileHandler._error = function (reqContext, e)
{
if (this._isTraceLoggingEnabled())
@@ -225,10 +225,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
};
FileHandler.prototype.send = function ()
- {
+ {
var reqContext = this._reqContext;
var rspTypeHandler = FileHandler.getHandlerForResponseType(reqContext);
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native file XHR Request:\n%o", reqContext.url);
@@ -318,14 +318,14 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
var body = reqContext.requestData;
var promise = new Promise(function (resolve, reject)
{
- var contentType = reqContext.requestHeaders["content-type"];
-
+ var contentType = reqContext.requestHeaders["content-type"];
+
// FormData polyfill - request the body and context-type
body.__getRequestParts().then(function (parts)
{
if (!contentType)
reqContext.requestHeaders["content-type"] = parts.contentType;
-
+
var reader = new FileReader();
reader.onload = function ()
{
@@ -341,7 +341,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
reader.readAsBinaryString(parts.body);
});
});
-
+
return promise;
}
},
@@ -566,22 +566,22 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
HttpHandler.prototype._isTraceLoggingEnabled = function ()
{
- return this._config["NativeXHRLogging"] === "full";
+ return this._config["NativeXHRLogging"] === "full";
};
-
+
HttpHandler._resolveUri = function (uri)
{
if (uri.indexOf("://") > -1)
return uri;
-
+
var resolver = document.createElement("a");
document.body.appendChild(resolver);
resolver.href = uri;
- var absoluteUri = resolver.href;
+ var absoluteUri = resolver.href;
resolver.parentNode.removeChild(resolver);
return absoluteUri;
};
-
+
HttpHandler.prototype.send = function ()
{
var reqContext = this._reqContext;
@@ -607,7 +607,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
url: HttpHandler._resolveUri(reqContext.url), method: reqContext.method,
headers: reqContext.requestHeaders,
body: bodyAsBase64String, timeout: timeoutInSecs};
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native XHR Request:\n %o", reqPayLoad);
@@ -697,10 +697,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
HttpHandler.prototype.load = function (payload)
{
var reqContext = this._reqContext;
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native XHR Response:\n%o", payload);
-
+
if (payload.error)
HttpHandler._error(reqContext, payload.error, payload['underlyingErrorCode']);
else
@@ -832,10 +832,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
var requestData = reqContext.requestData;
reqContext.requestData = undefined;
-
+
// returns a native FormData from the plugin's polyfill
if (FormData.prototype.isPrototypeOf(requestData))
- requestData = requestData.__getNative();
+ requestData = requestData.__getNative();
delegate.send(requestData);
};
@@ -863,7 +863,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
function error()
{
- HandlerFactory._config = {"InterceptRemoteRequests": "secureOnly",
+ HandlerFactory._config = {"InterceptRemoteRequests": "secureOnly",
"NativeXHRLogging": "none"};
done(HandlerFactory._config);
}
@@ -875,7 +875,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
return promise;
};
-
+
HandlerFactory.getHandler = function (context)
{
var promise = new Promise(function (resolve)
@@ -1020,7 +1020,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
// define readonly const properties
- ["UNSENT", "OPENED", "HEADERS_RECIEVED", "LOADING", "DONE"].forEach(function (propName, i)
+ ["UNSENT", "OPENED", "HEADERS_RECEIVED", "LOADING", "DONE"].forEach(function (propName, i)
{
Object.defineProperty(window.XMLHttpRequest.prototype, propName,
{
@@ -1233,7 +1233,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
/**
* Override plugin config settings per request instance for the "InterceptRemoteRequests"
* config param.
- *
+ *
* @param {string} value enumerations are: "all", "secureOnly", "none".
*/
window.XMLHttpRequest.prototype.__setInterceptRemoteRequests = function (value)
diff --git a/cordova/platforms/ios/www/cordova_plugins.js b/cordova/platforms/ios/www/cordova_plugins.js
index ae4704a8a..f47ca9ffa 100644
--- a/cordova/platforms/ios/www/cordova_plugins.js
+++ b/cordova/platforms/ios/www/cordova_plugins.js
@@ -1,5 +1,13 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
+ {
+ "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
+ "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
+ "pluginId": "com.whebcraft.cordova.plugin.downloader",
+ "clobbers": [
+ "plugins.Downloader"
+ ]
+ },
{
"id": "cordova-plugin-device.device",
"file": "plugins/cordova-plugin-device/www/device.js",
@@ -230,28 +238,6 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
"cordova.plugins.fileOpener2"
]
},
- {
- "id": "com.whebcraft.cordova.plugin.downloader.Downloader",
- "file": "plugins/com.whebcraft.cordova.plugin.downloader/www/Downloader.js",
- "pluginId": "com.whebcraft.cordova.plugin.downloader",
- "clobbers": [
- "plugins.Downloader"
- ]
- },
- {
- "id": "es6-promise-plugin.Promise",
- "file": "plugins/es6-promise-plugin/www/promise.js",
- "pluginId": "es6-promise-plugin",
- "runs": true
- },
- {
- "id": "cordova-plugin-x-socialsharing.SocialSharing",
- "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
- "pluginId": "cordova-plugin-x-socialsharing",
- "clobbers": [
- "window.plugins.socialsharing"
- ]
- },
{
"id": "cordova-plugin-ios-xhr.formdata-polyfill",
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js",
@@ -275,18 +261,32 @@ cordova.define('cordova/plugin_list', function(require, exports, module) {
"file": "plugins/cordova-plugin-ios-xhr/src/www/ios/whatwg-fetch-2.0.3.js",
"pluginId": "cordova-plugin-ios-xhr",
"runs": true
+ },
+ {
+ "id": "es6-promise-plugin.Promise",
+ "file": "plugins/es6-promise-plugin/www/promise.js",
+ "pluginId": "es6-promise-plugin",
+ "runs": true
+ },
+ {
+ "id": "cordova-plugin-x-socialsharing.SocialSharing",
+ "file": "plugins/cordova-plugin-x-socialsharing/www/SocialSharing.js",
+ "pluginId": "cordova-plugin-x-socialsharing",
+ "clobbers": [
+ "window.plugins.socialsharing"
+ ]
}
];
module.exports.metadata = {
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"cordova-plugin-device": "2.0.3",
"cordova-plugin-background-mode": "0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-file-opener2": "3.0.4",
+ "cordova-plugin-ios-xhr": "1.0.0",
"cordova-plugin-whitelist": "1.3.4",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0",
"es6-promise-plugin": "4.2.2",
- "cordova-plugin-x-socialsharing": "5.6.8",
- "cordova-plugin-ios-xhr": "1.0.0"
+ "cordova-plugin-x-socialsharing": "5.6.8"
};
-});
+});
\ No newline at end of file
diff --git a/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js b/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
index 3db9ffdc7..ea01fe5aa 100644
--- a/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
+++ b/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/formdata-polyfill.js
@@ -34,9 +34,9 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
*/
/*
- * Native Safari FormData only implements the append method. This polyfill is used in
+ * Native Safari FormData only implements the append method. This polyfill is used in
* tandem with the xhr-polyfill.
- *
+ *
* Two additional functions in this FormData implementation:
* 1) __getNative - returns the native Safari FormData object.
* 2) __getRequestParts - returns a promise resolving an object {contentType:string, body:string}.
@@ -191,7 +191,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
return __FormData._makeIterator(allentries);
};
-
+
__FormData.prototype.forEach = function(callback)
{
var eit = this.entries();
@@ -200,7 +200,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
{
callback.call(this, entry.value[1], entry.value[0], this);
entry = eit.next();
- }
+ }
};
__FormData.prototype.toString = function ()
@@ -215,7 +215,7 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
__FormData._getRequestValues(this.entries()).then(function (entries)
{
var parts = __FormData._getMultipartRequest(entries);
-
+
resolve(parts);
});
}.bind(this));
@@ -231,10 +231,10 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
while (!entry.done)
{
if (entry.value[1] && Blob.prototype.isPrototypeOf(entry.value[1]))
- fd.append(entry.value[0], entry.value[1], entry.value[1].name);
+ fd.append(entry.value[0], entry.value[1], entry.value[1].name);
else
fd.append(entry.value[0], entry.value[1]);
-
+
entry = eit.next();
}
@@ -250,13 +250,13 @@ cordova.define("cordova-plugin-ios-xhr.formdata-polyfill", function(require, exp
for (var i = 0; i < entries.length; i++)
{
var entry = entries[i];
- for (var data of __FormData._generateMultipartFormData(entry, boundary))
+ for (var data of __FormData._generateMultipartFormData(entry, boundary))
bodyEntries.push(data);
}
bodyEntries.push("--" + boundary + "--");
parts.body = new Blob(bodyEntries, {type: "application/octet-stream"});
-
+
return parts;
};
diff --git a/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js b/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
index 4ba7a4269..e553ba26a 100644
--- a/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
+++ b/cordova/platforms/ios/www/plugins/cordova-plugin-ios-xhr/src/www/ios/xhr-polyfill.js
@@ -173,16 +173,16 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
FileHandler.prototype._isTraceLoggingEnabled = function ()
{
- return this._config["NativeXHRLogging"] === "full";
+ return this._config["NativeXHRLogging"] === "full";
};
-
+
FileHandler._presend = function (reqContext)
{
reqContext.dispatchReadyStateChangeEvent(1); // OPEN
reqContext.dispatchProgressEvent("loadstart");
// no upload events for a GET
};
-
+
FileHandler._error = function (reqContext, e)
{
if (this._isTraceLoggingEnabled())
@@ -225,10 +225,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
};
FileHandler.prototype.send = function ()
- {
+ {
var reqContext = this._reqContext;
var rspTypeHandler = FileHandler.getHandlerForResponseType(reqContext);
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native file XHR Request:\n%o", reqContext.url);
@@ -318,14 +318,14 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
var body = reqContext.requestData;
var promise = new Promise(function (resolve, reject)
{
- var contentType = reqContext.requestHeaders["content-type"];
-
+ var contentType = reqContext.requestHeaders["content-type"];
+
// FormData polyfill - request the body and context-type
body.__getRequestParts().then(function (parts)
{
if (!contentType)
reqContext.requestHeaders["content-type"] = parts.contentType;
-
+
var reader = new FileReader();
reader.onload = function ()
{
@@ -341,7 +341,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
reader.readAsBinaryString(parts.body);
});
});
-
+
return promise;
}
},
@@ -566,22 +566,22 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
HttpHandler.prototype._isTraceLoggingEnabled = function ()
{
- return this._config["NativeXHRLogging"] === "full";
+ return this._config["NativeXHRLogging"] === "full";
};
-
+
HttpHandler._resolveUri = function (uri)
{
if (uri.indexOf("://") > -1)
return uri;
-
+
var resolver = document.createElement("a");
document.body.appendChild(resolver);
resolver.href = uri;
- var absoluteUri = resolver.href;
+ var absoluteUri = resolver.href;
resolver.parentNode.removeChild(resolver);
return absoluteUri;
};
-
+
HttpHandler.prototype.send = function ()
{
var reqContext = this._reqContext;
@@ -607,7 +607,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
url: HttpHandler._resolveUri(reqContext.url), method: reqContext.method,
headers: reqContext.requestHeaders,
body: bodyAsBase64String, timeout: timeoutInSecs};
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native XHR Request:\n %o", reqPayLoad);
@@ -697,10 +697,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
HttpHandler.prototype.load = function (payload)
{
var reqContext = this._reqContext;
-
+
if (this._isTraceLoggingEnabled())
console.log("xhr-polyfill.js - native XHR Response:\n%o", payload);
-
+
if (payload.error)
HttpHandler._error(reqContext, payload.error, payload['underlyingErrorCode']);
else
@@ -832,10 +832,10 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
var requestData = reqContext.requestData;
reqContext.requestData = undefined;
-
+
// returns a native FormData from the plugin's polyfill
if (FormData.prototype.isPrototypeOf(requestData))
- requestData = requestData.__getNative();
+ requestData = requestData.__getNative();
delegate.send(requestData);
};
@@ -863,7 +863,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
function error()
{
- HandlerFactory._config = {"InterceptRemoteRequests": "secureOnly",
+ HandlerFactory._config = {"InterceptRemoteRequests": "secureOnly",
"NativeXHRLogging": "none"};
done(HandlerFactory._config);
}
@@ -875,7 +875,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
return promise;
};
-
+
HandlerFactory.getHandler = function (context)
{
var promise = new Promise(function (resolve)
@@ -1020,7 +1020,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
// define readonly const properties
- ["UNSENT", "OPENED", "HEADERS_RECIEVED", "LOADING", "DONE"].forEach(function (propName, i)
+ ["UNSENT", "OPENED", "HEADERS_RECEIVED", "LOADING", "DONE"].forEach(function (propName, i)
{
Object.defineProperty(window.XMLHttpRequest.prototype, propName,
{
@@ -1233,7 +1233,7 @@ cordova.define("cordova-plugin-ios-xhr.xhr-polyfill", function(require, exports,
/**
* Override plugin config settings per request instance for the "InterceptRemoteRequests"
* config param.
- *
+ *
* @param {string} value enumerations are: "all", "secureOnly", "none".
*/
window.XMLHttpRequest.prototype.__setInterceptRemoteRequests = function (value)
diff --git a/cordova/yarn.lock b/cordova/yarn.lock
index 6a1ac7f5f..0a94296bb 100644
--- a/cordova/yarn.lock
+++ b/cordova/yarn.lock
@@ -2,10 +2,10 @@
# yarn lockfile v1
-"@globules-io/cordova-plugin-ios-xhr@^1.0.3":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@globules-io/cordova-plugin-ios-xhr/-/cordova-plugin-ios-xhr-1.0.3.tgz#e1a0abb1ce9a0d1a925fb4b3ceb38045f2426475"
- integrity sha512-mFpnSuNkoPWel2K0uGFONj31tx4ud+E3nCKKe1uj1jYaj43gtRA1HDbPReqQyut8buQkShZKskYK/ofbdRRyxQ==
+"@globules-io/cordova-plugin-ios-xhr@^1.0.4":
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/@globules-io/cordova-plugin-ios-xhr/-/cordova-plugin-ios-xhr-1.0.5.tgz#02521248716ed5a3ee369c032d44a4b394e2dbd0"
+ integrity sha512-3tBWWV2TXTnCGQV+EwaQmXDTVPWAVaB7kSWpFazm68cH3Q3BtjH2s9a0a7xcEs0eajNXok30hzNMzrMvLtgYKQ==
"@netflix/nerror@^1.1.3":
version "1.1.3"
@@ -176,11 +176,6 @@ cordova-plugin-background-mode@^0.7.3:
resolved "https://registry.yarnpkg.com/cordova-plugin-background-mode/-/cordova-plugin-background-mode-0.7.3.tgz#066f92c99f403b3ed3d6fb91f281a0a7ccbc84ba"
integrity sha512-LsU1v7EgTUROaks+tcQ8TnMzVUcU/TwjDVwj2O/4e4aI2q2ldLGsiZorqKqfqvwh2HoIssmY73OwJk91hQi62w==
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/cordova-plugin-camera/-/cordova-plugin-camera-4.1.0.tgz#6474a3e080c4662aa00fd7425705d301c693ddc0"
- integrity sha512-fCLhWjWYn49q3X5xaypAPgTz6MAWSKFFQvD2Gpi5SuVlrRPRphtX2jIqR2zCBuDTBR082QVnlc+yUDXt65Mjgw==
-
cordova-plugin-device@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz#c2b41b7efd0455dd097f89356d85bfdd5dadeb0f"
@@ -405,9 +400,9 @@ jsonfile@^6.0.1:
graceful-fs "^4.1.6"
lodash@^4.17.15:
- version "4.17.19"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
- integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+ version "4.17.20"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+ integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
merge-stream@^2.0.0:
version "2.0.0"
diff --git a/package.json b/package.json
index deb31c61b..0802bc262 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,8 @@
"package-web-pro": "yarn prepare-web && yarn clean-maps && zip -r ../builds/tagspaces-pro-web.zip web -xi web/files/**\\* ",
"prepare-web": "rimraf web/node_modules && cp -r app/node_modules web && cp LICENSE.txt web && node scripts/genswconf.js",
"prepare-cordova": "rimraf cordova/www/dist && rimraf cordova/www/node_modules && cp -LR app/node_modules cordova/www && cp LICENSE.txt cordova/www",
+ "paste-android-linux": "adb shell input text '$(xclip -selection c -o)'",
+ "paste-android-macos": "adb shell input text \"'$(pbpaste)'\"",
"clean": "rimraf node_modules && rimraf app/dist",
"clean-pro": "yarn clean-maps",
"clean-maps": "rimraf app/dist/**/*.map && rimraf web/dist/**/*.map",
@@ -64,7 +66,7 @@
"run-ios-dev": "yarn prepare-cordova && yarn build-cordova-dev && cd cordova && cordova run ios && cd ..",
"cordova-list-emulators": "cd cordova && cordova run --list --emulator && cd ..",
"cordova-add-android": "cd cordova && cordova platform add android && cd ..",
- "cordova-create-app": "cordova create ./cordova org.tagspaces.mobile TagSpaces",
+ "cordova-create-app": "cordova create ./cordova org.tagspaces.iosn TagSpaces",
"update-changelog": "git log v3.4.2..HEAD --no-merges --format=%B > CHANGELOG.TXT",
"source-map-app": "source-map-explorer app/dist/*.* --html reports/source-map-app.html",
"source-map-web": "source-map-explorer web/dist/*.* --html reports/source-map-web.html",