Merge pull request #673 from LoxiaLiSA/master

aa
CeuiLiSA · Dec 23, 2024 · d8dea18 · d8dea18
2 parents 8e41ec2 + a7b7c13
commit d8dea18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/ceui/pixiv/ui/task/LoadTask.kt b/app/src/main/java/ceui/pixiv/ui/task/LoadTask.kt
@@ -49,7 +49,9 @@ open class LoadTask(
 
             val file = downloadFile()
             if (file != null) {
-                _result.value = file
+                file?.let {
+                    _result.value = it
+                }
                 _status.value = TaskStatus.Finished
                 onEnd(file)
             } else {

diff --git a/app/src/main/java/ceui/pixiv/ui/task/QueuedRunnable.kt b/app/src/main/java/ceui/pixiv/ui/task/QueuedRunnable.kt
@@ -12,8 +12,8 @@ abstract class QueuedRunnable<ResultT> {
     protected val _status = MutableLiveData<TaskStatus>(TaskStatus.NotStart)
     val status: LiveData<TaskStatus> = _status
 
-    protected val _result = MutableLiveData<File>()
-    val result: LiveData<File> get() = _result
+    protected val _result = MutableLiveData<ResultT>()
+    val result: LiveData<ResultT> get() = _result
 
     open val taskId = UUID.randomUUID().hashCode().toLong()