X Tutup
Skip to content

Commit f3ca301

Browse files
Fix "Add extensions" button not working in Android
1 parent 42ad6e7 commit f3ca301

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/HandleExtensions.gd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@ func _add_internal_extensions() -> void:
9696

9797

9898
func install_extension(path: String) -> void:
99-
var file_name := path.get_file()
99+
var file_name := path.uri_decode().get_file()
100100
var err := DirAccess.copy_absolute(path, EXTENSIONS_PATH.path_join(file_name))
101101
if err != OK:
102-
print(err)
102+
var msg := tr("Extension failed to install. Error code %s (%s)") % [err, error_string(err)]
103+
Global.popup_error(msg)
103104
return
104105
_add_extension(file_name)
105106

@@ -125,13 +126,16 @@ func _add_extension(file_name: String) -> void:
125126

126127

127128
func _load_extension(extension_file_or_folder_name: StringName, internal := false) -> void:
128-
var file_name_no_ext := extension_file_or_folder_name.get_basename()
129+
var file_name_no_ext := extension_file_or_folder_name.uri_decode().get_basename()
129130
var extension_path := "res://src/Extensions/%s/" % file_name_no_ext
130131
var extension_config_file_path := extension_path.path_join("extension.json")
131132
var extension_config_file := FileAccess.open(extension_config_file_path, FileAccess.READ)
132133
var err := FileAccess.get_open_error()
133134
if err != OK:
134-
print("Error loading config file: ", err, " (", error_string(err), ")")
135+
var msg := (
136+
tr("Error loading extension config file. Error code %s (%s)") % [err, error_string(err)]
137+
)
138+
Global.popup_error(msg)
135139
if extension_config_file:
136140
extension_config_file.close()
137141
return
@@ -142,7 +146,7 @@ func _load_extension(extension_file_or_folder_name: StringName, internal := fals
142146
extension_config_file.close()
143147

144148
if not extension_json:
145-
print("No JSON data found.")
149+
Global.popup_error(tr("No JSON data found in the extension."))
146150
return
147151

148152
if extension_json.has("supported_api_versions"):

src/Preferences/ExtensionsPreferences.gd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func _ready() -> void:
2121
delete_confirmation.add_button("Move to Trash", false, Extensions.BIN_ACTION)
2222
if OS.get_name() == "Web":
2323
$HBoxContainer/AddExtensionButton.disabled = true
24-
$HBoxContainer/OpenFolderButton.visible = false
2524
else:
2625
# TODO: Remove the loop when https://github.com/godotengine/godot/issues/92848 gets fixed.
2726
for dialog_child in add_extension_file_dialog.find_children("", "Window", true, false):

src/Preferences/PreferencesDialog.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ mouse_default_cursor_shape = 2
14411441
disabled = true
14421442
text = "Uninstall"
14431443

1444-
[node name="OpenFolderButton" type="Button" parent="HSplitContainer/VBoxContainer/ScrollContainer/RightSide/Extensions/HBoxContainer" unique_id=1324879976]
1444+
[node name="OpenFolderButton" type="Button" parent="HSplitContainer/VBoxContainer/ScrollContainer/RightSide/Extensions/HBoxContainer" unique_id=1324879976 groups=["DesktopOnly"]]
14451445
layout_mode = 2
14461446
mouse_default_cursor_shape = 2
14471447
text = "Open Folder"

0 commit comments

Comments
 (0)
X Tutup