Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 14:47:29 +00:00
Code Issues Releases Wiki Activity

resolve gson crash

Browse Source
This commit is contained in:
Austin Huang 2021-06-13 22:09:07 -04:00
parent 6ed9e8458f
commit c47272792e
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/awais/instagrabber/workers/DownloadWorker.kt
View File

@ -40,9 +40,10 @@ import java.io.File
import java.net.URL import java.net.URL
import java.util.* import java.util.*
import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutionException
import java.util.stream.Collectors
import kotlin.collections.Map
import kotlin.math.abs import kotlin.math.abs
class DownloadWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) { class DownloadWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
private val notificationManager: NotificationManagerCompat = NotificationManagerCompat.from(context) private val notificationManager: NotificationManagerCompat = NotificationManagerCompat.from(context)
@ -88,15 +89,16 @@ class DownloadWorker(context: Context, workerParams: WorkerParameters) : Corouti
return Result.success() return Result.success()
} }
private suspend fun download(urlToFilePathMap: Map<String, DocumentFile>) { private suspend fun download(urlToFilePathMap: Map<String, String>) {
val notificationId = notificationId val notificationId = notificationId
val entries = urlToFilePathMap.entries val entries = urlToFilePathMap.entries
var count = 1 var count = 1
val total = urlToFilePathMap.size val total = urlToFilePathMap.size
for ((url, file) in entries) { for ((url, uriString) in entries) {
updateDownloadProgress(notificationId, count, total, 0f) updateDownloadProgress(notificationId, count, total, 0f)
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
download(notificationId, count, total, url, file) val file = DocumentFile.fromSingleUri(applicationContext, Uri.parse(uriString))
download(notificationId, count, total, url, file!!)
} }
count++ count++
} }
@ -219,9 +221,9 @@ class DownloadWorker(context: Context, workerParams: WorkerParameters) : Corouti
return builder.build() return builder.build()
} }
private fun showSummary(urlToFilePathMap: Map<String, DocumentFile>?) { private fun showSummary(urlToFilePathMap: Map<String, String>) {
val context = applicationContext val context = applicationContext
val filePaths = urlToFilePathMap!!.values val filePaths = urlToFilePathMap.mapNotNull { DocumentFile.fromSingleUri(context, Uri.parse(it.value)) }
val notifications: MutableList<NotificationCompat.Builder> = LinkedList() val notifications: MutableList<NotificationCompat.Builder> = LinkedList()
val notificationIds: MutableList<Int> = LinkedList() val notificationIds: MutableList<Int> = LinkedList()
var count = 1 var count = 1
@ -382,17 +384,19 @@ class DownloadWorker(context: Context, workerParams: WorkerParameters) : Corouti
return bitmap return bitmap
} }
class DownloadRequest private constructor(val urlToFilePathMap: Map<String, DocumentFile>) { class DownloadRequest private constructor(val urlToFilePathMap: Map<String, String>) {
class Builder { class Builder {
private var urlToFilePathMap: MutableMap<String, DocumentFile> = mutableMapOf() private var urlToFilePathMap: MutableMap<String, String> = mutableMapOf()
fun setUrlToFilePathMap(urlToFilePathMap: MutableMap<String, DocumentFile>): Builder { fun setUrlToFilePathMap(urlToFilePathMap: MutableMap<String, DocumentFile>): Builder {
this.urlToFilePathMap = urlToFilePathMap this.urlToFilePathMap = urlToFilePathMap
.mapValues { it.value.uri.toString() }
.toMutableMap()
return this return this
} }
fun addUrl(url: String, filePath: DocumentFile): Builder { fun addUrl(url: String, filePath: DocumentFile): Builder {
urlToFilePathMap[url] = filePath urlToFilePathMap[url] = filePath.uri.toString()
return this return this
} }