VERY experimental Nintendo Switch 2 emulator
C++
[android] Better error handling for username collision/validity (#76)
crueter1a35aef644e8
diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmakeindex e65827290d..3e9bc26d69 100644--- a/CMakeModules/DownloadExternals.cmake+++ b/CMakeModules/DownloadExternals.cmake@@ -133,7 +133,7 @@ function(download_qt_configuration prefix_out target host type arch arch_path baset(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})else()set(prefix "${base_path}/${target}/${arch_path}")- set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qtbase)+ set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt_base)if (YUZU_USE_QT_MULTIMEDIA)set(install_args ${install_args} qtmultimedia)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.ktindex ede2cfafa4..cd3e9a4474 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt@@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.databinding.ItemBanListBindingimport org.yuzu.yuzu_emu.databinding.ItemButtonNetplayBindingimport org.yuzu.yuzu_emu.databinding.ItemTextNetplayBindingimport org.yuzu.yuzu_emu.features.settings.model.StringSetting+import org.yuzu.yuzu_emu.network.NetDataValidatorsimport org.yuzu.yuzu_emu.network.NetPlayManagerimport org.yuzu.yuzu_emu.utils.CompatUtilsimport org.yuzu.yuzu_emu.utils.GameHelper@@ -102,8 +103,16 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {dismiss()}btnLobbyBrowser.setOnClickListener {- LobbyBrowser(context).show()- dismiss()+ if (!NetDataValidators.username()) {+ Toast.makeText(+ context,+ R.string.multiplayer_nickname_invalid,+ Toast.LENGTH_LONG+ ).show()+ } else {+ LobbyBrowser(context).show()+ dismiss()+ }}}}@@ -368,7 +377,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {)) {override fun validate(s: String): Boolean {- return s.length in 3..20+ return NetDataValidators.roomName(s)}}@@ -378,7 +387,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {context.getString(R.string.multiplayer_required)) {override fun validate(s: String): Boolean {- return s.isNotEmpty()+ return NetDataValidators.notEmpty(s)}}@@ -388,12 +397,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {context.getString(R.string.multiplayer_token_required)) {override fun validate(s: String): Boolean {- if (s != context.getString(R.string.multiplayer_public_visibility)) {- return true;- }-- val token = StringSetting.WEB_TOKEN.getString()- return token.matches(Regex("[a-z]{48}"))+ return NetDataValidators.roomVisibility(s, context)}}@@ -403,12 +407,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {context.getString(R.string.multiplayer_ip_error)) {override fun validate(s: String): Boolean {- return try {- InetAddress.getByName(s)- s.length >= 7- } catch (_: Exception) {- false- }+ return NetDataValidators.ipAddress(s)}}@@ -418,7 +417,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {context.getString(R.string.multiplayer_username_error)) {override fun validate(s: String): Boolean {- return s.length in 4..20+ return NetDataValidators.username(s)}}@@ -428,7 +427,7 @@ class NetPlayDialog(context: Context) : BottomSheetDialog(context) {context.getString(R.string.multiplayer_port_error)) {override fun validate(s: String): Boolean {- return s.toIntOrNull() in 1..65535+ return NetDataValidators.port(s)}}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 ab35a9180c..a269cab254 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@@ -20,6 +20,7 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.LongSettingimport org.yuzu.yuzu_emu.features.settings.model.ShortSettingimport org.yuzu.yuzu_emu.features.settings.model.StringSetting+import org.yuzu.yuzu_emu.network.NetDataValidatorsimport org.yuzu.yuzu_emu.utils.GpuDriverHelperimport org.yuzu.yuzu_emu.utils.NativeConfig@@ -300,9 +301,7 @@ abstract class SettingsItem(val chars = "abcdefghijklmnopqrstuvwxyz"(1..48).map { chars.random() }.joinToString("")},- validator = { s ->- s?.matches(Regex("[a-z]{48}")) == true- },+ validator = NetDataValidators::token,errorId = R.string.multiplayer_token_error))@@ -312,9 +311,7 @@ abstract class SettingsItem(StringSetting.WEB_USERNAME,titleId = R.string.web_username,descriptionId = R.string.web_username_description,- validator = { s ->- s?.length in 4..20- },+ validator = NetDataValidators::username,errorId = R.string.multiplayer_username_error))diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.ktindex e50ebe50f4..aa17d05e34 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsDialogFragment.kt@@ -154,8 +154,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListenerstringInputBinding.generate.setOnClickListener {stringInputBinding.editText.setText(onGenerate())}- } else {- stringInputBinding.generate.isVisible = false}val validator = item.validator@@ -179,8 +177,9 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener}override fun afterTextChanged(s: Editable?) {- stringInputBinding.editText.error =- if (validator(s.toString())) null else requireContext().getString(item.errorId)+ val isValid = validator(s.toString())+ stringInputBinding.editTextLayout.isErrorEnabled = !isValid+ stringInputBinding.editTextLayout.error = if (isValid) null else requireContext().getString(item.errorId)}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/network/NetDataValidators.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/network/NetDataValidators.ktnew file mode 100644index 0000000000..b3edf35d8e--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/network/NetDataValidators.kt@@ -0,0 +1,56 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later++package org.yuzu.yuzu_emu.network++import android.content.Context+import org.yuzu.yuzu_emu.R+import org.yuzu.yuzu_emu.features.settings.model.StringSetting+import java.net.InetAddress++object NetDataValidators {+ fun roomName(s: String): Boolean {+ return s.length in 3..20+ }++ fun notEmpty(s: String): Boolean {+ return s.isNotEmpty()+ }++ fun token(s: String?): Boolean {+ return s?.matches(Regex("[a-z]{48}")) == true+ }++ fun token(): Boolean {+ return token(StringSetting.WEB_TOKEN.getString())+ }++ fun roomVisibility(s: String, context: Context): Boolean {+ if (s != context.getString(R.string.multiplayer_public_visibility)) {+ return true;+ }++ return token()+ }++ fun ipAddress(s: String): Boolean {+ return try {+ InetAddress.getByName(s)+ s.length >= 7+ } catch (_: Exception) {+ false+ }+ }++ fun username(s: String?): Boolean {+ return s?.matches(Regex("^[ a-zA-Z0-9._-]{4,20}$")) == true+ }++ fun username(): Boolean {+ return username(StringSetting.WEB_USERNAME.getString())+ }++ fun port(s: String): Boolean {+ return s.toIntOrNull() in 1..65535+ }+}\ No newline at end of filediff --git a/src/android/app/src/main/res/layout/dialog_edit_text.xml b/src/android/app/src/main/res/layout/dialog_edit_text.xmlindex 3612f46eae..bc7864a395 100644--- a/src/android/app/src/main/res/layout/dialog_edit_text.xml+++ b/src/android/app/src/main/res/layout/dialog_edit_text.xml@@ -27,6 +27,7 @@android:layout_height="wrap_content"android:layout_marginTop="15dp"android:text="@string/generate"+ android:visibility="gone"app:layout_constraintEnd_toEndOf="@+id/edit_text_layout"app:layout_constraintTop_toBottomOf="@+id/edit_text_layout" />diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex e611e66c1f..3814105ea0 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -148,18 +148,18 @@<string name="multiplayer_join_room_failed">Failed to join room</string><string name="multiplayer_name_invalid">Name is too short</string><string name="multiplayer_address_invalid">Invalid address</string>- <string name="multiplayer_port_invalid">Invalid port!</string>+ <string name="multiplayer_port_invalid">Invalid port</string><string name="multiplayer_exit_room">Exit Room</string><string name="multiplayer_network_error">Network error</string><string name="multiplayer_lost_connection">Lost connection</string>- <string name="multiplayer_name_collision">Name collision</string>+ <string name="multiplayer_name_collision">Username already taken</string><string name="multiplayer_mac_collision">MAC Address collision</string><string name="multiplayer_console_id_collision">Console ID collision</string><string name="multiplayer_wrong_version">Wrong version</string><string name="multiplayer_wrong_password">Wrong password</string><string name="multiplayer_could_not_connect">Could not connect</string><string name="multiplayer_room_is_full">Room is full</string>- <string name="multiplayer_host_banned">Host banned</string>+ <string name="multiplayer_host_banned">You are banned from this room</string><string name="multiplayer_permission_denied">Permission denied</string><string name="multiplayer_no_such_user">No such user</string><string name="multiplayer_already_in_room">Already in room</string>@@ -221,7 +221,8 @@<string name="multiplayer_required">Required</string><string name="multiplayer_token_required">Web Token required, go to Advanced Settings -> System -> Network</string><string name="multiplayer_ip_error">Invalid IP format</string>- <string name="multiplayer_username_error">Must be between 4–20 characters</string>+ <string name="multiplayer_username_error">Must be between 4–20 characters, and contain alphanumeric characters, periods, dashes, underscores, and spaces only</string>+ <string name="multiplayer_nickname_invalid">Username invalid, ensure it is set properly in System -> Network</string><string name="multiplayer_token_error">Must be 48 characters, and lowercase a-z only</string><string name="multiplayer_port_error">Must be between 1 and 65535</string><string name="cancel">Cancel</string>@@ -467,7 +468,7 @@<string name="web_token">Web Token</string><string name="web_token_description">Web token used for creating public lobbies. It is a 48-character string containing only lowercase a-z.</string><string name="web_username">Web Username</string>- <string name="web_username_description">Username to be shown in multiplayer lobbies. It must be 4–20 characters.</string>+ <string name="web_username_description">Username to be shown in multiplayer lobbies. It must be 4–20 characters, containing only alphanumeric characters, dashes, periods, underscores, and spaces.</string><string name="network">Network</string><!-- Graphics settings strings -->