Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest cordova #700

Merged
merged 52 commits into from
Jul 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
581e5d0
Upgrade to the latest versions of the plugins
shankari Mar 30, 2020
5b23980
Fix plugin versions in package.json as well
shankari Mar 30, 2020
f734104
Fix the installation instructions
shankari Apr 16, 2020
de7f58e
Merge pull request #636 from shankari/apply_plugin_updates
shankari Apr 16, 2020
b422847
Vastly simplify the instructions for installation
shankari Apr 1, 2020
b6fd738
Enable CI
shankari Apr 1, 2020
f001ce9
Enable CI for android and iOS
shankari Apr 2, 2020
5807527
Add status badges for the builds
shankari Apr 3, 2020
26760cb
Fix the plugin test to account for the new plugin
shankari Apr 4, 2020
5dd4956
Fix android setup
shankari Apr 4, 2020
6abd803
I always forget to bump up the number of plugins!
shankari Apr 5, 2020
4866fc3
There is now a dependent `badge` plugin after the upgrade
shankari Apr 6, 2020
7d80a11
Set the scheduled check to run only once on the weekend
shankari Apr 12, 2020
6349af6
Merge pull request #638 from e-mission/import_ci
shankari Apr 18, 2020
a1c7ff1
Create a hook to set the provider
shankari Apr 4, 2020
dadba95
Make the hook executable
shankari Apr 4, 2020
18da2f2
Add the hook to the config.xml
shankari Apr 4, 2020
e9012c1
Bump up all plugins to the latest version
shankari Apr 18, 2020
0097aaa
Copy both google-service.json and GoogleServices-Info.plist every time
shankari Apr 18, 2020
837ccdc
Fix dest path for GoogleServices-Info.json
shankari Apr 18, 2020
40176e1
Bump up the number of expected plugins
shankari Apr 18, 2020
cd8d39e
Bump up ionic cli version
shankari Apr 18, 2020
75bf6df
We will only support android 5.0+
shankari Mar 30, 2020
a922958
Fix the sign_and_align_keys script
shankari Apr 1, 2020
f949605
Bunch of minor fixes found in testing
shankari Apr 6, 2020
aa78a1c
Change the README to work with the current repo workflows
shankari Apr 18, 2020
605b8ca
Merge pull request #639 from e-mission/modify_plugins
shankari Apr 18, 2020
cc99f67
Remove the upstream setup
shankari Apr 18, 2020
d021b90
Create a setup script + workflow for the serve case as well
shankari Apr 18, 2020
7295eef
Fix the workflow to run the full setup script
shankari Apr 18, 2020
e3b4e65
Remove the angular_mocks since we are not testing anything at this point
shankari Apr 1, 2020
778bc19
Add the ionic/cordova dependencies to the json
shankari Apr 18, 2020
0b40963
Add the setup install + fix README as well
shankari Apr 18, 2020
21a44ff
Remove the upstream instruction
shankari Apr 18, 2020
8c3f6ee
Merge pull request #640 from e-mission/ci_for_serve_install
shankari Apr 18, 2020
11007e0
Switch all the map tiles and nominatim lookups to be $https
shankari Apr 4, 2020
7058a0c
Add a second onboarding page
shankari Apr 3, 2020
18d2e50
Add in missing file
shankari Apr 3, 2020
40dbe85
Remove legacy build
shankari Apr 1, 2020
4bcd9ed
Add the sensor explanation as a page after the consent
shankari Apr 19, 2020
06177b9
Make aggregate calls to the server using a native plugin
shankari Apr 20, 2020
6060cdf
Fix 'today' in the datepicker
shankari May 10, 2020
b78ed10
Merge pull request #667 from shankari/minor_unsw_fixes
shankari May 10, 2020
47213e8
Add a special case explanation for samsung phones as well
shankari Jun 29, 2020
e646daf
Merge branch 'master' of https://github.com/e-mission/e-mission-phone…
shankari Jun 29, 2020
08a2a53
Merge branch 'port_ui_fixes' of https://github.com/e-mission/e-missio…
shankari Jun 29, 2020
78503b9
Port the deploy code to the latest version
shankari Jul 1, 2020
6988c1e
Ionic config file format has minor changes
shankari Jul 10, 2020
3252ae6
Update the README to reflect the current status
shankari Jul 10, 2020
dd2469b
Minor changes to wording to capture change in focus
shankari Jul 10, 2020
5e09ba4
Merge pull request #641 from e-mission/port_ui_fixes
shankari Jul 10, 2020
1781016
Bump up the count to account for cordova-plugin-advanced-http
shankari Jul 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a second onboarding page
- which explains which permissions we need
- why we need them, and
- which prompt to select
shankari committed Apr 18, 2020
commit 7058a0c817f8f92633e2c6b6b85751244d50d600
13 changes: 12 additions & 1 deletion www/i18n/en.json
Original file line number Diff line number Diff line change
@@ -245,17 +245,28 @@
}
},

"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-ios-lt-13": "please select 'Always allow'. This allows us to protect you 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 protect you even when you are not actively using the app"
}
},
"consent":{
"button-accept": "I accept",
"button-decline": "I refuse"
},

"updatecheck":{
"downloading-update": "Downloading UI-only update",
"extracting-update": "Extracting UI-only update",
"done": "Update done, reloading...",
"download-new-ui": "Download new UI-only update?.",
"download-not-now": "Not now",
"download-apply": "Apply"
},
"sensor_explanation":{
"button-accept": "OK",
"button-decline": "Stop"
}
}
25 changes: 22 additions & 3 deletions www/js/intro.js
Original file line number Diff line number Diff line change
@@ -18,12 +18,31 @@ angular.module('emission.intro', ['emission.splash.startprefs',
});
})

.controller('IntroCtrl', function($scope, $state, $ionicSlideBoxDelegate,
.controller('IntroCtrl', function($scope, $state, $window, $ionicSlideBoxDelegate,
$ionicPopup, $ionicHistory, ionicToast, $timeout, CommHelper, StartPrefs, $translate, $cordovaFile) {

$scope.platform = $window.device.platform;
$scope.osver = $window.device.version.split(".")[0];
if($scope.platform.toLowerCase() == "android") {
if($scope.osver < 6) {
$scope.locationPermExplanation = $translate.instant('intro.permissions.locationPermExplanation-android-lt-6');
} else {
$scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-android-gte-6");
}
}

if($scope.platform.toLowerCase() == "ios") {
if($scope.osver < 13) {
$scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-lt-13");
} else {
$scope.locationPermExplanation = $translate.instant("intro.permissions.locationPermExplanation-ios-gte-13");
}
}
console.log("Explanation = "+$scope.locationPermExplanation);

$scope.getConsentFile = function () {
var lang = $translate.use();
$scope.consentFile = "templates/intro/consent.html";
$scope.consentFile = "templates/intro/sensor_explanation.html";
if (lang != 'en') {
var url = "www/i18n/intro/consent-" + lang + ".html";
$cordovaFile.checkFile(cordova.file.applicationDirectory, url).then( function(result){
@@ -33,7 +52,7 @@ angular.module('emission.intro', ['emission.splash.startprefs',
}, function (err) {
window.Logger.log(window.Logger.LEVEL_DEBUG,
"Consent file not found, loading english version, error is " + JSON.stringify(err));
$scope.consentFile = "templates/intro/consent.html";
$scope.consentFile = "templates/intro/sensor_explanation.html";
});
}
}