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

Commit e0ac08d2 authored by Romain Hunault's avatar Romain Hunault Committed by Mohammed Althaf T
Browse files

Updater: Get /e/ release notes 

Change-Id: I8345c9f2fc03df2339e157791aea5b8ed787b81f

Updater: res: Redirect to proper changelog URL

Change-Id: Ia16ba958968d84bb0b0e10e97e4085507d886905
parent dc966b48

app/src/main/java/org/lineageos/updater/misc/Constants.java

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public final class Constants { 
    public static final String PROP_RELEASE_TYPE = "ro.lineage.releasetype";

    public static final String PROP_UPDATER_ALLOW_DOWNGRADING = "lineage.updater.allow_downgrading";

    public static final String PROP_UPDATER_URI = "lineage.updater.uri";

    public static final String PROP_VERSION = "ro.lineage.version";



    public static final String PREF_INSTALL_OLD_TIMESTAMP = "install_old_timestamp";

    public static final String PREF_INSTALL_NEW_TIMESTAMP = "install_new_timestamp";

app/src/main/java/org/lineageos/updater/misc/Utils.java

+2 −3
Original line number Diff line number Diff line
@@ -174,9 +174,8 @@ public class Utils { 
    }



    public static String getChangelogURL(Context context) {

        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,

                SystemProperties.get(Constants.PROP_DEVICE));

        return context.getString(R.string.menu_changelog_url, device);

        String buildVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION);

        return context.getString(R.string.menu_changelog_url, buildVersion);

    }



    public static void triggerUpdate(Context context, String downloadId) {

app/src/main/res/menu/menu_toolbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
        app:showAsAction="never" />

    <item

        android:id="@+id/menu_show_changelog"

        android:title="@string/menu_show_changelog"

        android:title="@string/menu_show_changelog_e"

        app:showAsAction="never" />

</menu>

app/src/main/res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -84,7 +84,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://download.lineageos.org/<xliff:g id="device_name">%1$s</xliff:g>/changes</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>-s</string>

    <string name="menu_ab_perf_mode">Prioritize update process</string>

    <string name="menu_update_recovery">Update recovery</string>

    <string name="toast_forced_update_recovery">It is impossible to disable Lineage Recovery updates on this device.</string>
@@ -179,4 +179,7 @@ 
    <!-- /e/ build version -->

    <string name="list_build_version_e">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g></string>

    <string name="list_build_version_date_e">/e/OS <xliff:g id="version" example="14.1">%1$s</xliff:g> - <xliff:g id="date" example="July 11, 2017">%2$s</xliff:g></string>



    <!-- /e/ changelog -->

    <string name="menu_show_changelog_e">Show release notes</string>

</resources>