From 042a6a72a155b1c3d796b04fa3a912bebe3f5719 Mon Sep 17 00:00:00 2001 From: ostajic Date: Sun, 23 Aug 2020 02:48:48 +0200 Subject: [PATCH] remove dupe and more detailed throw --- .../manager/core/downloader/VancedDownloadService.kt | 7 ++++--- .../manager/core/installer/RootSplitInstallerService.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt index 9369633f..3b5d2d92 100644 --- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt +++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt @@ -57,12 +57,13 @@ class VancedDownloadService: Service() { Build.SUPPORTED_ABIS.contains("arm64-v8a") -> "arm64_v8a" else -> "armeabi_v7a" } + val themePath = "$installUrl/apks/v$vancedVer/$variant/Theme/" val url = when (type) { "arch" -> "$installUrl/apks/v$vancedVer/$variant/Arch/split_config.$arch.apk" - "theme" -> "$installUrl/apks/v$vancedVer/$variant/Theme/$theme.apk" - "stock" -> "$installUrl/apks/v$vancedVer/$variant/Theme/stock.apk" - "dpi" -> "$installUrl/apks/v$vancedVer/$variant/Theme/dpi.apk" + "theme" -> "$themePath$theme.apk" + "stock" -> "$themePath/stock.apk" + "dpi" -> "$themePath/dpi.apk" "lang" -> "$installUrl/apks/v$vancedVer/$variant/Language/split_config.${lang?.get(count)}.apk" else -> throw NotImplementedError("This type of APK is NOT valid. What the hell did you even do?") } diff --git a/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt index 38d84030..25272a80 100644 --- a/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt +++ b/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt @@ -67,7 +67,7 @@ class RootSplitInstallerService: Service() { } else { - throw RuntimeException("Missing dark.apk or black.apk") + throw IllegalArgumentException("modApk Is Null Cause Missing (dark.apk/black.apk) In apks Folder") } //installSplitApkFiles(fileInfoList) }