From fd9d9424af8c319b144d05307cca3c14116aa5c5 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Fri, 5 Jun 2020 23:16:00 +0000
Subject: [PATCH 1/2] Merge branch '21-set-a-link-to-the-release-note' into
 'v1-pie'

Resolve "Set a link to the release note"

Closes #21

See merge request e/os/android_packages_apps_Updater!24

(cherry picked from commit 51322bfbcaf49752c00cdea6208ffd6a96c9ddb9)

a6ece125 Point the changelog url to the Release note
10c18a54 Fix the string
3e0974ad Fix URL
7b4de448 Set the correct number
---
 res/values/strings.xml                    | 2 +-
 src/org/lineageos/updater/misc/Utils.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b25e487..6bcba24d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -75,7 +75,7 @@
     <string name="menu_copy_url">Copy URL</string>
     <string name="menu_export_update">Export update</string>
     <string name="menu_show_changelog">Show changelog</string>
-    <string name="menu_changelog_url" translatable="false">https://images.ecloud.global/<xliff:g id="release_type">%3$s</xliff:g>/<xliff:g id="device_name">%1$s</xliff:g>/e-<xliff:g id="version">%2$s</xliff:g>.zip.changelog</string>
+    <string name="menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-pie</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
     <string name="snack_updates_found">New updates found</string>
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index b1afaa34..7dfdb81b 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -201,14 +201,10 @@ public class Utils {
     }
 
     public static String getChangelogURL(Context context) {
-        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
-                SystemProperties.get(Constants.PROP_DEVICE));
-
-        String version = SystemProperties.get(Constants.PROP_VERSION);
 
-        String releaseType = SystemProperties.get(Constants.PROP_RELEASE_TYPE);
+        String buildVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION);
 
-        return context.getString(R.string.menu_changelog_url, device, version, releaseType);
+        return context.getString(R.string.menu_changelog_url, buildVersion);
     }
 
     public static void triggerUpdate(Context context, String downloadId) {
-- 
GitLab


From a90e9c9e4b69a23515c431f06b1c1eece7155a86 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Mon, 14 Dec 2020 15:11:18 +0000
Subject: [PATCH 2/2] Fix the changelog url

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6bcba24d..f94f8be6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -75,7 +75,7 @@
     <string name="menu_copy_url">Copy URL</string>
     <string name="menu_export_update">Export update</string>
     <string name="menu_show_changelog">Show changelog</string>
-    <string name="menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-pie</string>
+    <string name="menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-q</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
     <string name="snack_updates_found">New updates found</string>
-- 
GitLab