Browse Source

[android, frontend_common] Remove network/logging sections and fix airplane mode in per-game (#3384)

Fixed an issue with airplane settings

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3384
Reviewed-by: DraVee <dravee@eden-emu.dev>
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Co-authored-by: PavelBARABANOV <pavelbarabanov94@gmail.com>
Co-committed-by: PavelBARABANOV <pavelbarabanov94@gmail.com>
pull/3386/head
PavelBARABANOV 2 weeks ago
committed by crueter
parent
commit
6504c7cc4c
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 14
      src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
  2. 6
      src/frontend_common/config.cpp

14
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@ -242,9 +242,11 @@ class SettingsFragmentPresenter(
add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key) add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key)
add(IntSetting.CPU_TICKS.key) add(IntSetting.CPU_TICKS.key)
add(HeaderSetting(R.string.network))
add(StringSetting.WEB_TOKEN.key)
add(StringSetting.WEB_USERNAME.key)
if (!NativeConfig.isPerGameConfigLoaded()) {
add(HeaderSetting(R.string.network))
add(StringSetting.WEB_TOKEN.key)
add(StringSetting.WEB_USERNAME.key)
}
} }
} }
@ -1206,9 +1208,11 @@ class SettingsFragmentPresenter(
add(SettingsItem.FASTMEM_COMBINED) add(SettingsItem.FASTMEM_COMBINED)
add(BooleanSetting.CPUOPT_UNSAFE_HOST_MMU.key) add(BooleanSetting.CPUOPT_UNSAFE_HOST_MMU.key)
add(HeaderSetting(R.string.log))
if (!NativeConfig.isPerGameConfigLoaded()) {
add(HeaderSetting(R.string.log))
add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
}
add(HeaderSetting(R.string.general)) add(HeaderSetting(R.string.general))

6
src/frontend_common/config.cpp

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@ -423,12 +423,12 @@ void Config::ReadValues() {
ReadDataStorageValues(); ReadDataStorageValues();
ReadDebuggingValues(); ReadDebuggingValues();
ReadDisabledAddOnValues(); ReadDisabledAddOnValues();
ReadNetworkValues();
ReadServiceValues(); ReadServiceValues();
ReadWebServiceValues(); ReadWebServiceValues();
ReadMiscellaneousValues(); ReadMiscellaneousValues();
ReadLibraryAppletValues(); ReadLibraryAppletValues();
} }
ReadNetworkValues();
ReadControlValues(); ReadControlValues();
ReadCoreValues(); ReadCoreValues();
ReadCpuValues(); ReadCpuValues();
@ -522,13 +522,13 @@ void Config::SaveValues() {
SaveDataStorageValues(); SaveDataStorageValues();
SaveDebuggingValues(); SaveDebuggingValues();
SaveDisabledAddOnValues(); SaveDisabledAddOnValues();
SaveNetworkValues();
SaveWebServiceValues(); SaveWebServiceValues();
SaveMiscellaneousValues(); SaveMiscellaneousValues();
SaveLibraryAppletValues(); SaveLibraryAppletValues();
} else { } else {
LOG_DEBUG(Config, "Saving only generic configuration values"); LOG_DEBUG(Config, "Saving only generic configuration values");
} }
SaveNetworkValues();
SaveControlValues(); SaveControlValues();
SaveCoreValues(); SaveCoreValues();
SaveCpuValues(); SaveCpuValues();

Loading…
Cancel
Save