From 4ba749a628afc225c2804001e58529c7b70cc59d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 31 Oct 2017 15:19:17 +0300
Subject: image cache service: show progressbar in notification

---
 .../java/org/fox/ttrss/util/ImageCacheService.java | 23 ++++++++++++++++------
 org.fox.ttrss/src/main/res/values/strings.xml      |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'org.fox.ttrss/src')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
index acbe7f63..97949c93 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java
@@ -49,7 +49,8 @@ public class ImageCacheService extends IntentService {
 
 	private NotificationManager m_nmgr;
 	private BroadcastReceiver m_receiver;
-	
+	private int m_queueSize = 0;
+
 	public ImageCacheService() {
 		super("ImageCacheService");
 	}
@@ -228,10 +229,21 @@ public class ImageCacheService extends IntentService {
 	/* private void updateNotification(int msgResId) {
 		updateNotification(getString(msgResId));
 	} */
-	
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+
+		m_queueSize++;
+
+		return super.onStartCommand(intent, flags, startId);
+	}
+
 	@Override
 	protected void onHandleIntent(Intent intent) {
 
+		m_queueSize--;
+		m_imagesDownloaded++;
+
 		String url = intent.getStringExtra("url");
 
 		Log.d(TAG, "got request to download URL=" + url + "; canProceed=" + m_canProceed);
@@ -266,10 +278,9 @@ public class ImageCacheService extends IntentService {
 						
 						fos.close();
 						is.close();
-						
-						m_imagesDownloaded++;
-						
-						updateNotification(getString(R.string.notify_downloading_images, m_imagesDownloaded), 0, 0, true);
+
+						updateNotification(getString(R.string.notify_downloading_media), m_imagesDownloaded,
+								m_imagesDownloaded+m_queueSize, true);
 						
 					} catch (IOException e) {
 						e.printStackTrace();
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 7a14ff69..dd6f6fed 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -91,6 +91,7 @@
     <string name="offline_media_cache_enabled">Cache media</string>
     <string name="offline_media_cache_enabled_summary">Download media files to sdcard. This might significantly increase time it takes to go offline</string>
     <string name="notify_downloading_images">Downloading images (%1$d)…</string>
+    <string name="notify_downloading_media">Downloading media files…</string>
     <string name="article_set_labels">Set labels</string>
     <string name="search">Search</string>
     <string name="cancel">Cancel</string>
-- 
cgit v1.2.3