TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-20 08:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly get displayName of live uri

Browse Source
This commit is contained in:
LoveSy 2023-04-06 16:15:32 +08:00 committed by John Wu
parent 1cd595a598
commit f29cc26103
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/dialog/LocalModuleInstallDialog.kt
View File

@ -4,19 +4,19 @@ import android.net.Uri
import com.topjohnwu.magisk.MainDirections import com.topjohnwu.magisk.MainDirections
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
import com.topjohnwu.magisk.events.DialogBuilder import com.topjohnwu.magisk.events.DialogBuilder
import com.topjohnwu.magisk.ui.module.ModuleViewModel import com.topjohnwu.magisk.ui.module.ModuleViewModel
import com.topjohnwu.magisk.view.MagiskDialog import com.topjohnwu.magisk.view.MagiskDialog
class LocalModuleInstallDialog( class LocalModuleInstallDialog(
private val viewModel: ModuleViewModel, private val viewModel: ModuleViewModel,
private val uri: Uri private val uri: Uri,
private val displayName: String
) : DialogBuilder { ) : DialogBuilder {
override fun build(dialog: MagiskDialog) { override fun build(dialog: MagiskDialog) {
dialog.apply { dialog.apply {
setTitle(R.string.confirm_install_title) setTitle(R.string.confirm_install_title)
setMessage(context.getString(R.string.confirm_install, uri.displayName)) setMessage(context.getString(R.string.confirm_install, displayName))
setButton(MagiskDialog.ButtonType.POSITIVE) { setButton(MagiskDialog.ButtonType.POSITIVE) {
text = android.R.string.ok text = android.R.string.ok
onClick { onClick {

4
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View File

@ -5,6 +5,7 @@ import android.view.View
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.arch.BaseFragment import com.topjohnwu.magisk.arch.BaseFragment
import com.topjohnwu.magisk.arch.viewModel import com.topjohnwu.magisk.arch.viewModel
import com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding import com.topjohnwu.magisk.databinding.FragmentModuleMd2Binding
import rikka.recyclerview.addEdgeSpacing import rikka.recyclerview.addEdgeSpacing
import rikka.recyclerview.addInvalidateItemDecorationsObserver import rikka.recyclerview.addInvalidateItemDecorationsObserver
@ -21,7 +22,8 @@ class ModuleFragment : BaseFragment<FragmentModuleMd2Binding>() {
activity?.title = resources.getString(R.string.modules) activity?.title = resources.getString(R.string.modules)
viewModel.data.observe(this) { viewModel.data.observe(this) {
it ?: return@observe it ?: return@observe
viewModel.requestInstallLocalModule(it) val displayName = runCatching { it.displayName }.getOrNull() ?: return@observe
viewModel.requestInstallLocalModule(it, displayName)
viewModel.data.value = null viewModel.data.value = null
} }
} }

4
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View File

@ -84,8 +84,8 @@ class ModuleViewModel : AsyncLoadViewModel() {
GetContentEvent("application/zip", UriCallback()).publish() GetContentEvent("application/zip", UriCallback()).publish()
} }
fun requestInstallLocalModule(uri: Uri) { fun requestInstallLocalModule(uri: Uri, displayName: String) {
LocalModuleInstallDialog(this, uri).show() LocalModuleInstallDialog(this, uri, displayName).show()
} }
@Parcelize @Parcelize