br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Updated flash screen with new arch

Browse Source
This commit is contained in:
Viktor De Pasquale
2019-04-24 20:28:41 +02:00
parent 07eb7dda2d
commit 14ff22fbcd
21 changed files with 445 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/model/flash/FlashResultListener.kt
+7
View File
@@ -0,0 +1,7 @@
package com.topjohnwu.magisk.model.flash
interface FlashResultListener {
fun onResult(isSuccess: Boolean)
}
app/src/main/java/com/topjohnwu/magisk/model/flash/Flashing.kt
+4 -4
View File
@@ -13,7 +13,7 @@ sealed class Flashing(
uri: Uri,
private val console: MutableList<String>,
log: MutableList<String>,
private val resultListener: (Result<Boolean>) -> Unit
private val resultListener: FlashResultListener
) : FlashZip(uri, console, log) {
override fun onResult(success: Boolean) {
@@ -21,14 +21,14 @@ sealed class Flashing(
console.add("! Installation failed")
}
resultListener(Result.success(success))
resultListener.onResult(success)
}
class Install(
uri: Uri,
console: MutableList<String>,
log: MutableList<String>,
resultListener: (Result<Boolean>) -> Unit = {}
resultListener: FlashResultListener
) : Flashing(uri, console, log, resultListener) {
override fun onResult(success: Boolean) {
@@ -44,7 +44,7 @@ sealed class Flashing(
uri: Uri,
console: MutableList<String>,
log: MutableList<String>,
resultListener: (Result<Boolean>) -> Unit = {}
resultListener: FlashResultListener
) : Flashing(uri, console, log, resultListener) {
private val context: Context by inject()
app/src/main/java/com/topjohnwu/magisk/model/flash/Patching.kt
+9 -9
View File
@@ -6,8 +6,8 @@ import com.topjohnwu.superuser.Shell
sealed class Patching(
private val console: MutableList<String>,
logs: List<String>,
private val resultListener: (Result<Boolean>) -> Unit
logs: MutableList<String>,
private val resultListener: FlashResultListener
) : MagiskInstaller(console, logs) {
override fun onResult(success: Boolean) {
@@ -17,14 +17,14 @@ sealed class Patching(
Shell.sh("rm -rf $installDir").submit()
console.add("! Installation failed")
}
resultListener(Result.success(success))
resultListener.onResult(success)
}
class File(
private val uri: Uri,
console: MutableList<String>,
logs: List<String>,
resultListener: (Result<Boolean>) -> Unit = {}
logs: MutableList<String>,
resultListener: FlashResultListener
) : Patching(console, logs, resultListener) {
override fun operations() =
extractZip() && handleFile(uri) && patchBoot() && storeBoot()
@@ -32,8 +32,8 @@ sealed class Patching(
class SecondSlot(
console: MutableList<String>,
logs: List<String>,
resultListener: (Result<Boolean>) -> Unit = {}
logs: MutableList<String>,
resultListener: FlashResultListener
) : Patching(console, logs, resultListener) {
override fun operations() =
findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA()
@@ -41,8 +41,8 @@ sealed class Patching(
class Direct(
console: MutableList<String>,
logs: List<String>,
resultListener: (Result<Boolean>) -> Unit = {}
logs: MutableList<String>,
resultListener: FlashResultListener
) : Patching(console, logs, resultListener) {
override fun operations() =
findImage() && extractZip() && patchBoot() && flashBoot()