Merge pull request #967 from RADAR-base/release-0.7.5

Release 0.7.5
RADAR-base · Mar 9, 2020 · 4393f1a · 4393f1a
2 parents d6bc5f2 + 6c5e1a3
commit 4393f1a
Show file tree

Hide file tree

Showing 6 changed files with 477 additions and 304 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="542" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="0.7.4" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget android-versionCode="543" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="0.7.5" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
     <author email="radar-base@kcl.ac.uk" href="http://radar-base.org/">RADAR-Base</author>
@@ -145,6 +145,6 @@
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
     <plugin name="cordova-custom-config" spec="^5.1.0" />
     <plugin name="cordova-plugin-ionic-webview" spec="^4.1.3" />
-    <engine name="ios" spec="^5.0.1" />
+    <engine name="ios" spec="^5.1.1" />
     <engine name="android" spec="^8.1.0" />
 </widget>
diff --git a/karma.conf.js b/karma.conf.js
@@ -32,14 +32,14 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     singleRun: false,
-    browsers: ['Chrome'],
+    browsers: ['ChromeHeadless'],
     customLaunchers: {
       ChromeDebugging: {
-        base: 'Chrome',
+        base: 'ChromeHeadless',
         flags: ['--remote-debugging-port=9333']
       },
       ChromeNoSandbox: {
-        base: 'Chrome',
+        base: 'ChromeHeadless',
         flags: ['--no-sandbox']
       }
     },

diff --git a/package.json b/package.json
@@ -47,35 +47,35 @@
         "@angular/forms": "^7.2.13",
         "@angular/router": "^7.2.13",
         "@auth0/angular-jwt": "^3.0.0",
-        "@ionic-native/android-permissions": "^5.19.1",
-        "@ionic-native/app-version": "^5.19.1",
-        "@ionic-native/background-mode": "^5.17.1",
-        "@ionic-native/barcode-scanner": "^5.17.1",
+        "@ionic-native/android-permissions": "^5.22.0",
+        "@ionic-native/app-version": "^5.22.0",
+        "@ionic-native/background-mode": "^5.21.6",
+        "@ionic-native/barcode-scanner": "^5.21.5",
         "@ionic-native/core": "^5.17.1",
-        "@ionic-native/device": "^5.17.1",
-        "@ionic-native/dialogs": "^5.17.1",
-        "@ionic-native/file": "^5.17.1",
-        "@ionic-native/firebase": "^5.19.1",
+        "@ionic-native/device": "^5.21.6",
+        "@ionic-native/dialogs": "^5.22.0",
+        "@ionic-native/file": "^5.22.0",
+        "@ionic-native/firebase": "^5.21.5",
         "@ionic-native/globalization": "^5.19.1",
-        "@ionic-native/insomnia": "^5.19.1",
-        "@ionic-native/keyboard": "^5.17.1",
-        "@ionic-native/local-notifications": "^5.17.1",
-        "@ionic-native/mobile-accessibility": "5.19.1",
-        "@ionic-native/splash-screen": "^5.19.1",
-        "@ionic-native/status-bar": "^5.17.1",
-        "@ionic-native/vibration": "^5.17.1",
+        "@ionic-native/insomnia": "^5.21.6",
+        "@ionic-native/keyboard": "^5.20.0",
+        "@ionic-native/local-notifications": "^5.21.5",
+        "@ionic-native/mobile-accessibility": "5.22.0",
+        "@ionic-native/splash-screen": "^5.21.6",
+        "@ionic-native/vibration": "^5.21.6",
+        "@ionic-native/status-bar": "^5.21.6",
         "@ionic-native/web-intent": "^5.19.1",
         "@ionic/storage": "^2.2.0",
         "angular-svg-round-progressbar": "^3.0.1",
-        "autoprefixer": "^9.7.2",
-        "avsc": "^5.4.16",
+        "autoprefixer": "^9.7.4",
+        "avsc": "^5.4.18",
         "base64-js": "^1.3.1",
         "browserify": "^16.3.0",
         "com-darryncampbell-cordova-plugin-intent": "^2.0.0",
         "cordova-android": "^8.1.0",
         "cordova-android-support-gradle-release": "^3.0.1",
         "cordova-custom-config": "^5.1.0",
-        "cordova-ios": "5.0.1",
+        "cordova-ios": "5.1.1",
         "cordova-lib": "^9.0.1",
         "cordova-media-with-compression": "^2.1.2",
         "cordova-plugin-android-permissions": "^1.0.0",
@@ -110,10 +110,10 @@
         "ngx-moment": "^3.3.0",
         "phonegap-plugin-barcodescanner": "^8.1.0",
         "phonegap-plugin-mobile-accessibility": "^1.0.5",
-        "rxjs": "^6.5.3",
+        "rxjs": "^6.5.4",
         "semver": "^6.3.0",
         "smoothscroll-polyfill": "^0.4.4",
-        "uuid": "^3.3.3",
+        "uuid": "^3.4.0",
         "yaml": "^1.7.2",
         "zone.js": "~0.8.26"
     },
