PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use the filename as notification title

Browse Source 
Be consistent with the rest of the app and use "version - date".
This commit is contained in:
Gabriele M
2017-07-17 12:25:49 +02:00
parent c1f0aab382
commit d0f9c4be22
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/lineageos/updater/controller/UpdaterService.java
View File

@@ -36,9 +36,12 @@ import org.lineageos.updater.UpdateDownload;
import org.lineageos.updater.UpdateStatus; import org.lineageos.updater.UpdateStatus;
import org.lineageos.updater.UpdaterReceiver; import org.lineageos.updater.UpdaterReceiver;
import org.lineageos.updater.UpdatesActivity; import org.lineageos.updater.UpdatesActivity;
import org.lineageos.updater.misc.BuildInfoUtils;
import org.lineageos.updater.misc.StringGenerator;
import org.lineageos.updater.misc.Utils; import org.lineageos.updater.misc.Utils;
import java.io.IOException; import java.io.IOException;
import java.text.DateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
@@ -90,8 +93,7 @@ public class UpdaterService extends Service {
String downloadId = intent.getStringExtra(UpdaterController.EXTRA_DOWNLOAD_ID); String downloadId = intent.getStringExtra(UpdaterController.EXTRA_DOWNLOAD_ID);
if (UpdaterController.ACTION_UPDATE_STATUS.equals(intent.getAction())) { if (UpdaterController.ACTION_UPDATE_STATUS.equals(intent.getAction())) {
UpdateDownload update = mUpdaterController.getUpdate(downloadId); UpdateDownload update = mUpdaterController.getUpdate(downloadId);
mNotificationBuilder.setContentTitle(update.getName()); setNotificationTitle(update);
mNotificationBuilder.setContentTitle(update.getName());
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putString(UpdaterController.EXTRA_DOWNLOAD_ID, downloadId); extras.putString(UpdaterController.EXTRA_DOWNLOAD_ID, downloadId);
mNotificationBuilder.setExtras(extras); mNotificationBuilder.setExtras(extras);
@@ -101,7 +103,7 @@ public class UpdaterService extends Service {
handleDownloadProgressChange(update); handleDownloadProgressChange(update);
} else if (UpdaterController.ACTION_INSTALL_PROGRESS.equals(intent.getAction())) { } else if (UpdaterController.ACTION_INSTALL_PROGRESS.equals(intent.getAction())) {
UpdateDownload update = mUpdaterController.getUpdate(downloadId); UpdateDownload update = mUpdaterController.getUpdate(downloadId);
mNotificationBuilder.setContentTitle(update.getName()); setNotificationTitle(update);
handleInstallProgress(update); handleInstallProgress(update);
} else if (UpdaterController.ACTION_UPDATE_REMOVED.equals(intent.getAction())) { } else if (UpdaterController.ACTION_UPDATE_REMOVED.equals(intent.getAction())) {
Bundle extras = mNotificationBuilder.getExtras(); Bundle extras = mNotificationBuilder.getExtras();
@@ -333,8 +335,7 @@ public class UpdaterService extends Service {
String percent = NumberFormat.getPercentInstance().format(progress / 100.f); String percent = NumberFormat.getPercentInstance().format(progress / 100.f);
mNotificationStyle.setSummaryText(percent); mNotificationStyle.setSummaryText(percent);
mNotificationStyle.setBigContentTitle(update.getName()); setNotificationTitle(update);
mNotificationBuilder.setContentTitle(update.getName());
String speed = Formatter.formatFileSize(this, update.getSpeed()); String speed = Formatter.formatFileSize(this, update.getSpeed());
CharSequence eta = DateUtils.formatDuration(update.getEta() * 1000); CharSequence eta = DateUtils.formatDuration(update.getEta() * 1000);
@@ -348,8 +349,7 @@ public class UpdaterService extends Service {
int progress = update.getInstallProgress(); int progress = update.getInstallProgress();
mNotificationBuilder.setProgress(100, progress, false); mNotificationBuilder.setProgress(100, progress, false);
mNotificationStyle.setBigContentTitle(update.getName()); setNotificationTitle(update);
mNotificationBuilder.setContentTitle(update.getName());
if (progress == 0) { if (progress == 0) {
mNotificationStyle.bigText(getString(R.string.finalizing_package)); mNotificationStyle.bigText(getString(R.string.finalizing_package));
@@ -363,6 +363,15 @@ public class UpdaterService extends Service {
mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build()); mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
} }
private void setNotificationTitle(UpdateDownload update) {
String buildDate = StringGenerator.getDateLocalized(this,
DateFormat.MEDIUM, update.getTimestamp());
String buildInfo = getString(R.string.list_build_version_date,
BuildInfoUtils.getBuildVersion(), buildDate);
mNotificationStyle.setBigContentTitle(buildInfo);
mNotificationBuilder.setContentTitle(buildInfo);
}
private PendingIntent getResumePendingIntent(String downloadId) { private PendingIntent getResumePendingIntent(String downloadId) {
final Intent intent = new Intent(this, UpdaterService.class); final Intent intent = new Intent(this, UpdaterService.class);
intent.setAction(ACTION_DOWNLOAD_CONTROL); intent.setAction(ACTION_DOWNLOAD_CONTROL);