Skip to content

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

Merge remote-tracking branch 'remotes/origin/develop' into Cordova-add-platform-iOS

stanimird0e9e2d595ac
diff --cc cordova/package.json
index c1d2e54c6,28f9cbf32..479d3f597
--- a/cordova/package.json
+++ b/cordova/package.json
@@@ -1,7 -1,7 +1,7 @@@
{
"name": "org.tagspaces.mobile",
"displayName": "TagSpaces",
- "version": "1.0.3",
- "version": "1.0.0",
++ "version": "1.0.4",
"description": "A sample Apache Cordova application that responds to the deviceready event.",
"main": "index.js",
"scripts": {
@@@ -10,8 -10,8 +10,9 @@@
"author": "Apache Cordova Team",
"license": "Apache-2.0",
"dependencies": {
+ "bamboo.cordova.plugin.downloader": "git+https://github.com/sytolk/cordova-plugin-downloader.git",
"cordova-android": "^7.1.4",
+ "cordova-ios": "^5.1.1",
"cordova-plugin-background-mode": "^0.7.3",
"cordova-plugin-camera": "4.1.0",
"cordova-plugin-device": "^2.0.3",
@@@ -34,11 -33,10 +35,12 @@@
"cordova-plugin-file-opener2": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
- "cordova-plugin-wkwebview-engine": {}
++ "cordova-plugin-wkwebview-engine": {},
+ "com.whebcraft.cordova.plugin.downloader": {}
},
"platforms": [
- "android"
+ "android",
+ "ios"
]
}
-}
+}
diff --cc cordova/platforms/android/android.json
index 0f2a6d2a1,a45011715..112de0364
--- a/cordova/platforms/android/android.json
+++ b/cordova/platforms/android/android.json
@@@ -131,8 -153,17 +153,20 @@@
"ANDROID_SUPPORT_V4_VERSION": "27.+",
"PACKAGE_NAME": "org.tagspaces.mobile"
},
+ "com.whebcraft.cordova.plugin.downloader": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
+ },
+ "cordova-plugin-file-transfer": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
+ },
+ "cordova-plugin-downloader": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
+ },
+ "cordova-plugin-zip": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
++ },
+ "cordova-plugin-wkwebview-engine": {
+ "PACKAGE_NAME": "org.tagspaces.mobile"
}
},
"dependent_plugins": {},
@@@ -391,6 -462,9 +465,10 @@@
"es6-promise-plugin": "4.2.2",
"cordova-plugin-x-socialsharing": "5.6.8",
"cordova-plugin-file-opener2": "3.0.3",
+ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
+ "cordova-plugin-file-transfer": "1.7.1",
+ "cordova-plugin-downloader": "0.0.4",
- "cordova-plugin-zip": "3.1.0"
++ "cordova-plugin-zip": "3.1.0",
+ "cordova-plugin-wkwebview-engine": "1.2.1"
}
- }
+ }
diff --cc cordova/platforms/android/platform_www/cordova_plugins.js
index d72a6ac0c,78e3f9ed8..6264ff213
--- a/cordova/platforms/android/platform_www/cordova_plugins.js
+++ b/cordova/platforms/android/platform_www/cordova_plugins.js
@@@ -243,9 -243,17 +243,17 @@@ module.exports =
"clobbers": [
"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"
+ ]
}
];
--module.exports.metadata =
++module.exports.metadata =
// TOP OF METADATA
{
"cordova-plugin-device": "2.0.3",
@@@ -256,7 -264,7 +264,8 @@@
"es6-promise-plugin": "4.2.2",
"cordova-plugin-x-socialsharing": "5.6.8",
"cordova-plugin-file-opener2": "3.0.3",
- "com.whebcraft.cordova.plugin.downloader": "0.1.0"
++ "com.whebcraft.cordova.plugin.downloader": "0.1.0",
+ "cordova-plugin-wkwebview-engine": "1.2.1"
};
// BOTTOM OF METADATA
--});
++});
diff --cc cordova/platforms/ios/TagSpaces Beta.xcworkspace/xcuserdata/sytolk.xcuserdatad/UserInterfaceState.xcuserstate
index 40fc0ae61,000000000..52b072422
mode 100644,000000..100644
Binary files differ
diff --cc cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
index 14de8c33a,000000000..efb88a050
mode 100644,000000..100644
--- a/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
+++ b/cordova/platforms/ios/TagSpaces Beta/TagSpaces Beta-Info.plist
@@@ -1,60 -1,0 +1,60 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>en_US</string>
+ <key>CFBundleDisplayName</key>
+ <string>TagSpaces Beta</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
- <string>1.0.3</string>
++ <string>1.0.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
- <string>1.0.3</string>
++ <string>1.0.0</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>NSAppTransportSecurity</key>
+ <dict>
+ <key>NSAllowsArbitraryLoads</key>
+ <true/>
+ </dict>
+ <key>NSMainNibFile</key>
- <string></string>
++ <string/>
+ <key>NSMainNibFile~ipad</key>
- <string></string>
++ <string/>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>This app requires access to the photo library.</string>
+ <key>NSCameraUsageDescription</key>
+ <string>This app requires access to the camera.</string>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>audio</string>
+ </array>
+ <key>UIRequiresFullScreen</key>
+ <true/>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+</dict>
- </plist>
++</plist>
diff --cc cordova/yarn.lock
index 1057e6ddb,29c51aafd..918e63026
--- a/cordova/yarn.lock
+++ b/cordova/yarn.lock
@@@ -44,19 -43,7 +48,14 @@@ big-integer@^1.6.44, big-integer@^1.6.7
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==
- big-integer@^1.6.7:
- version "1.6.40"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.40.tgz#02e4cd4d6e266c4d9ece2469c05cb6439149fc78"
- integrity sha512-CjhtJp0BViLzP1ZkEnoywjgtFQXS2pomKjAJtIISTCnuHILkLcAXLdFLG/nxsHc4s9kJfc+82Xpg8WNyhfACzQ==
-
-bplist-parser@*:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/bplist-creator/-/bplist-creator-0.0.8.tgz#56b2a6e79e9aec3fc33bf831d09347d73794e79c"
+ integrity sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==
+ dependencies:
+ stream-buffers "~2.2.0"
+
version "0.2.0"
resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==
@@@ -305,34 -179,12 +304,34 @@@ inflight@^1.0.4
once "^1.3.0"
wrappy "1"
-inherits@*, inherits@2:
+inherits@2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
- integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-minimatch@*, "minimatch@2 || 3", minimatch@^3.0.0:
+ios-sim@^8.0.1:
+ version "8.0.2"
+ resolved "https://registry.yarnpkg.com/ios-sim/-/ios-sim-8.0.2.tgz#e2394acb6db4378f75f4c3ff8610bbf4f4795c43"
+ integrity sha512-P7nEG771bfd+JoMRjnis1gpZOkjTUUxu+4Ek1Z+eoaEEoT9byllU9pxfQ8Df7hL3gSkIQxNwTSLhos2I8tWUQA==
+ dependencies:
+ bplist-parser "^0.0.6"
+ nopt "1.0.9"
+ plist "^3.0.1"
+ simctl "^2"
+
+isexe@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+jsonfile@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+ optionalDependencies:
+ graceful-fs "^4.1.6"
+
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@@ -454,12 -244,7 +453,7 @@@ [email protected]
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
--semver@^5.4.1:
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
- integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
- semver@^5.5.0:
++semver@^5.4.1, semver@^5.5.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@@ -486,54 -254,12 +480,54 @@@ [email protected], shelljs@^0.5.3
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
-underscore@*, underscore@^1.8.3:
+shelljs@^0.2.6:
+ version "0.2.6"
+ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.2.6.tgz#90492d72ffcc8159976baba62fb0f6884f0c3378"
+ integrity sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=
+
+simctl@^2:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/simctl/-/simctl-2.0.0.tgz#e3f1c6908735969e23e0922b0cb1161843dd0c59"
+ integrity sha512-5rB7rN4N3b0z0nFdy9eczVssXqrv2aAgdVRksPVqVoiDtvXmfzNvebp3EMdId2sAUzXIflarQlx4P0hjVQEzKQ==
+ dependencies:
+ shelljs "^0.2.6"
+ tail "^0.4.0"
+
+simple-plist@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.1.0.tgz#8354ab63eb3922a054c78ce96c209c532e907a23"
+ integrity sha512-2i5Tc0BYAqppM7jVzmNrI+aEUntPolIq4fDgji6WuNNn1D/qYdn2KwoLhZdzQkE04lu9L5tUoeJsjuJAvd+lFg==
+ dependencies:
+ bplist-creator "0.0.8"
+ bplist-parser "0.2.0"
+ plist "^3.0.1"
+
+stream-buffers@~2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
+ integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=
+
+strip-bom@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+ integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+tail@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/tail/-/tail-0.4.0.tgz#d29de72750cc99db1e053aff13c359ecfb713002"
+ integrity sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI=
+
+underscore@^1.8.3:
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
- integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+ integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
-unorm@*, unorm@^1.3.3:
+universalify@^0.1.0:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unorm@^1.3.3, unorm@^1.4.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==
@@@ -573,12 -274,12 +567,12 @@@ [email protected]
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
-xmldom@*:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.3.0.tgz#e625457f4300b5df9c2e1ecb776147ece47f3e5a"
- integrity sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g==
+xmlbuilder@^9.0.7:
+ version "9.0.7"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+ integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
- version "0.1.27"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
- integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+ version "0.1.31"
+ resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+ integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==