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

Commit 1e5826eb authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '5056-pie-updater_crash' into 'v1-pie' 

[pie] Updater: Adapt displayVersion to show proper versioning

See merge request !69
parents febf18be c79499d4

src/org/lineageos/updater/UpdatesListAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,

                DateFormat.LONG, update.getTimestamp());

        String buildVersion = mActivity.getString(R.string.list_build_version,

                update.getVersion() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""));

                update.getDisplayVersion());

        

        if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){

          viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
@@ -455,7 +455,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() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""), buildDate);

                               update.getDisplayVersion(), buildDate);



            if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){

              title = R.string.apply_update_dialog_title;

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

+3 −4
Original line number Diff line number Diff line
@@ -96,12 +96,11 @@ public class Utils { 
        update.setFileSize(object.getLong("size"));

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

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

        if (object.has("pre_version")) {

            update.setPreversion(object.getString("pre_version"));

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

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

        } else {

            update.setPreversion("");

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

        }

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

        update.setAndroidVersion(object.getString("android_version"));

        return update;

    }

src/org/lineageos/updater/model/UpdateBase.java

+0 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ public class UpdateBase implements UpdateBaseInfo { 
    private long mTimestamp;

    private String mType;

    private String mVersion;

    private String mPreversion;

    private String mAndroidVersion;

    private String mDisplayVersion;

    private long mFileSize;
@@ -38,7 +37,6 @@ public class UpdateBase implements UpdateBaseInfo { 
        mTimestamp = update.getTimestamp();

        mType = update.getType();

        mVersion = update.getVersion();

        mPreversion = update.getPreversion();

        mDisplayVersion = update.getDisplayVersion();

        mAndroidVersion = update.getAndroidVersion();

        mFileSize = update.getFileSize();
@@ -89,15 +87,6 @@ public class UpdateBase implements UpdateBaseInfo { 
        mVersion = version;

    }



    @Override

    public String getPreversion() {

        return mPreversion;

    }



    public void setPreversion(String preversion) {

        mPreversion = preversion;

    }



    @Override

    public String getDisplayVersion() {

        return mDisplayVersion;

src/org/lineageos/updater/model/UpdateBaseInfo.java

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ public interface UpdateBaseInfo { 


    String getVersion();



    String getPreversion();



    String getDisplayVersion();



    String getAndroidVersion();