Commit 188ea264 authored by Viktor De Pasquale's avatar Viktor De Pasquale Committed by John Wu

Updated downloading magisk to pull the zip from cache if eligible

parent 4c8f3579
...@@ -15,9 +15,11 @@ import com.topjohnwu.magisk.utils.Utils ...@@ -15,9 +15,11 @@ import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.view.ProgressNotification import com.topjohnwu.magisk.view.ProgressNotification
import com.topjohnwu.magisk.view.SnackbarMaker import com.topjohnwu.magisk.view.SnackbarMaker
import com.topjohnwu.net.Networking import com.topjohnwu.net.Networking
import com.topjohnwu.superuser.ShellUtils
import java.io.File import java.io.File
internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List<String>) : AlertDialog.Builder(activity) { internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List<String>) :
AlertDialog.Builder(activity) {
init { init {
setTitle(R.string.select_method) setTitle(R.string.select_method)
...@@ -60,16 +62,30 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List ...@@ -60,16 +62,30 @@ internal class InstallMethodDialog(activity: MagiskActivity<*, *>, options: List
val filename = "Magisk-v${Info.remote.magisk.version}" + val filename = "Magisk-v${Info.remote.magisk.version}" +
"(${Info.remote.magisk.versionCode}).zip" "(${Info.remote.magisk.versionCode}).zip"
val zip = File(Const.EXTERNAL_PATH, filename) val zip = File(Const.EXTERNAL_PATH, filename)
val cachedZip = File(activity.cacheDir, "magisk.zip")
fun onSuccess() {
SnackbarMaker.make(
activity,
activity.getString(R.string.internal_storage, "/Download/$filename"),
Snackbar.LENGTH_LONG
).show()
}
if (ShellUtils.checkSum("MD5", cachedZip, Info.remote.magisk.hash)) {
cachedZip.copyTo(zip, true)
onSuccess()
} else {
val progress = ProgressNotification(filename) val progress = ProgressNotification(filename)
Networking.get(Info.remote.magisk.link) Networking.get(Info.remote.magisk.link)
.setDownloadProgressListener(progress) .setDownloadProgressListener(progress)
.setErrorHandler { _, _ -> progress.dlFail() } .setErrorHandler { _, _ -> progress.dlFail() }
.getAsFile(zip) { .getAsFile(zip) {
progress.dlDone() progress.dlDone()
SnackbarMaker.make(activity, onSuccess()
activity.getString(R.string.internal_storage, "/Download/$filename"), }
Snackbar.LENGTH_LONG).show()
} }
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment