From 755ad143723d3c41982ac5a5d0c07fe08a75dfa2 Mon Sep 17 00:00:00 2001 From: Shankari Date: Sat, 5 Jun 2021 11:44:07 -0700 Subject: [PATCH] Redirect to app settings on newer versions of android and iOS + Bump up plugin versions - Main changes: https://github.com/e-mission/e-mission-data-collection/releases/tag/v1.6.0 - Consolidate activity changes, should really be moved to data-collection later https://github.com/e-mission/cordova-server-sync/releases/tag/v1.2.5 - Null check https://github.com/e-mission/cordova-jwt-auth/releases/tag/v1.6.4 + change the default instructions to match the new processes + bump up version numbers for the app --- config.cordovabuild.xml | 2 +- package.cordovabuild.json | 8 ++++---- www/i18n/en.json | 7 ++++--- www/js/intro.js | 6 ++++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml index dcefb8f34..2f7670608 100644 --- a/config.cordovabuild.xml +++ b/config.cordovabuild.xml @@ -1,5 +1,5 @@ - + emission A commute pattern tracker and carbon footprint estimator. diff --git a/package.cordovabuild.json b/package.cordovabuild.json index a5b3d212b..9a44d7f92 100644 --- a/package.cordovabuild.json +++ b/package.cordovabuild.json @@ -1,6 +1,6 @@ { "name": "edu.berkeley.eecs.emission", - "version": "2.9.0", + "version": "3.0.0", "displayName": "emission", "license": "BSD-3-Clause", "repository": { @@ -72,10 +72,10 @@ "cordova-plugin-app-version": "0.1.9", "cordova-plugin-customurlscheme": "5.0.1", "cordova-plugin-device": "2.0.1", - "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.5.0", - "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.3", + "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.6.0", + "cordova-plugin-em-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.4", "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.3", - "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.4", + "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.2.5", "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.2", "cordova-plugin-em-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git#v1.2.6", "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.3", diff --git a/www/i18n/en.json b/www/i18n/en.json index 53381eafc..4818342e2 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -273,10 +273,11 @@ "intro": { "permissions": { "locationPermExplanation-android-lt-6": "you accepted the permission during installation. You don't need to do anything now.", - "locationPermExplanation-android-gte-6": "please select 'allow'", - "locationPermExplanation-android-gte-10": "please select 'Allow all the time'", + "locationPermExplanation-android-6-9": "please select 'allow'", + "locationPermExplanation-android-10": "please select 'Allow all the time'", + "locationPermExplanation-android-gte-11": "please select 'Allow all the time' for location permissions on the app page", "locationPermExplanation-ios-lt-13": "please select 'Always allow'. This allows us to understand your travel even when you are not actively using the app", - "locationPermExplanation-ios-gte-13": "please select 'when in use' now. After a few days, you will be asked whether you want to give the app background permission. Please say 'Always Allow' at that time. This allows us to understand your travel even when you are not actively using the app" + "locationPermExplanation-ios-gte-13": "please select 'always' and 'precise' in the app settings page and return here to continue" } }, "allow_background": { diff --git a/www/js/intro.js b/www/js/intro.js index 102cac573..d40400209 100644 --- a/www/js/intro.js +++ b/www/js/intro.js @@ -29,9 +29,11 @@ angular.module('emission.intro', ['emission.splash.startprefs', if($scope.osver < 6) { $scope.locationPermExplanation = $translate.instant('intro.permissions.locationPermExplanation-android-lt-6'); } else if ($scope.osver < 10) { - $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-6"); + $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-6-9"); + } else if ($scope.osver < 11) { + $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-10"); } else { - $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-10"); + $scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-11"); } }