diff --git a/res/values/strings.xml b/res/values/strings.xml index 93582c69..82dcd108 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -90,8 +90,6 @@ Android %1$s Last checked: %1$s (%2$s) - ViperOS %1$s - ViperOS %1$s - %2$s %1$s of %2$s%3$s %1$s of %2$s (%3$s) • %4$s Verifying update diff --git a/src/org/lineageos/updater/UpdaterReceiver.java b/src/org/lineageos/updater/UpdaterReceiver.java index 42b60c64..b5935200 100644 --- a/src/org/lineageos/updater/UpdaterReceiver.java +++ b/src/org/lineageos/updater/UpdaterReceiver.java @@ -57,10 +57,7 @@ private static boolean shouldShowUpdateFailedNotification(Context context) { private static void showUpdateFailedNotification(Context context) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); - String buildDate = StringGenerator.getDateLocalizedUTC(context, - DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0)); - String buildInfo = context.getString(R.string.list_build_version_date, - BuildInfoUtils.getBuildVersion(), buildDate); + String buildInfo = preferences.getString(Constants.PREF_INSTALL_NEW_FILE_NAME, context.getString(R.string.app_name)); Intent notificationIntent = new Intent(context, UpdatesActivity.class); PendingIntent intent = PendingIntent.getActivity(context, 0, notificationIntent, diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java index af88a14c..d9eb8d27 100644 --- a/src/org/lineageos/updater/UpdatesListAdapter.java +++ b/src/org/lineageos/updater/UpdatesListAdapter.java @@ -248,8 +248,7 @@ public void onBindViewHolder(final ViewHolder viewHolder, int i) { String buildDate = StringGenerator.getDateLocalizedUTC(mActivity, DateFormat.LONG, update.getTimestamp()); - String buildVersion = mActivity.getString(R.string.list_build_version, - update.getVersion()); + String buildVersion = update.getName(); viewHolder.mBuildDate.setText(buildDate); viewHolder.mBuildVersion.setText(buildVersion); viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null); @@ -453,13 +452,9 @@ private AlertDialog.Builder getInstallDialog(final String downloadId) { return null; } - String buildDate = StringGenerator.getDateLocalizedUTC(mActivity, - DateFormat.MEDIUM, update.getTimestamp()); - String buildInfoText = mActivity.getString(R.string.list_build_version_date, - BuildInfoUtils.getBuildVersion(), buildDate); return new AlertDialog.Builder(mActivity) .setTitle(R.string.apply_update_dialog_title) - .setMessage(mActivity.getString(resId, buildInfoText, + .setMessage(mActivity.getString(resId, update.getName(), mActivity.getString(android.R.string.ok))) .setPositiveButton(android.R.string.ok, (dialog, which) -> Utils.triggerUpdate(mActivity, downloadId)) diff --git a/src/org/lineageos/updater/controller/UpdateInstaller.java b/src/org/lineageos/updater/controller/UpdateInstaller.java index a4eff382..693f8f15 100644 --- a/src/org/lineageos/updater/controller/UpdateInstaller.java +++ b/src/org/lineageos/updater/controller/UpdateInstaller.java @@ -81,6 +81,7 @@ void install(String downloadId) { preferences.edit() .putLong(Constants.PREF_INSTALL_OLD_TIMESTAMP, buildTimestamp) .putLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, update.getTimestamp()) + .putString(Constants.PREF_INSTALL_NEW_FILE_NAME, update.getName()) .putString(Constants.PREF_INSTALL_PACKAGE_PATH, update.getFile().getAbsolutePath()) .putBoolean(Constants.PREF_INSTALL_AGAIN, isReinstalling) .putBoolean(Constants.PREF_INSTALL_NOTIFIED, false) diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java index 3cb4ada5..c817bd89 100644 --- a/src/org/lineageos/updater/controller/UpdaterService.java +++ b/src/org/lineageos/updater/controller/UpdaterService.java @@ -433,12 +433,8 @@ private void handleInstallProgress(UpdateInfo update) { } private void setNotificationTitle(UpdateInfo update) { - String buildDate = StringGenerator.getDateLocalizedUTC(this, - DateFormat.MEDIUM, update.getTimestamp()); - String buildInfo = getString(R.string.list_build_version_date, - BuildInfoUtils.getBuildVersion(), buildDate); - mNotificationStyle.setBigContentTitle(buildInfo); - mNotificationBuilder.setContentTitle(buildInfo); + mNotificationStyle.setBigContentTitle(update.getName()); + mNotificationBuilder.setContentTitle(update.getName()); } private PendingIntent getResumePendingIntent(String downloadId) { diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java index c39418d1..9b378b6f 100644 --- a/src/org/lineageos/updater/misc/Constants.java +++ b/src/org/lineageos/updater/misc/Constants.java @@ -48,6 +48,7 @@ private Constants() { public static final String PREF_INSTALL_OLD_TIMESTAMP = "install_old_timestamp"; public static final String PREF_INSTALL_NEW_TIMESTAMP = "install_new_timestamp"; + public static final String PREF_INSTALL_NEW_FILE_NAME = "install_new_file_name"; public static final String PREF_INSTALL_PACKAGE_PATH = "install_package_path"; public static final String PREF_INSTALL_AGAIN = "install_again"; public static final String PREF_INSTALL_NOTIFIED = "install_notified";