From d05ed0e59cba3ba29cdc874a7a4d365fda7d38f9 Mon Sep 17 00:00:00 2001 From: Chris Renshaw Date: Sat, 28 Mar 2020 06:00:06 -0300 Subject: [PATCH] Manager: remove v from download names - now that Canaries are only commit hashes for the version string, the v is unnecessary/confusing, so the simplest solution is to just remove the v from the filename for all Manager-based downloads of Magisk and Manager --- .../magisk/model/entity/internal/DownloadSubject.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt index 6f9380b60..97cb26d04 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt @@ -41,7 +41,7 @@ sealed class DownloadSubject : Parcelable { val manager: ManagerJson = Info.remote.app override val title: String - get() = "MagiskManager-v${manager.version}(${manager.versionCode})" + get() = "MagiskManager-${manager.version}(${manager.versionCode})" override val url: String get() = manager.link @@ -63,7 +63,7 @@ sealed class DownloadSubject : Parcelable { override val configuration: Configuration ) : Magisk() { override val url: String get() = magisk.link - override val title: String get() = "Magisk-v${magisk.version}(${magisk.versionCode})" + override val title: String get() = "Magisk-${magisk.version}(${magisk.versionCode})" @IgnoredOnParcel override val file by lazy { @@ -89,7 +89,7 @@ sealed class DownloadSubject : Parcelable { @IgnoredOnParcel override val file by lazy { - File(Config.downloadDirectory, "Magisk-v${magisk.version}(${magisk.versionCode}).zip") + File(Config.downloadDirectory, "Magisk-${magisk.version}(${magisk.versionCode}).zip") } }