From b3d777bb6caabfa592059a4640628113394bee56 Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Wed, 10 Jul 2019 15:11:59 +0200 Subject: [PATCH] Updated configuration to hold data when necessary --- .../model/download/CompoundDownloadService.kt | 8 ++++---- .../model/entity/internal/Configuration.kt | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/CompoundDownloadService.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/CompoundDownloadService.kt index 664803345..24fe6efd0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/download/CompoundDownloadService.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/download/CompoundDownloadService.kt @@ -26,7 +26,7 @@ open class CompoundDownloadService : SubstrateDownloadService() { file: File, subject: DownloadSubject.Magisk ) = when (subject.configuration) { - Configuration.FLASH -> FlashActivity.flash(this, file) + Configuration.Flash -> FlashActivity.flash(this, file) else -> Unit } @@ -34,7 +34,7 @@ open class CompoundDownloadService : SubstrateDownloadService() { file: File, subject: DownloadSubject.Module ) = when (subject.configuration) { - Configuration.FLASH -> FlashActivity.install(this, file) + Configuration.Flash -> FlashActivity.install(this, file) else -> Unit } @@ -52,7 +52,7 @@ open class CompoundDownloadService : SubstrateDownloadService() { file: File, subject: DownloadSubject.Magisk ) = when (subject.configuration) { - Configuration.FLASH -> setContentIntent(FlashActivity.flashIntent(context, file)) + Configuration.Flash -> setContentIntent(FlashActivity.flashIntent(context, file)) else -> this } @@ -60,7 +60,7 @@ open class CompoundDownloadService : SubstrateDownloadService() { file: File, subject: DownloadSubject.Module ) = when (subject.configuration) { - Configuration.FLASH -> setContentIntent(FlashActivity.installIntent(context, file)) + Configuration.Flash -> setContentIntent(FlashActivity.installIntent(context, file)) else -> this } diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/Configuration.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/Configuration.kt index 5a0bc635b..407491441 100644 --- a/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/Configuration.kt +++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/internal/Configuration.kt @@ -1,5 +1,21 @@ package com.topjohnwu.magisk.model.entity.internal -enum class Configuration { - FLASH, DOWNLOAD, UNINSTALL, PATCH +import android.net.Uri +import android.os.Parcelable +import kotlinx.android.parcel.Parcelize + +sealed class Configuration : Parcelable { + + @Parcelize + object Flash : Configuration() + + @Parcelize + object Download : Configuration() + + @Parcelize + object Uninstall : Configuration() + + @Parcelize + data class Patch(val fileUri: Uri) : Configuration() + } \ No newline at end of file