From 9b989d8dd14eba632901def31a2475bb8e64807d Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 25 Aug 2020 11:09:24 +0200
Subject: [PATCH] Work on #436 - cordova: add debug messages to updates lookup
move icon files into right folder
fix language code detection for more than 2 letters codes
---
src/app/services/internationalisation.service.ts | 3 ++-
src/{ => assets/icons}/android-chrome-192x192.png | Bin
src/{ => assets/icons}/android-chrome-512x512.png | Bin
src/{ => assets/icons}/apple-touch-icon.png | Bin
src/{ => assets/icons}/favicon-16x16.png | Bin
src/{ => assets/icons}/favicon-32x32.png | Bin
src/index.html | 13 ++++++++-----
7 files changed, 10 insertions(+), 6 deletions(-)
rename src/{ => assets/icons}/android-chrome-192x192.png (100%)
rename src/{ => assets/icons}/android-chrome-512x512.png (100%)
rename src/{ => assets/icons}/apple-touch-icon.png (100%)
rename src/{ => assets/icons}/favicon-16x16.png (100%)
rename src/{ => assets/icons}/favicon-32x32.png (100%)
diff --git a/src/app/services/internationalisation.service.ts b/src/app/services/internationalisation.service.ts
index d8ddcb808..14df03969 100644
--- a/src/app/services/internationalisation.service.ts
+++ b/src/app/services/internationalisation.service.ts
@@ -55,11 +55,12 @@ export class I18nService extends Observable implements Observer {
/**
* Defines the current language code from its ISO 639-1 code (2 characters) or locale code
* (ex: "fr", "en", "fr_FR", "en-US")
- * @see this.languageCodeFromLocaleCode()
*
* @param code ISO 639-1 language code
*/
public setLanguage(code: string) {
+ // ensure 2-letter language code
+ code = code.substring(0, 2);
// is language supported ?
if (! Object.keys(this._availableLanguages).includes(code)) {
throw new Error(`LANGUAGE_UNSUPPORTED "${code}"`);
diff --git a/src/android-chrome-192x192.png b/src/assets/icons/android-chrome-192x192.png
similarity index 100%
rename from src/android-chrome-192x192.png
rename to src/assets/icons/android-chrome-192x192.png
diff --git a/src/android-chrome-512x512.png b/src/assets/icons/android-chrome-512x512.png
similarity index 100%
rename from src/android-chrome-512x512.png
rename to src/assets/icons/android-chrome-512x512.png
diff --git a/src/apple-touch-icon.png b/src/assets/icons/apple-touch-icon.png
similarity index 100%
rename from src/apple-touch-icon.png
rename to src/assets/icons/apple-touch-icon.png
diff --git a/src/favicon-16x16.png b/src/assets/icons/favicon-16x16.png
similarity index 100%
rename from src/favicon-16x16.png
rename to src/assets/icons/favicon-16x16.png
diff --git a/src/favicon-32x32.png b/src/assets/icons/favicon-32x32.png
similarity index 100%
rename from src/favicon-32x32.png
rename to src/assets/icons/favicon-32x32.png
diff --git a/src/index.html b/src/index.html
index 55f7c5833..24fc414e2 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,11 +6,11 @@
<meta charset="utf-8">
<title>Cassiopée</title>
- <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
- <link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png">
- <link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png">
- <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
- <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/icons/apple-touch-icon.png">
+ <link rel="icon" type="image/png" sizes="512x512" href="assets/icons/android-chrome-512x512.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="assets/icons/android-chrome-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="assets/icons/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="assets/icons/favicon-16x16.png">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#ffffff">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -231,6 +231,7 @@
* at the root of the directory (ex: "fr.irstea.cassiopee_4.5.0_amd64.deb")
*/
const lookForUpdates = function() {
+ console.log("looking for updates");
// Web update resources root directory
const URL = "https://cassiopee.g-eau.fr/cassiopee-releases/";
@@ -238,6 +239,7 @@
let version = "4.4.2"; // debug
cordova.getAppVersion.getVersionNumber((versionNumber) => {
version = versionNumber;
+ console.log("current version", version);
// fetch releases information
const options = {
method: 'get',
@@ -246,6 +248,7 @@
cordova.plugin.http.sendRequest(URL + "releases.json", options, (response) => {
var data = JSON.parse(response.data); // This is the resultant JSON in useful form
// alert(`Youpi ! ${response.status} version=${version}, latest=${data.latest}, comp=${semverCompare(data.latest, version)}`);
+ console.log("latest version", data !== undefined ? data.latest : "err");
// compare current version to latest version
if (data.latest && semverCompare(data.latest, version) == 1) {
// get download link for latest version, depending on platform
--
GitLab