From 6bdba492847219b6772cc0015299ceb8e3c6f6e8 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 29 Aug 2019 11:41:08 +0900 Subject: [PATCH] added missing file --- .../quaver/pupil/util/GalleryDownloader.kt | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt index 6459cadc..38725a09 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt @@ -63,24 +63,15 @@ class GalleryDownloader( field = true notificationManager.notify(galleryID, notificationBuilder.build()) -<<<<<<< HEAD if (reader?.isActive == false && downloadJob?.isActive != true) { val data = File(getDownloadDirectory(this), galleryID.toString()) val cache = File(cacheDir, "imageCache/$galleryID") -======= - val data = getCachedGallery(this, galleryID) - val cache = File(cacheDir, "imageCache/$galleryID") ->>>>>>> origin/development if (File(cache, "images").exists() && !data.exists()) { cache.copyRecursively(data, true) cache.deleteRecursively() } -<<<<<<< HEAD -======= - if (reader?.isActive == false && downloadJob?.isActive != true) ->>>>>>> origin/development field = false } @@ -179,11 +170,8 @@ class GalleryDownloader( downloadJob = CoroutineScope(Dispatchers.Default).launch { val reader = reader!!.await() -<<<<<<< HEAD notificationBuilder.setContentTitle(reader.title) -======= ->>>>>>> origin/development if (reader.readerItems.isEmpty()) { onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect))) return@launch @@ -332,14 +320,6 @@ class GalleryDownloader( setProgress(0, 0, true) priority = NotificationCompat.PRIORITY_LOW } -<<<<<<< HEAD -======= - - CoroutineScope(Dispatchers.Default).launch { - while (reader == null) ; - notificationBuilder.setContentTitle(reader.await().title) - } ->>>>>>> origin/development } } \ No newline at end of file