Catalogue in Kotlin. Support library upgraded to 23.2.0. Downloads directory now shows a list of folders, it should fix #141.

This commit is contained in:
len
2016-03-01 23:29:07 +01:00
parent fabdba4452
commit ee4bf163ef
18 changed files with 1046 additions and 747 deletions

View File

@@ -26,6 +26,7 @@ import eu.kanade.tachiyomi.data.source.model.Page;
import eu.kanade.tachiyomi.event.DownloadChaptersEvent;
import eu.kanade.tachiyomi.util.DiskUtils;
import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator;
import eu.kanade.tachiyomi.util.ToastUtil;
import eu.kanade.tachiyomi.util.UrlUtil;
import rx.Observable;
import rx.Subscription;
@@ -84,7 +85,11 @@ public class DownloadManager {
if (finished) {
DownloadService.stop(context);
}
}, e -> DownloadService.stop(context));
}, e -> {
DownloadService.stop(context);
Timber.e(e, e.getMessage());
ToastUtil.showShort(context, e.getMessage());
});
if (!isRunning) {
isRunning = true;
@@ -410,7 +415,7 @@ public class DownloadManager {
if (queue.isEmpty())
return false;
if (downloadsSubscription == null)
if (downloadsSubscription == null || downloadsSubscription.isUnsubscribed())
initializeSubscriptions();
final List<Download> pending = new ArrayList<>();