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

Commit 1245486b authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

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

[r] Updater: Adapt displayVersion to show proper versioning

See merge request !68
parents 8da47409 d6103165

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        android:requestLegacyExternalStorage="true"

        android:supportsRtl="true"

        android:theme="@style/AppTheme"

        android:usesCleartextTraffic="true">

        android:usesCleartextTraffic="false">



        <activity

            android:name=".UpdatesActivity"

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() + (!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""));

        }



        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()+(!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""), 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 −6
Original line number Diff line number Diff line
@@ -98,12 +98,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"));

        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 mDisplayVersion;

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

        mType = update.getType();

        mVersion = update.getVersion();

        mPreversion = update.getPreversion();

        mDisplayVersion = update.getDisplayVersion();

        mFileSize = update.getFileSize();

    }
@@ -87,15 +85,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 getDownloadUrl();