Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Downloadreport is now shown when all downloads have been completed

Browse Source
This commit is contained in:
daniel oeh 2012-08-21 12:17:16 +02:00
parent 1e30124aad
commit d4d3f8b383
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/de/danoeh/antennapod/service/download/DownloadService.java
View File

@ -63,10 +63,6 @@ public class DownloadService extends Service {
public static String ACTION_ALL_FEED_DOWNLOADS_COMPLETED = "action.de.danoeh.antennapod.storage.all_feed_downloads_completed"; public static String ACTION_ALL_FEED_DOWNLOADS_COMPLETED = "action.de.danoeh.antennapod.storage.all_feed_downloads_completed";
/**
* If the DownloadService receives this intent, it will execute
* queryDownloads()
*/
public static final String ACTION_ENQUEUE_DOWNLOAD = "action.de.danoeh.antennapod.service.enqueueDownload"; public static final String ACTION_ENQUEUE_DOWNLOAD = "action.de.danoeh.antennapod.service.enqueueDownload";
public static final String ACTION_CANCEL_DOWNLOAD = "action.de.danoeh.antennapod.service.cancelDownload"; public static final String ACTION_CANCEL_DOWNLOAD = "action.de.danoeh.antennapod.service.cancelDownload";
public static final String ACTION_CANCEL_ALL_DOWNLOADS = "action.de.danoeh.antennapod.service.cancelAllDownloads"; public static final String ACTION_CANCEL_ALL_DOWNLOADS = "action.de.danoeh.antennapod.service.cancelAllDownloads";
@ -112,6 +108,9 @@ public class DownloadService extends Service {
private List<Downloader> downloads; private List<Downloader> downloads;
/** Number of completed downloads which are currently being handled. */
private volatile int downloadsBeingHandled;
private volatile boolean shutdownInitiated = false; private volatile boolean shutdownInitiated = false;
/** True if service is running. */ /** True if service is running. */
public static boolean isRunning = false; public static boolean isRunning = false;
@ -164,6 +163,7 @@ public class DownloadService extends Service {
public void uncaughtException(Thread thread, Throwable ex) { public void uncaughtException(Thread thread, Throwable ex) {
Log.e(TAG, "Thread exited with uncaught exception"); Log.e(TAG, "Thread exited with uncaught exception");
ex.printStackTrace(); ex.printStackTrace();
downloadsBeingHandled -= 1;
queryDownloads(); queryDownloads();
} }
}); });
@ -183,8 +183,6 @@ public class DownloadService extends Service {
manager = FeedManager.getInstance(); manager = FeedManager.getInstance();
requester = DownloadRequester.getInstance(); requester = DownloadRequester.getInstance();
mediaplayer = new MediaPlayer(); mediaplayer = new MediaPlayer();
setupNotification();
} }
@Override @Override
@ -328,6 +326,7 @@ public class DownloadService extends Service {
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, "Received 'Download Complete' - message."); Log.d(TAG, "Received 'Download Complete' - message.");
downloadsBeingHandled += 1;
DownloadStatus status = downloader.getStatus(); DownloadStatus status = downloader.getStatus();
status.setCompletionDate(new Date()); status.setCompletionDate(new Date());
boolean successful = status.isSuccessful(); boolean successful = status.isSuccessful();
@ -352,7 +351,7 @@ public class DownloadService extends Service {
download.setDownloaded(false); download.setDownloaded(false);
saveDownloadStatus(status); saveDownloadStatus(status);
sendDownloadHandledIntent(getDownloadType(download)); sendDownloadHandledIntent(getDownloadType(download));
downloadsBeingHandled -= 1;
} }
} }
removeDownload(downloader); removeDownload(downloader);
@ -476,24 +475,30 @@ public class DownloadService extends Service {
/** Check if there's something else to download, otherwise stop */ /** Check if there's something else to download, otherwise stop */
void queryDownloads() { void queryDownloads() {
int numOfDownloads = downloads.size(); int numOfDownloads = downloads.size();
if (AppConfig.DEBUG) if (AppConfig.DEBUG) {
Log.d(TAG, numOfDownloads + " downloads left"); Log.d(TAG, numOfDownloads + " downloads left");
if (AppConfig.DEBUG) Log.d(TAG, "Downloads being handled: " + downloadsBeingHandled);
Log.d(TAG, "ShutdownInitiated: " + shutdownInitiated); Log.d(TAG, "ShutdownInitiated: " + shutdownInitiated);
}
if (numOfDownloads == 0) { if (numOfDownloads == 0 && downloadsBeingHandled <= 0) {
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, "Starting shutdown"); Log.d(TAG, "Starting shutdown");
shutdownInitiated = true; shutdownInitiated = true;
updateReport();
stopForeground(true); stopForeground(true);
} else { } else {
// update notification if (notificationBuilder != null) {
notificationBuilder.setContentText(numOfDownloads // update notification
+ " Downloads left"); notificationBuilder.setContentText(numOfDownloads
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + " Downloads left");
nm.notify(NOTIFICATION_ID, notificationBuilder.getNotification()); NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify(NOTIFICATION_ID,
notificationBuilder.getNotification());
} else {
setupNotification();
}
} }
updateReport();
} }
/** Is called whenever a Feed is downloaded */ /** Is called whenever a Feed is downloaded */
@ -592,6 +597,7 @@ public class DownloadService extends Service {
saveDownloadStatus(new DownloadStatus(savedFeed, reason, successful)); saveDownloadStatus(new DownloadStatus(savedFeed, reason, successful));
sendDownloadHandledIntent(DOWNLOAD_TYPE_FEED); sendDownloadHandledIntent(DOWNLOAD_TYPE_FEED);
downloadsBeingHandled -= 1;
queryDownloads(); queryDownloads();
} }
@ -646,6 +652,7 @@ public class DownloadService extends Service {
Log.e(TAG, Log.e(TAG,
"Image has no feed, image might not be saved correctly!"); "Image has no feed, image might not be saved correctly!");
} }
downloadsBeingHandled -= 1;
queryDownloads(); queryDownloads();
} }
} }
@ -697,6 +704,7 @@ public class DownloadService extends Service {
if (AppConfig.DEBUG) if (AppConfig.DEBUG)
Log.d(TAG, "Item is already in queue"); Log.d(TAG, "Item is already in queue");
} }
downloadsBeingHandled -= 1;
queryDownloads(); queryDownloads();
} }
} }