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 method naming scheme

Browse Source 
Added new configurations
Added flashing methods and annotated viewModel's uri as deprecated in function
This commit is contained in:
Viktor De Pasquale
2019-07-10 15:00:14 +02:00
committed by John Wu
parent 40b683111c
commit 12e00c3054
4 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
+26 -8
View File
@@ -29,21 +29,39 @@ open class FlashActivity : MagiskActivity<FlashViewModel, ActivityFlashBinding>(
companion object {
private fun intent(context: Context) = Intent(context, ClassMap[FlashActivity::class.java])
private fun intent(context: Context, file: File) = intent(context).setData(file.toUri())
fun flashMagiskIntent(context: Context, file: File) = intent(context)
.setData(file.toUri())
/* Flashing is understood as installing / flashing magisk itself */
fun flashIntent(context: Context, file: File) = intent(context, file)
.putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK)
fun flashMagisk(context: Context, file: File) =
context.startActivity(flashMagiskIntent(context, file))
fun flash(context: Context, file: File) =
context.startActivity(flashIntent(context, file))
/* Patching is understood as injecting img files with magisk */
fun flashModuleIntent(context: Context, file: File) = intent(context)
.setData(file.toUri())
fun patchIntent(context: Context, file: File) = intent(context, file)
.putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_FILE)
fun patch(context: Context, file: File) =
context.startActivity(patchIntent(context, file))
/* Uninstalling is understood as removing magisk entirely */
fun uninstallIntent(context: Context, file: File) = intent(context, file)
.putExtra(Const.Key.FLASH_ACTION, Const.Value.UNINSTALL)
fun uninstall(context: Context, file: File) =
context.startActivity(uninstallIntent(context, file))
/* Installing is understood as flashing modules / zips */
fun installIntent(context: Context, file: File) = intent(context, file)
.putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP)
fun flashModule(context: Context, file: File) =
context.startActivity(flashModuleIntent(context, file))
fun install(context: Context, file: File) =
context.startActivity(installIntent(context, file))
}
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import java.util.*
class FlashViewModel(
action: String,
uri: Uri?,
uri: Uri?, // FIXME uri is now flashable file, not additional file
private val resources: Resources
) : MagiskViewModel(), FlashResultListener {