Release v1.7.0-beta.2 (10610)

JunkFood02 · Dec 2, 2022 · 04a419c · 04a419c
1 parent d916768
commit 04a419c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,10 +11,10 @@ plugins {
 apply(plugin = "dagger.hilt.android.plugin")
 
 val versionMajor = 1
-val versionMinor = 6
-val versionPatch = 1
-val versionBuild = 0
-val isStable = true
+val versionMinor = 7
+val versionPatch = 0
+val versionBuild = 2
+val isStable = false
 
 val keystorePropertiesFile = rootProject.file("keystore.properties")
 

diff --git a/app/src/main/java/com/junkfood/seal/ui/page/download/DownloadViewModel.kt b/app/src/main/java/com/junkfood/seal/ui/page/download/DownloadViewModel.kt
@@ -298,7 +298,7 @@ class DownloadViewModel @Inject constructor() : ViewModel() {
                     progress = 0f,
                     taskId = videoInfo.id,
                     title = videoInfo.title,
-                    uploader = videoInfo.uploader ?: "null",
+                    uploader = videoInfo.uploader.toString(),
                     thumbnailUrl = videoInfo.thumbnail.toHttpsUrl(),
                     duration = videoInfo.duration?.roundToInt() ?: 0,
                     fileSizeApprox = videoInfo.fileSize ?: videoInfo.fileSizeApprox ?: 0

diff --git a/app/src/main/java/com/junkfood/seal/util/DownloadUtil.kt b/app/src/main/java/com/junkfood/seal/util/DownloadUtil.kt
@@ -244,7 +244,7 @@ object DownloadUtil {
                     id = 0,
                     videoTitle = videoInfo.title,
                     videoAuthor = videoInfo.uploader ?: videoInfo.channel.toString(),
-                    videoUrl = videoInfo.webpageUrl ?: videoInfo.originalUrl ?: "null",
+                    videoUrl = videoInfo.webpageUrl ?: videoInfo.originalUrl.toString(),
                     thumbnailUrl = videoInfo.thumbnail.toHttpsUrl(),
                     videoPath = path,
                     extractor = videoInfo.extractorKey
@@ -381,12 +381,13 @@ object DownloadUtil {
                 )
             }
         }.onFailure {
-            if (it.message.isNullOrEmpty())
+            val msg = it.message
+            if (msg.isNullOrEmpty())
                 it.printStackTrace()
             else NotificationUtil.makeErrorReportNotificationForCustomCommand(
-                notificationId,
-                null,
-                it.message!!
+                notificationId = notificationId,
+                text = null,
+                error = msg
             )
         }.onSuccess {
             NotificationUtil.makeNotification(