@@ -124,38 +124,38 @@
         "@angular/http": "^7.2.13",
         "@angular/platform-browser": "^7.2.13",
         "@angular/platform-browser-dynamic": "^7.2.13",
-        "@angular/platform-server": "^7.2.13",
+        "@angular/platform-server": "^9.0.0",
         "@ionic/app-scripts": "^3.2.4",
         "@types/jasmine": "^3.5.0",
         "@types/jasminewd2": "^2.0.8",
         "@types/node": "^12.12.14",
-        "codelyzer": "^5.1.2",
-        "eslint": "^6.7.1",
+        "codelyzer": "^5.2.1",
+        "eslint": "^6.8.0",
         "eslint-scope": "^5.0.0",
         "import-sort-cli": "^6.0.0",
         "import-sort-parser-babylon": "^6.0.0",
         "import-sort-parser-typescript": "^6.0.0",
         "import-sort-style-module": "^6.0.0",
-        "ionic": "^5.4.9",
+        "ionic": "^5.4.16",
         "jasmine": "^3.5.0",
         "jasmine-core": "^3.5.0",
         "jasmine-spec-reporter": "^4.2.1",
         "karma": "^4.3.0",
-        "karma-browserify": "^6.1.0",
+        "karma-browserify": "^7.0.0",
         "karma-browserstack-launcher": "^1.5.1",
         "karma-chrome-launcher": "^3.1.0",
         "karma-cli": "^2.0.0",
         "karma-coverage-istanbul-reporter": "^2.1.1",
-        "karma-jasmine": "^2.0.1",
-        "karma-jasmine-html-reporter": "^1.4.2",
+        "karma-jasmine": "^3.1.1",
+        "karma-jasmine-html-reporter": "^1.5.2",
         "karma-requirejs": "^1.1.0",
         "karma-scss-preprocessor": "^4.0.0",
         "karma-sourcemap-loader": "^0.3.7",
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "^4.0.2",
-        "node-sass": "^4.12.0",
+        "node-sass": "^4.13.1",
         "postcss": "^7.0.23",
-        "postcss-cli": "^6.1.3",
+        "postcss-cli": "^7.1.0",
         "postcss-scss": "^2.0.0",
         "postcss-sorting": "^5.0.1",
         "prettier": "^1.19.1",
@@ -165,7 +165,7 @@
         "rxjs-tslint": "0.1.5",
         "stylefmt": "^6.0.3",
         "stylelint": "^12.0.0",
-        "stylelint-config-standard": "^19.0.0",
+        "stylelint-config-standard": "^20.0.0",
         "tslint": "^5.20.1",
         "tslint-angular": "^3.0.2",
         "tslint-config-prettier": "^1.15.0",

diff --git a/src/app/core/services/config/remote-config.service.ts b/src/app/core/services/config/remote-config.service.ts
@@ -7,21 +7,22 @@ import { BehaviorSubject, Observable, from } from 'rxjs'
 
 import { ConfigKeys } from '../../../shared/enums/config'
 import { StorageKeys } from '../../../shared/enums/storage'
+import { getSeconds } from '../../../shared/utilities/time'
 import { LogService } from '../misc/log.service'
 import { StorageService } from '../storage/storage.service'
 
 declare var FirebasePlugin
 
 @Injectable()
 export class RemoteConfigService {
-  protected timeoutMillis: number = 14_400_000
+  protected timeoutMillis: number = 10_800_000
 
   constructor(private storage: StorageService) {
     this.storage.get(StorageKeys.REMOTE_CONFIG_CACHE_TIMEOUT).then(timeout => {
       if (timeout) {
         this.timeoutMillis = timeout
       } else {
-        this.timeoutMillis = 14_400_000 // 3 hours
+        this.timeoutMillis = 10_800_000 // 3 hours
         return this.storage.set(
           StorageKeys.REMOTE_CONFIG_CACHE_TIMEOUT,
           this.timeoutMillis
@@ -143,7 +144,7 @@ export class FirebaseRemoteConfigService extends RemoteConfigService {
     }
     console.log('Fetching Firebase Remote Config')
     return this.firebase
-      .fetch(timeoutMillis)
+      .fetch(getSeconds({ milliseconds: timeoutMillis }))
       .then(() => {
         console.log('Activating Firebase Remote Config')
         return (
@@ -166,5 +167,5 @@ export class FirebaseRemoteConfigService extends RemoteConfigService {
   subject(): Observable<RemoteConfig> {
     return from(this.read())
       .mergeMap(() => this.configSubject)
-  }
+      }
 }
diff --git a/src/assets/data/defaultConfig.ts b/src/assets/data/defaultConfig.ts
@@ -13,7 +13,7 @@ import { DefaultSourceProducerAndSecretExport } from './secret'
 export const DefaultPlatformInstance = 'RADAR-CNS'
 
 // *Default app version
-export const DefaultAppVersion = '0.7.4'
+export const DefaultAppVersion = '0.7.5'
 
 // *Default Android package name
 export const DefaultPackageName = 'org.phidatalab.radar_armt'