user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added missing file

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:41:08 +09:00
parent 9b99baf4bc
commit 6bdba49284
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
View File

@@ -63,24 +63,15 @@ class GalleryDownloader(
field = true field = true
notificationManager.notify(galleryID, notificationBuilder.build()) notificationManager.notify(galleryID, notificationBuilder.build())
<<<<<<< HEAD
if (reader?.isActive == false && downloadJob?.isActive != true) { if (reader?.isActive == false && downloadJob?.isActive != true) {
val data = File(getDownloadDirectory(this), galleryID.toString()) val data = File(getDownloadDirectory(this), galleryID.toString())
val cache = File(cacheDir, "imageCache/$galleryID") 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()) { if (File(cache, "images").exists() && !data.exists()) {
cache.copyRecursively(data, true) cache.copyRecursively(data, true)
cache.deleteRecursively() cache.deleteRecursively()
} }
<<<<<<< HEAD
=======
if (reader?.isActive == false && downloadJob?.isActive != true)
>>>>>>> origin/development
field = false field = false
} }
@@ -179,11 +170,8 @@ class GalleryDownloader(
downloadJob = CoroutineScope(Dispatchers.Default).launch { downloadJob = CoroutineScope(Dispatchers.Default).launch {
val reader = reader!!.await() val reader = reader!!.await()
<<<<<<< HEAD
notificationBuilder.setContentTitle(reader.title) notificationBuilder.setContentTitle(reader.title)
=======
>>>>>>> origin/development
if (reader.readerItems.isEmpty()) { if (reader.readerItems.isEmpty()) {
onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect))) onErrorHandler?.invoke(IOException(getString(R.string.unable_to_connect)))
return@launch return@launch
@@ -332,14 +320,6 @@ class GalleryDownloader(
setProgress(0, 0, true) setProgress(0, 0, true)
priority = NotificationCompat.PRIORITY_LOW priority = NotificationCompat.PRIORITY_LOW
} }
<<<<<<< HEAD
=======
CoroutineScope(Dispatchers.Default).launch {
while (reader == null) ;
notificationBuilder.setContentTitle(reader.await().title)
}
>>>>>>> origin/development
} }
} }