MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate Magisk download subject

Browse Source
This commit is contained in:
topjohnwu 2019-07-23 00:55:12 -07:00
parent a97972aac0
commit a8932706d8
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt
View File

@ -50,7 +50,6 @@ open class DownloadService : RemoteFileService() {
Uninstall -> FlashActivity.uninstall(this, file) Uninstall -> FlashActivity.uninstall(this, file)
is Patch -> FlashActivity.patch(this, file, conf.fileUri) is Patch -> FlashActivity.patch(this, file, conf.fileUri)
is Flash -> FlashActivity.flash(this, file, conf is Secondary) is Flash -> FlashActivity.flash(this, file, conf is Secondary)
else -> Unit
} }
private fun onFinishedInternal( private fun onFinishedInternal(

38
app/src/main/java/com/topjohnwu/magisk/model/entity/internal/DownloadSubject.kt
View File

@ -16,24 +16,36 @@ sealed class DownloadSubject : Parcelable {
val module: Repo, val module: Repo,
val configuration: Configuration val configuration: Configuration
) : DownloadSubject() { ) : DownloadSubject() {
override val url: String get() = module.zipUrl override val url: String get() = module.zipUrl
override val fileName: String get() = "${module.name}-v${module.version}(${module.versionCode}).zip" override val fileName: String get() = "${module.name}-v${module.version}(${module.versionCode}).zip"
} }
@Parcelize sealed class Magisk : DownloadSubject() {
data class Magisk(
val configuration: Configuration,
val magisk: MagiskJson = Info.remote.magisk
) : DownloadSubject() {
override val url: String get() = magisk.link abstract val configuration: Configuration
override val fileName get() = val magisk: MagiskJson = Info.remote.magisk
if (configuration is Configuration.Flash)
"magisk.zip" @Parcelize
else protected data class Flash(
"Magisk-v${magisk.version}(${magisk.versionCode}).zip" override val configuration: Configuration
) : Magisk() {
override val url: String get() = magisk.link
override val fileName get() = "magisk.zip"
}
@Parcelize
protected object Download : Magisk() {
override val configuration: Configuration get() = Configuration.Download
override val url: String get() = magisk.link
override val fileName get() = "Magisk-v${magisk.version}(${magisk.versionCode}).zip"
}
companion object {
operator fun invoke(configuration: Configuration) = when (configuration) {
Configuration.Download -> Download
else -> Flash(configuration)
}
}
} }