VERY experimental Nintendo Switch 2 emulator
C++
android: Prevent editing unsafe settings at runtime
Charles Lombardofe113db2f2e0
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.ktindex 599da13800..c02848403f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt@@ -3,6 +3,7 @@package org.yuzu.yuzu_emu.features.settings.model.view+import org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.features.settings.model.AbstractSetting/**@@ -19,6 +20,12 @@ abstract class SettingsItem() {abstract val type: Int+ val isEditable: Boolean+ get() {+ if (!NativeLibrary.isRunning()) return true+ return setting?.isRuntimeEditable ?: false+ }+companion object {const val TYPE_HEADER = 0const val TYPE_SWITCH = 1diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.ktindex 5702fc0ebf..e433373ed7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt@@ -11,10 +11,10 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {- private lateinit var item: DateTimeSetting+ private lateinit var setting: DateTimeSettingoverride fun bind(item: SettingsItem) {- this.item = item as DateTimeSetting+ setting = item as DateTimeSettingbinding.textSettingName.setText(item.nameId)if (item.descriptionId!! > 0) {binding.textSettingDescription.setText(item.descriptionId)@@ -25,6 +25,8 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA}override fun onClick(clicked: View) {- adapter.onDateTimeClick(item, bindingAdapterPosition)+ if (setting.isEditable) {+ adapter.onDateTimeClick(setting, bindingAdapterPosition)+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.ktindex a82f49f448..b92334522b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt@@ -12,10 +12,10 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {- private lateinit var item: SettingsItem+ private lateinit var setting: SettingsItemoverride fun bind(item: SettingsItem) {- this.item = item+ setting = itembinding.textSettingName.setText(item.nameId)binding.textSettingDescription.visibility = View.VISIBLEif (item.descriptionId!! > 0) {@@ -34,14 +34,18 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti}override fun onClick(clicked: View) {- if (item is SingleChoiceSetting) {+ if (!setting.isEditable) {+ return+ }++ if (setting is SingleChoiceSetting) {adapter.onSingleChoiceClick(- (item as SingleChoiceSetting),+ (setting as SingleChoiceSetting),bindingAdapterPosition)- } else if (item is StringSingleChoiceSetting) {+ } else if (setting is StringSingleChoiceSetting) {adapter.onStringSingleChoiceClick(- (item as StringSingleChoiceSetting),+ (setting as StringSingleChoiceSetting),bindingAdapterPosition)}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.ktindex 2d9fd11f9e..1c2f74d568 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt@@ -11,10 +11,10 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {- private lateinit var item: SliderSetting+ private lateinit var setting: SliderSettingoverride fun bind(item: SettingsItem) {- this.item = item as SliderSetting+ setting = item as SliderSettingbinding.textSettingName.setText(item.nameId)if (item.descriptionId!! > 0) {binding.textSettingDescription.setText(item.descriptionId)@@ -25,6 +25,8 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda}override fun onClick(clicked: View) {- adapter.onSliderClick(item, bindingAdapterPosition)+ if (setting.isEditable) {+ adapter.onSliderClick(setting, bindingAdapterPosition)+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex 3fedb4969f..825e9d0d09 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -13,8 +13,10 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {+ private lateinit var setting: SwitchSetting+override fun bind(item: SettingsItem) {- val setting = item as SwitchSetting+ setting = item as SwitchSettingbinding.textSettingName.setText(item.nameId)if (item.descriptionId!! > 0) {binding.textSettingDescription.setText(item.descriptionId)@@ -27,9 +29,13 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapterbinding.switchWidget.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->adapter.onBooleanClick(item, bindingAdapterPosition, binding.switchWidget.isChecked)}++ binding.switchWidget.isEnabled = setting.isEditable}override fun onClick(clicked: View) {- binding.switchWidget.toggle()+ if (setting.isEditable) {+ binding.switchWidget.toggle()+ }}}