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

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

Merge branch '1218-nougat-build_version' into 'v1-nougat' 

[nougat] updater: Show update's version wherever applicable

See merge request !51
parents 92e40162 1143f9ad

src/org/lineageos/updater/UpdatesListAdapter.java

+2 −7
Original line number Diff line number Diff line
@@ -250,12 +250,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.getDisplayVersion());



        if (buildVersion.equals("")) {

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

                update.getVersion());

        }

        

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

          viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
@@ -455,7 +450,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,

                               BuildInfoUtils.getBuildVersion(), buildDate);

                               update.getVersion(), buildDate);



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

              title = R.string.apply_update_dialog_title;

src/org/lineageos/updater/controller/UpdaterService.java

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class UpdaterService extends Service { 
        String buildDate = StringGenerator.getDateLocalizedUTC(this,

                DateFormat.MEDIUM, update.getTimestamp());

        String buildInfo = getString(R.string.list_build_version_date,

                BuildInfoUtils.getBuildVersion(), buildDate);

                update.getVersion(), buildDate);

        mNotificationStyle.setBigContentTitle(buildInfo);

        mNotificationBuilder.setContentTitle(buildInfo);

    }