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

Commit 6d593b5f authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents f934e4a1 122377db

res/values/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ 




    <string name="blocked_update_dialog_title">Update blocked</string>

    <string name="blocked_update_dialog_title">Update blocked</string>

    <string name="blocked_update_dialog_message">This update cannot be installed using the updater app.  Please read <xliff:g id="info_url">%1$s</xliff:g> for more information.</string>

    <string name="blocked_update_dialog_message">This update cannot be installed using the updater app.  Please read <xliff:g id="info_url">%1$s</xliff:g> for more information.</string>

    <string name="blocked_update_info_url" translatable="false">http://wiki.lineageos.org/upgrading.html</string>

    <string name="blocked_update_info_url" translatable="false">http://wiki.lineageos.org/devices/<xliff:g id="device_name">%1$s</xliff:g>/upgrade</string>





    <string name="export_channel_title">Export completion</string>

    <string name="export_channel_title">Export completion</string>

    <string name="new_updates_channel_title">New updates</string>

    <string name="new_updates_channel_title">New updates</string>

src/org/lineageos/updater/UpdatesListAdapter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -542,7 +542,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
    private void showInfoDialog() {

    private void showInfoDialog() {

        String messageString = String.format(StringGenerator.getCurrentLocale(mActivity),

        String messageString = String.format(StringGenerator.getCurrentLocale(mActivity),

                mActivity.getString(R.string.blocked_update_dialog_message),

                mActivity.getString(R.string.blocked_update_dialog_message),

                mActivity.getString(R.string.blocked_update_info_url));

                Utils.getUpgradeBlockedURL(mActivity));

        SpannableString message = new SpannableString(messageString);

        SpannableString message = new SpannableString(messageString);

        Linkify.addLinks(message, Linkify.WEB_URLS);

        Linkify.addLinks(message, Linkify.WEB_URLS);

        AlertDialog dialog = new AlertDialog.Builder(mActivity)

        AlertDialog dialog = new AlertDialog.Builder(mActivity)

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -161,6 +161,12 @@ public class Utils { 
                .replace("{incr}", incrementalVersion);

                .replace("{incr}", incrementalVersion);

    }

    }





    public static String getUpgradeBlockedURL(Context context) {

        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,

                SystemProperties.get(Constants.PROP_DEVICE));

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

    }



    public static String getChangelogURL(Context context) {

    public static String getChangelogURL(Context context) {

        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,

        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,

                SystemProperties.get(Constants.PROP_DEVICE));

                SystemProperties.get(Constants.PROP_DEVICE));