Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b18b985 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'cherry-pick-51322bfb' into 'v1-oreo'

Set a link to the release note

See merge request !25
parents 82c7fb9a e463955f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,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>
+2 −6
Original line number Diff line number Diff line
@@ -168,14 +168,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) {