From fd1438627020a439085388c039c8b4b7b9428961 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 18 Feb 2021 17:29:07 -0700 Subject: [PATCH] Remove run in background --- package.json | 21 +++++++++++---------- www/assets/js/platform.js | 6 +++--- www/assets/js/sync.js | 10 +++++----- www/routes.js | 3 ++- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index e289ada..da1ffa3 100644 --- a/package.json +++ b/package.json @@ -22,19 +22,21 @@ "cordova": { "plugins": { "cordova-plugin-geolocation": {}, - "cordova-plugin-inappbrowser": {}, "cordova-plugin-powermanagement-netsyms": {}, - "cordova-plugin-whitelist": {}, - "phonegap-plugin-barcodescanner": {}, "cordova-plugin-device": {}, "cordova-plugin-battery-status": {}, "cordova-plugin-statusbar": {}, + "cordova-plugin-inappbrowser": {}, "cordova-plugin-headercolor": {}, - "cordova-plugin-foreground-service": {} + "cordova-plugin-whitelist": {}, + "phonegap-plugin-barcodescanner": { + "ANDROID_SUPPORT_V4_VERSION": "27.+" + } }, "platforms": [ "browser", - "android" + "android", + "ios" ] }, "dependencies": { @@ -42,13 +44,12 @@ "cordova-browser": "^6.0.0", "cordova-plugin-battery-status": "^2.0.3", "cordova-plugin-device": "^2.0.3", - "cordova-plugin-headercolor": "^1.0.0", - "cordova-plugin-inappbrowser": "^3.1.0", "cordova-plugin-powermanagement-netsyms": "git+https://source.netsyms.com/Netsyms/cordova-plugin-powermanagement", - "cordova-plugin-statusbar": "^2.4.3", - "cordova-plugin-whitelist": "^1.3.4" + "cordova-plugin-statusbar": "^2.4.3" }, "devDependencies": { - "cordova-plugin-foreground-service": "^1.1.3" + "cordova-ios": "^6.1.1", + "cordova-plugin-inappbrowser": "^4.1.0", + "phonegap-plugin-barcodescanner": "^8.1.0" } } \ No newline at end of file diff --git a/www/assets/js/platform.js b/www/assets/js/platform.js index 82b5174..3a55663 100644 --- a/www/assets/js/platform.js +++ b/www/assets/js/platform.js @@ -169,9 +169,9 @@ function initCordova() { }); } - if (getStorage("runinbackground") == "true") { - cordova.plugins.foregroundService.start('PackageHelper', 'GPS active'); - } +// if (getStorage("runinbackground") == "true") { +// cordova.plugins.foregroundService.start('PackageHelper', 'GPS active'); +// } // Make sure the status bar color is set properly applyColorTheme(); diff --git a/www/assets/js/sync.js b/www/assets/js/sync.js index 7de6239..d9bfe09 100644 --- a/www/assets/js/sync.js +++ b/www/assets/js/sync.js @@ -101,11 +101,11 @@ function loadSettings() { }); } - if (getStorage("runinbackground") == "true") { - cordova.plugins.foregroundService.start('PackageHelper', 'GPS active'); - } else { - cordova.plugins.foregroundService.stop(); - } +// if (getStorage("runinbackground") == "true") { +// cordova.plugins.foregroundService.start('PackageHelper', 'GPS active'); +// } else { +// cordova.plugins.foregroundService.stop(); +// } } } diff --git a/www/routes.js b/www/routes.js index e3fe244..cb8650a 100644 --- a/www/routes.js +++ b/www/routes.js @@ -529,7 +529,8 @@ var routes = [ checked: getStorage("hardwarescanner") == "true", onclick: "" }); - if (platform_type == "cordova" && cordova.platformId != "browser") { + // disable this because it's broken + if (false && platform_type == "cordova" && cordova.platformId != "browser") { settings.push({ setting: "runinbackground", title: "Run in background",