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

Don't use one shot PendingIntents for the notification actions

Browse Source 
FLAG_ONE_SHOT doesn't make so much sense here, the intents are generic
and can be repeated.

Change-Id: Ib457d975387dfd838372639e2aaa40a3df6f4d15
This commit is contained in:
Gabriele M
2018-07-14 18:17:10 +02:00
parent 4ec02fd780
commit 5648b3cd27
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/lineageos/updater/ExportUpdateService.java
View File

@@ -210,7 +210,6 @@ public class ExportUpdateService extends Service {
private PendingIntent getStopPendingIntent() { private PendingIntent getStopPendingIntent() {
final Intent intent = new Intent(this, ExportUpdateService.class); final Intent intent = new Intent(this, ExportUpdateService.class);
intent.setAction(ACTION_STOP_EXPORTING); intent.setAction(ACTION_STOP_EXPORTING);
return PendingIntent.getService(this, 0, intent, return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
} }
} }

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

@@ -446,8 +446,7 @@ public class UpdaterService extends Service {
intent.setAction(ACTION_DOWNLOAD_CONTROL); intent.setAction(ACTION_DOWNLOAD_CONTROL);
intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId); intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_RESUME); intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_RESUME);
return PendingIntent.getService(this, 0, intent, return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
} }
private PendingIntent getPausePendingIntent(String downloadId) { private PendingIntent getPausePendingIntent(String downloadId) {
@@ -455,15 +454,13 @@ public class UpdaterService extends Service {
intent.setAction(ACTION_DOWNLOAD_CONTROL); intent.setAction(ACTION_DOWNLOAD_CONTROL);
intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId); intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);
intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_PAUSE); intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_PAUSE);
return PendingIntent.getService(this, 0, intent, return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
} }
private PendingIntent getRebootPendingIntent() { private PendingIntent getRebootPendingIntent() {
final Intent intent = new Intent(this, UpdaterReceiver.class); final Intent intent = new Intent(this, UpdaterReceiver.class);
intent.setAction(UpdaterReceiver.ACTION_INSTALL_REBOOT); intent.setAction(UpdaterReceiver.ACTION_INSTALL_REBOOT);
return PendingIntent.getBroadcast(this, 0, intent, return PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
} }
} }