Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lets-make-a-stable-release' into 'master'

Browse Source 
notification update improvements

Ok, I made a mistake in c35d327fa4c503425c629d49778c001b08ecb833 / !301 that messed up installing.  Turns out it was a simple fix: 0838a15792fd70afde4e3743296ce88c961a299e  This also removes the _Cancel_ button from the one active download notification to provide a working, albeit verbose, notification UX for 0.100.

After this commit, these commits and the ones from !301 should be included in `stable-0.100` and a new alpha tagged :)

See merge request !306
This commit is contained in:
Peter Serwylo 2016-05-23 14:33:24 +00:00
commit 215a493fa6
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
View File

@ -154,7 +154,8 @@ public class InstallManagerService extends Service {
return START_NOT_STICKY; return START_NOT_STICKY;
} }
if (!DownloaderService.isQueuedOrActive(urlString)) { if ((flags & START_FLAG_REDELIVERY) == START_FLAG_REDELIVERY
&& !DownloaderService.isQueuedOrActive(urlString)) {
Utils.debugLog(TAG, urlString + " finished downloading while InstallManagerService was killed."); Utils.debugLog(TAG, urlString + " finished downloading while InstallManagerService was killed.");
cancelNotification(urlString); cancelNotification(urlString);
return START_NOT_STICKY; return START_NOT_STICKY;
@ -164,10 +165,10 @@ public class InstallManagerService extends Service {
Apk apk = new Apk(intent.getParcelableExtra(EXTRA_APK)); Apk apk = new Apk(intent.getParcelableExtra(EXTRA_APK));
addToActive(urlString, app, apk); addToActive(urlString, app, apk);
Notification notification = createNotification(intent.getDataString(), apk).build(); NotificationCompat.Builder builder = createNotificationBuilder(intent.getDataString(), apk);
notificationManager.notify(urlString.hashCode(), notification); notificationManager.notify(urlString.hashCode(), builder.build());
registerDownloaderReceivers(urlString); registerDownloaderReceivers(urlString, builder);
File apkFilePath = Utils.getApkDownloadPath(this, intent.getData()); File apkFilePath = Utils.getApkDownloadPath(this, intent.getData());
long apkFileSize = apkFilePath.length(); long apkFileSize = apkFilePath.length();
@ -214,7 +215,7 @@ public class InstallManagerService extends Service {
} }
} }
private void registerDownloaderReceivers(String urlString) { private void registerDownloaderReceivers(String urlString, final NotificationCompat.Builder builder) {
BroadcastReceiver startedReceiver = new BroadcastReceiver() { BroadcastReceiver startedReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -224,13 +225,10 @@ public class InstallManagerService extends Service {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String urlString = intent.getDataString(); String urlString = intent.getDataString();
Apk apk = ACTIVE_APKS.get(urlString);
int bytesRead = intent.getIntExtra(Downloader.EXTRA_BYTES_READ, 0); int bytesRead = intent.getIntExtra(Downloader.EXTRA_BYTES_READ, 0);
int totalBytes = intent.getIntExtra(Downloader.EXTRA_TOTAL_BYTES, 0); int totalBytes = intent.getIntExtra(Downloader.EXTRA_TOTAL_BYTES, 0);
Notification notification = createNotification(urlString, apk) builder.setProgress(totalBytes, bytesRead, false);
.setProgress(totalBytes, bytesRead, false) notificationManager.notify(urlString.hashCode(), builder.build());
.build();
notificationManager.notify(urlString.hashCode(), notification);
} }
}; };
BroadcastReceiver completeReceiver = new BroadcastReceiver() { BroadcastReceiver completeReceiver = new BroadcastReceiver() {
@ -242,7 +240,7 @@ public class InstallManagerService extends Service {
if (AppDetails.isAppVisible(apk.packageName)) { if (AppDetails.isAppVisible(apk.packageName)) {
cancelNotification(urlString); cancelNotification(urlString);
} else { } else {
notifyDownloadComplete(apk, urlString); notifyDownloadComplete(urlString, builder, apk);
} }
unregisterDownloaderReceivers(urlString); unregisterDownloaderReceivers(urlString);
} }
@ -269,7 +267,7 @@ public class InstallManagerService extends Service {
}); });
} }
private NotificationCompat.Builder createNotification(String urlString, Apk apk) { private NotificationCompat.Builder createNotificationBuilder(String urlString, Apk apk) {
int downloadUrlId = urlString.hashCode(); int downloadUrlId = urlString.hashCode();
return new NotificationCompat.Builder(this) return new NotificationCompat.Builder(this)
.setAutoCancel(false) .setAutoCancel(false)
@ -316,7 +314,7 @@ public class InstallManagerService extends Service {
* Post a notification about a completed download. {@code packageName} must be a valid * Post a notification about a completed download. {@code packageName} must be a valid
* and currently in the app index database. * and currently in the app index database.
*/ */
private void notifyDownloadComplete(Apk apk, String urlString) { private void notifyDownloadComplete(String urlString, NotificationCompat.Builder builder, Apk apk) {
String title; String title;
try { try {
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
@ -327,15 +325,12 @@ public class InstallManagerService extends Service {
} }
int downloadUrlId = urlString.hashCode(); int downloadUrlId = urlString.hashCode();
NotificationCompat.Builder builder = builder.setAutoCancel(true)
new NotificationCompat.Builder(this) .setOngoing(false)
.setAutoCancel(true)
.setContentTitle(title) .setContentTitle(title)
.setSmallIcon(android.R.drawable.stat_sys_download_done) .setSmallIcon(android.R.drawable.stat_sys_download_done)
.setContentIntent(getAppDetailsIntent(downloadUrlId, apk))
.setContentText(getString(R.string.tap_to_install)); .setContentText(getString(R.string.tap_to_install));
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); notificationManager.notify(downloadUrlId, builder.build());
nm.notify(downloadUrlId, builder.build());
} }
/** /**