asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Web: Clarify that OS.get_unique_id is not supported

Browse source 
Remove the base error message in `OS`, we no longer really error out this
way for not implemented methods. Instead, each platform should override them
to provide the context they want.

Fixes #82439.
This commit is contained in:
Rémi Verschelde 2023-09-27 15:17:02 +02:00
parent ec62b8a3ee
commit 0a10f09ce4
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/os/os.cpp
View file

@ -355,7 +355,7 @@ void OS::set_cmdline(const char *p_execpath, const List<String> &p_args, const L
} }
String OS::get_unique_id() const { String OS::get_unique_id() const {
ERR_FAIL_V(""); return "";
} }
int OS::get_processor_count() const { int OS::get_processor_count() const {

2
doc/classes/OS.xml
View file

@ -449,7 +449,7 @@
<description> <description>
Returns a string that is unique to the device. Returns a string that is unique to the device.
[b]Note:[/b] This string may change without notice if the user reinstalls/upgrades their operating system or changes their hardware. This means it should generally not be used to encrypt persistent data as the data saved before an unexpected ID change would become inaccessible. The returned string may also be falsified using external programs, so do not rely on the string returned by [method get_unique_id] for security purposes. [b]Note:[/b] This string may change without notice if the user reinstalls/upgrades their operating system or changes their hardware. This means it should generally not be used to encrypt persistent data as the data saved before an unexpected ID change would become inaccessible. The returned string may also be falsified using external programs, so do not rely on the string returned by [method get_unique_id] for security purposes.
[b]Note:[/b] Returns an empty string on Web, as this method isn't implemented on this platform yet. [b]Note:[/b] Returns an empty string and prints an error on Web, as this method cannot be implemented on this platform.
</description> </description>
</method> </method>
<method name="get_user_data_dir" qualifiers="const"> <method name="get_user_data_dir" qualifiers="const">

4
platform/web/os_web.cpp
View file

@ -132,6 +132,10 @@ int OS_Web::get_processor_count() const {
return godot_js_os_hw_concurrency_get(); return godot_js_os_hw_concurrency_get();
} }
String OS_Web::get_unique_id() const {
ERR_FAIL_V_MSG("", "OS::get_unique_id() is not available on the Web platform.");
}
bool OS_Web::_check_internal_feature_support(const String &p_feature) { bool OS_Web::_check_internal_feature_support(const String &p_feature) {
if (p_feature == "web") { if (p_feature == "web") {
return true; return true;

1
platform/web/os_web.h
View file

@ -83,6 +83,7 @@ public:
int get_process_id() const override; int get_process_id() const override;
bool is_process_running(const ProcessID &p_pid) const override; bool is_process_running(const ProcessID &p_pid) const override;
int get_processor_count() const override; int get_processor_count() const override;
String get_unique_id() const override;
int get_default_thread_pool_size() const override { return 1; } int get_default_thread_pool_size() const override { return 1; }
String get_executable_path() const override; String get_executable_path() const override;