wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix notifications for web page download service

Browse source
This commit is contained in:
David Luhmer 2018-10-30 22:02:17 +01:00
parent ca8fac6303
commit 353024b6c5
1 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadWebPageService.java
View file

@ -26,11 +26,13 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import de.luhmer.owncloudnewsreader.R; import de.luhmer.owncloudnewsreader.R;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm; import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.database.model.RssItem; import de.luhmer.owncloudnewsreader.database.model.RssItem;
import de.luhmer.owncloudnewsreader.helper.NewsFileUtils;
import de.luhmer.owncloudnewsreader.helper.NotificationActionReceiver; import de.luhmer.owncloudnewsreader.helper.NotificationActionReceiver;
import de.luhmer.owncloudnewsreader.notification.NextcloudNotificationManager; import de.luhmer.owncloudnewsreader.notification.NextcloudNotificationManager;
import de.luhmer.owncloudnewsreader.services.events.StopWebArchiveDownloadEvent; import de.luhmer.owncloudnewsreader.services.events.StopWebArchiveDownloadEvent;
@ -47,12 +49,12 @@ public class DownloadWebPageService extends Service {
private static final String TAG = DownloadWebPageService.class.getCanonicalName(); private static final String TAG = DownloadWebPageService.class.getCanonicalName();
private static final int JOB_ID = 1002; private static final int JOB_ID = 1002;
private static final int NOTIFICATION_ID = JOB_ID;
private static final String CHANNEL_ID = "Download Web Page Service"; private static final String CHANNEL_ID = "Download Web Page Service";
private static final String WebArchiveFinalPrefix = "web_archive_";
public static final String WebArchiveFinalPrefix = "web_archive_";
private static final int NUMBER_OF_CORES = 4; private static final int NUMBER_OF_CORES = 4;
private NotificationCompat.Builder mNotificationWebPages; private NotificationCompat.Builder mNotificationWebPages;
private static final int NOTIFICATION_ID = JOB_ID;
private NotificationManager mNotificationManager; private NotificationManager mNotificationManager;
@ -61,6 +63,7 @@ public class DownloadWebPageService extends Service {
// Sets the Time Unit to seconds // Sets the Time Unit to seconds
private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS; private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
private final AtomicBoolean interrupted = new AtomicBoolean();
private final AtomicInteger doneCount = new AtomicInteger(); private final AtomicInteger doneCount = new AtomicInteger();
private Integer totalCount = 0; private Integer totalCount = 0;
@ -74,10 +77,11 @@ public class DownloadWebPageService extends Service {
super.onCreate(); super.onCreate();
initNotification(); initNotification();
downloadWebPages(); downloadWebPages();
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
startForeground(NOTIFICATION_ID, mNotificationWebPages.build());
} }
@Override @Override
@ -106,6 +110,7 @@ public class DownloadWebPageService extends Service {
@Subscribe @Subscribe
public void onEvent(StopWebArchiveDownloadEvent event) { public void onEvent(StopWebArchiveDownloadEvent event) {
mDownloadThreadPool.shutdownNow(); mDownloadThreadPool.shutdownNow();
interrupted.set(true);
stopSelf(); stopSelf();
} }
@ -143,7 +148,7 @@ public class DownloadWebPageService extends Service {
final DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(DownloadWebPageService.this); final DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(DownloadWebPageService.this);
final BlockingQueue<Runnable> downloadWorkQueue = new LinkedBlockingQueue<>(); final BlockingQueue<Runnable> downloadWorkQueue = new LinkedBlockingQueue<>();
getWebPageArchiveStorage(this).mkdirs(); NewsFileUtils.getWebPageArchiveStorage(this).mkdirs();
for (RssItem rssItem : dbConn.getAllUnreadRssItemsForDownloadWebPageService()) { for (RssItem rssItem : dbConn.getAllUnreadRssItemsForDownloadWebPageService()) {
downloadWorkQueue.add(new DownloadWebPage(rssItem.getLink())); downloadWorkQueue.add(new DownloadWebPage(rssItem.getLink()));
@ -160,23 +165,7 @@ public class DownloadWebPageService extends Service {
startDownloadingQueue(downloadWorkQueue); startDownloadingQueue(downloadWorkQueue);
} }
public static void clearWebArchiveCache(Context context) {
getWebPageArchiveStorage(context).mkdirs();
String path = getWebPageArchiveStorage(context).getAbsolutePath();
Log.d("Files", "Path: " + path);
File directory = new File(path);
File[] files = directory.listFiles();
Log.d("Files", "Size: " + files.length);
for (File file : files) {
String name = file.getName();
//og.d("Files", "FileName: " + file.getName());
if (name.startsWith(WebArchiveFinalPrefix)) {
Log.v(TAG, "Deleting file: " + name);
//file.delete();
}
}
}
private void startDownloadingQueue(BlockingQueue<Runnable> downloadWorkQueue) { private void startDownloadingQueue(BlockingQueue<Runnable> downloadWorkQueue) {
totalCount = downloadWorkQueue.size(); totalCount = downloadWorkQueue.size();
@ -324,31 +313,27 @@ public class DownloadWebPageService extends Service {
} }
private synchronized void updateNotificationProgress() { private synchronized void updateNotificationProgress() {
int current = doneCount.incrementAndGet(); if(interrupted.get()) {
Log.d(TAG, String.format("updateNotificationProgress (%d/%d)", current, totalCount)); Log.v(TAG, "interrupted.. stop requested.. do not show progress anymore!");
if(current == totalCount) {
//mNotificationManager.cancel(NOTIFICATION_ID);
EventBus.getDefault().post(new StopWebArchiveDownloadEvent());
} else { } else {
mNotificationWebPages int current = doneCount.incrementAndGet();
.setContentText((current) + "/" + totalCount + " - Downloading Images for offline usage") Log.d(TAG, String.format("updateNotificationProgress (%d/%d)", current, totalCount));
.setProgress(totalCount, current, false);
mNotificationManager.notify(NOTIFICATION_ID, mNotificationWebPages.build()); if (current == totalCount) {
//mNotificationManager.cancel(NOTIFICATION_ID);
EventBus.getDefault().post(new StopWebArchiveDownloadEvent());
} else {
mNotificationWebPages
.setContentText((current) + "/" + totalCount + " - Downloading Images for offline usage")
.setProgress(totalCount, current, false);
mNotificationManager.notify(NOTIFICATION_ID, mNotificationWebPages.build());
}
} }
} }
public static File getWebPageArchiveStorage(Context context) {
//return context.getFilesDir();
//return new File(context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "nextcloud-news/web-archive/");
return new File(context.getExternalCacheDir(), "web-archive/");
//return new File(Environment.getExternalStorageDirectory(), "nextcloud-news/web-archive/");
}
public static File getWebPageArchiveFileForUrl(Context context, String url) { public static File getWebPageArchiveFileForUrl(Context context, String url) {
return new File(getWebPageArchiveStorage(context), getWebPageArchiveFilename(url)); return new File(NewsFileUtils.getWebPageArchiveStorage(context), getWebPageArchiveFilename(url));
} }
public static String getWebPageArchiveFilename(String url) { public static String getWebPageArchiveFilename(String url) {