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

Commit d6103165 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Updater: Adapt displayVersion to show proper versioning

parent a3d8d180

src/org/lineageos/updater/UpdatesListAdapter.java

+1 −5
Original line number Diff line number Diff line
@@ -278,10 +278,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
        String buildVersion = mActivity.getString(R.string.list_build_version,

                update.getDisplayVersion());



        if (buildVersion.equals("")) {

            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion());

        }



        viewHolder.mBuildDate.setText(buildDate);

        viewHolder.mBuildVersion.setText(buildVersion);

        viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -487,7 +483,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,

                DateFormat.MEDIUM, update.getTimestamp());

        String buildInfoText = mActivity.getString(R.string.list_build_version_date,

                update.getVersion(), buildDate);

                update.getDisplayVersion(), buildDate);

        return new AlertDialog.Builder(mActivity)

                .setTitle(R.string.apply_update_dialog_title)

                .setMessage(mActivity.getString(resId, buildInfoText,

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

+5 −1
Original line number Diff line number Diff line
@@ -98,7 +98,11 @@ public class Utils { 
        update.setFileSize(object.getLong("size"));

        update.setDownloadUrl(object.getString("url"));

        update.setVersion(object.getString("version"));

        update.setDisplayVersion(object.getString("display_version"));

        if(object.has("pre_version") && !object.getString("pre_version").isEmpty()){

          update.setDisplayVersion(object.getString("version") + "-" + object.getString("pre_version"));

        } else {

          update.setDisplayVersion(object.getString("version"));

        }

        return update;

    }