From c913a7eb9e8d15cc3d93abe6d6dae545e83593c1 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sat, 22 Jul 2023 17:56:51 +0800
Subject: [PATCH] Fix NPE in H@H archive download

---
 .../ehviewer/ui/scene/GalleryDetailScene.kt   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
index 482ec1494..1fd1a279a 100755
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
@@ -1364,17 +1364,19 @@ class GalleryDetailScene : BaseScene() {
                         runSuspendCatching {
                             EhEngine.downloadArchive(gid, token, mArchiveFormParamOr, res, isHAtH)
                         }.onSuccess { result ->
-                            val r = DownloadManager.Request(Uri.parse(result))
-                            val name = "$gid-" + EhUtils.getSuitableTitle(this@run) + ".zip"
-                            r.setDestinationInExternalPublicDir(
-                                Environment.DIRECTORY_DOWNLOADS,
-                                FileUtils.sanitizeFilename(name),
-                            )
-                            r.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-                            runCatching {
-                                downloadManager.enqueue(r)
-                            }.onFailure {
-                                it.printStackTrace()
+                            result?.let {
+                                val r = DownloadManager.Request(Uri.parse(result))
+                                val name = "$gid-" + EhUtils.getSuitableTitle(this@run) + ".zip"
+                                r.setDestinationInExternalPublicDir(
+                                    Environment.DIRECTORY_DOWNLOADS,
+                                    FileUtils.sanitizeFilename(name),
+                                )
+                                r.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+                                runCatching {
+                                    downloadManager.enqueue(r)
+                                }.onFailure {
+                                    it.printStackTrace()
+                                }
                             }
                             showTip(R.string.download_archive_started, LENGTH_SHORT)
                         }.onFailure {