From a6ece12553680d6539feda969900dcf5b39313bf Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Fri, 5 Jun 2020 08:56:33 +0000
Subject: [PATCH 1/4] Point the changelog url to the Release note

---
 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..97cbc157 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">hhttps://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 eb2230c2..25b850ba 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -172,14 +172,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 10c18a5440f27ca136682b8d8c43db61a4f0081e Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Fri, 5 Jun 2020 11:20:49 +0000
Subject: [PATCH 2/4] Fix the string

---
 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 97cbc157..b6648152 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">hhttps://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">hhttps://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%0$s</xliff:g>-pie</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
     <string name="snack_updates_found">New updates found</string>
-- 
GitLab


From 3e0974ad224c6c9d0adac0d84c2be1f7501a3c7a Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Fri, 5 Jun 2020 21:02:58 +0000
Subject: [PATCH 3/4] Fix 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 b6648152..78538848 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">hhttps://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%0$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">%0$s</xliff:g>-pie</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
     <string name="snack_updates_found">New updates found</string>
-- 
GitLab


From 7b4de448b4a0b75979dfd0581bdad34caf097964 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Fri, 5 Jun 2020 21:06:50 +0000
Subject: [PATCH 4/4] Set the correct number

---
 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 78538848..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://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%0$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>-pie</string>
     <string name="menu_ab_perf_mode">Prioritize update process</string>
 
     <string name="snack_updates_found">New updates found</string>
-- 
GitLab