From 981fe1abe941975e1d7f0f049dddf84b977eb843 Mon Sep 17 00:00:00 2001 From: MCleinman <9295855+mcleinman@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:16:13 -0700 Subject: [PATCH] VPN-6469 and VPN-6470: Addon messages for v2.24 (#9740) --- .../enable.js | 4 +-- .../getHelp.js | 0 .../manifest.json | 14 ++++---- .../osCheck.js | 0 .../update.js | 0 .../updateWeb.js | 0 addons/message_whats_new_v2.24/manifest.json | 33 +++++++++++++++++++ addons/message_whats_new_v2.24/setDate.js | 3 ++ 8 files changed, 45 insertions(+), 9 deletions(-) rename addons/{message_update_v2.23 => message_update_v2.24}/enable.js (92%) rename addons/{message_update_v2.23 => message_update_v2.24}/getHelp.js (100%) rename addons/{message_update_v2.23 => message_update_v2.24}/manifest.json (80%) rename addons/{message_update_v2.23 => message_update_v2.24}/osCheck.js (100%) rename addons/{message_update_v2.23 => message_update_v2.24}/update.js (100%) rename addons/{message_update_v2.23 => message_update_v2.24}/updateWeb.js (100%) create mode 100644 addons/message_whats_new_v2.24/manifest.json create mode 100644 addons/message_whats_new_v2.24/setDate.js diff --git a/addons/message_update_v2.23/enable.js b/addons/message_update_v2.24/enable.js similarity index 92% rename from addons/message_update_v2.23/enable.js rename to addons/message_update_v2.24/enable.js index 6975de4961..0a2328b488 100644 --- a/addons/message_update_v2.23/enable.js +++ b/addons/message_update_v2.24/enable.js @@ -10,7 +10,7 @@ if (('updateTime' in api.settings)) { // Macos v2.16.0 requires a web-based update. if (api.env.platform === 'macos' && api.env.versionString === '2.16.0') { api.addon.setTitle( - 'message.message_update_v2.23.block.extra_1', + 'message.message_update_v2.24.block.extra_1', 'Download the new Mozilla VPN'); api.addon.composer.remove('c_3'); return; @@ -51,6 +51,6 @@ if (versionCompare([2, 13, 0], version) >= 0 || api.addon.composer.remove('c_3'); api.addon.setTitle( - 'message.message_update_v2.23.block.extra_1', + 'message.message_update_v2.24.block.extra_1', 'Download the new Mozilla VPN'); }) diff --git a/addons/message_update_v2.23/getHelp.js b/addons/message_update_v2.24/getHelp.js similarity index 100% rename from addons/message_update_v2.23/getHelp.js rename to addons/message_update_v2.24/getHelp.js diff --git a/addons/message_update_v2.23/manifest.json b/addons/message_update_v2.24/manifest.json similarity index 80% rename from addons/message_update_v2.23/manifest.json rename to addons/message_update_v2.24/manifest.json index 40b1c03d90..c82f6310b8 100644 --- a/addons/message_update_v2.23/manifest.json +++ b/addons/message_update_v2.24/manifest.json @@ -1,19 +1,19 @@ { "api_version": "0.1", - "id": "message_update_v2.23", - "name": "Update to Mozilla VPN 2.23", + "id": "message_update_v2.24", + "name": "Update to Mozilla VPN 2.24", "type": "message", "conditions": { - "max_client_version": "2.22.9", + "max_client_version": "2.23.9", "javascript": "osCheck.js" }, "javascript": { "enable": "enable.js" }, "message": { - "date": 1713466835, - "id": "message_update_v2.23", - "title": "Update to Mozilla VPN 2.23", + "date": 1722476590, + "id": "message_update_v2.24", + "title": "Update to Mozilla VPN 2.24", "subtitle": "We’ve released an updated version of Mozilla VPN! Update to the latest version for the best possible Mozilla VPN experience.", "badge": "new_update", "blocks": [ @@ -46,7 +46,7 @@ { "id": "extra_1", "type": "text", - "content": "Download the new Mozilla VPN 2.23" + "content": "Download the new Mozilla VPN 2.24" } ] } diff --git a/addons/message_update_v2.23/osCheck.js b/addons/message_update_v2.24/osCheck.js similarity index 100% rename from addons/message_update_v2.23/osCheck.js rename to addons/message_update_v2.24/osCheck.js diff --git a/addons/message_update_v2.23/update.js b/addons/message_update_v2.24/update.js similarity index 100% rename from addons/message_update_v2.23/update.js rename to addons/message_update_v2.24/update.js diff --git a/addons/message_update_v2.23/updateWeb.js b/addons/message_update_v2.24/updateWeb.js similarity index 100% rename from addons/message_update_v2.23/updateWeb.js rename to addons/message_update_v2.24/updateWeb.js diff --git a/addons/message_whats_new_v2.24/manifest.json b/addons/message_whats_new_v2.24/manifest.json new file mode 100644 index 0000000000..27763ff0bf --- /dev/null +++ b/addons/message_whats_new_v2.24/manifest.json @@ -0,0 +1,33 @@ +{ + "api_version": "0.1", + "id": "message_whats_new_v2.24", + "name": "What's new message", + "type": "message", + "conditions": { + "min_client_version": "2.24.0", + "max_client_version": "2.24.9" + }, + "javascript": { + "enable": "setDate.js" + }, + "message": { + "date": 1722476590, + "id": "message_whats_new_v2.24", + "title": "You’ve updated to Mozilla VPN 2.24", + "subtitle": "You’re using the latest version of Mozilla VPN.", + "badge": "whats_new", + "notify": false, + "blocks": [ + { + "id": "c_1-3", + "type": "text", + "content": "We’ve made bug fixes, UI adjustments and other performance improvements to make your experience using VPN even better." + }, + { + "id": "c_3", + "type": "text", + "content": "Thank you for installing the latest version!" + } + ] + } +} diff --git a/addons/message_whats_new_v2.24/setDate.js b/addons/message_whats_new_v2.24/setDate.js new file mode 100644 index 0000000000..61416f2412 --- /dev/null +++ b/addons/message_whats_new_v2.24/setDate.js @@ -0,0 +1,3 @@ +(function(api) { +api.addon.date = (api.settings.updateTime.getTime() / 1000); +})