From 6d603ada0d773ece8f0128367a82a7db6e3a6816 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Sun, 17 Apr 2016 09:08:32 +1000
Subject: [PATCH] Show progress bar in download notification.

By providing the same notification id, the existing one is updated.
---
 .../fdroid/fdroid/net/DownloaderService.java  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
index 25d6aaed8..3d4bd7679 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
@@ -17,6 +17,8 @@
 
 package org.fdroid.fdroid.net;
 
+import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -135,7 +137,7 @@ public class DownloaderService extends Service {
             }
         } else if (ACTION_QUEUE.equals(intent.getAction())) {
             if (Preferences.get().isUpdateNotificationEnabled()) {
-                createNotification(intent.getDataString());
+                startForeground(NOTIFY_DOWNLOADING, createNotification(intent.getDataString()).build());
             }
             Log.i(TAG, "Queued " + intent);
             Message msg = serviceHandler.obtainMessage();
@@ -150,14 +152,13 @@ public class DownloaderService extends Service {
         }
     }
 
-    private void createNotification(String urlString) {
-        NotificationCompat.Builder builder =
-                new NotificationCompat.Builder(this)
-                        .setAutoCancel(true)
-                        .setContentTitle(getString(R.string.downloading))
-                        .setSmallIcon(android.R.drawable.stat_sys_download)
-                        .setContentText(urlString);
-        startForeground(NOTIFY_DOWNLOADING, builder.build());
+    private NotificationCompat.Builder createNotification(String urlString) {
+        return new NotificationCompat.Builder(this)
+                .setAutoCancel(true)
+                .setContentTitle(getString(R.string.downloading))
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setContentText(urlString)
+                .setProgress(100, 0, true);
     }
 
     @Override
@@ -214,6 +215,12 @@ public class DownloaderService extends Service {
                     intent.putExtra(Downloader.EXTRA_BYTES_READ, bytesRead);
                     intent.putExtra(Downloader.EXTRA_TOTAL_BYTES, totalBytes);
                     localBroadcastManager.sendBroadcast(intent);
+
+                    NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+                    Notification notification = createNotification(uri.toString())
+                            .setProgress(totalBytes, bytesRead, false)
+                            .build();
+                    nm.notify(NOTIFY_DOWNLOADING, notification);
                 }
             });
             downloader.download();