From 79683f7beb2e376fd018c010732b450415b23471 Mon Sep 17 00:00:00 2001 From: Dima Date: Thu, 20 Apr 2023 16:16:58 +0300 Subject: [PATCH] Add setting to enable internet Co-authored-by: PabloG02 --- app/src/main/cpp/skyline/common/android_settings.h | 1 + app/src/main/cpp/skyline/common/settings.h | 1 + app/src/main/java/emu/skyline/settings/EmulationSettings.kt | 1 + app/src/main/java/emu/skyline/settings/NativeSettings.kt | 2 ++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/emulation_preferences.xml | 5 +++++ 6 files changed, 11 insertions(+) diff --git a/app/src/main/cpp/skyline/common/android_settings.h b/app/src/main/cpp/skyline/common/android_settings.h index b422fa51..ffbe9bf6 100644 --- a/app/src/main/cpp/skyline/common/android_settings.h +++ b/app/src/main/cpp/skyline/common/android_settings.h @@ -36,6 +36,7 @@ namespace skyline { profilePictureValue = ktSettings.GetString("profilePictureValue"); systemLanguage = ktSettings.GetInt("systemLanguage"); systemRegion = ktSettings.GetInt("systemRegion"); + isInternetEnabled = ktSettings.GetBool("isInternetEnabled"); forceTripleBuffering = ktSettings.GetBool("forceTripleBuffering"); disableFrameThrottling = ktSettings.GetBool("disableFrameThrottling"); gpuDriver = ktSettings.GetString("gpuDriver"); diff --git a/app/src/main/cpp/skyline/common/settings.h b/app/src/main/cpp/skyline/common/settings.h index e14c5834..40336a73 100644 --- a/app/src/main/cpp/skyline/common/settings.h +++ b/app/src/main/cpp/skyline/common/settings.h @@ -64,6 +64,7 @@ namespace skyline { Setting profilePictureValue; //!< The profile picture path to be supplied to the guest Setting systemLanguage; //!< The system language Setting systemRegion; //!< The system region + Setting isInternetEnabled; //!< If emulator uses internet // Display Setting forceTripleBuffering; //!< If the presentation engine should always triple buffer even if the swapchain supports double buffering diff --git a/app/src/main/java/emu/skyline/settings/EmulationSettings.kt b/app/src/main/java/emu/skyline/settings/EmulationSettings.kt index 3ba61123..362992fe 100644 --- a/app/src/main/java/emu/skyline/settings/EmulationSettings.kt +++ b/app/src/main/java/emu/skyline/settings/EmulationSettings.kt @@ -29,6 +29,7 @@ class EmulationSettings private constructor(context : Context, prefName : String var profilePictureValue by sharedPreferences(context, "", prefName = prefName) var systemLanguage by sharedPreferences(context, 1, prefName = prefName) var systemRegion by sharedPreferences(context, -1, prefName = prefName) + var isInternetEnabled by sharedPreferences(context, false, prefName = prefName) // Audio var isAudioOutputDisabled by sharedPreferences(context, false, prefName = prefName) diff --git a/app/src/main/java/emu/skyline/settings/NativeSettings.kt b/app/src/main/java/emu/skyline/settings/NativeSettings.kt index ad75b564..7e6ab353 100644 --- a/app/src/main/java/emu/skyline/settings/NativeSettings.kt +++ b/app/src/main/java/emu/skyline/settings/NativeSettings.kt @@ -22,6 +22,7 @@ data class NativeSettings( var profilePictureValue : String, var systemLanguage : Int, var systemRegion : Int, + var isInternetEnabled : Boolean, // Audio var isAudioOutputDisabled : Boolean, @@ -52,6 +53,7 @@ data class NativeSettings( pref.profilePictureValue, pref.systemLanguage, pref.systemRegion, + pref.isInternetEnabled, pref.isAudioOutputDisabled, if (pref.gpuDriver == EmulationSettings.SYSTEM_GPU_DRIVER) "" else pref.gpuDriver, if (pref.gpuDriver == EmulationSettings.SYSTEM_GPU_DRIVER) "" else GpuDriverHelper.getLibraryName(context, pref.gpuDriver), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05426883..58af1f2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -78,6 +78,7 @@ Profile Picture System Language System Region + The system will be able to use internet Display Show Performance Statistics diff --git a/app/src/main/res/xml/emulation_preferences.xml b/app/src/main/res/xml/emulation_preferences.xml index 7cb111a3..1a08e421 100644 --- a/app/src/main/res/xml/emulation_preferences.xml +++ b/app/src/main/res/xml/emulation_preferences.xml @@ -32,6 +32,11 @@ app:key="system_region" app:title="@string/system_region" app:useSimpleSummaryProvider="true" /> +