gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-11-02 14:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change custom permissions in Android export to an array

Browse source 
Don't limit the amount of permissions and makes it simpler to
understand.
This commit is contained in:
George Marques 2018-11-30 11:13:50 -02:00
parent 5b8dde4b4a
commit 22233ded4a
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
platform/android/export/export.cpp
View file

@ -672,10 +672,13 @@ class EditorExportAndroid : public EditorExportPlatform {
aperms++;
}
for (int i = 0; i < MAX_USER_PERMISSIONS; i++) {
String user_perm = p_preset->get("user_permissions/" + itos(i));
if (user_perm.strip_edges() != "" && user_perm.strip_edges() != "False")
perms.push_back(user_perm.strip_edges());
PoolStringArray user_perms = p_preset->get("permissions/custom_permissions");
for (int i = 0; i < user_perms.size(); i++) {
String user_perm = user_perms[i].strip_edges();
if (!user_perm.empty()) {
perms.push_back(user_perm);
}
}
if (p_give_internet) {
@ -1104,10 +1107,6 @@ class EditorExportAndroid : public EditorExportPlatform {
}
public:
enum {
MAX_USER_PERMISSIONS = 20
};
typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total);
public:
@ -1169,17 +1168,14 @@ public:
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + abi), is_default));
}
r_options->push_back(ExportOption(PropertyInfo(Variant::POOL_STRING_ARRAY, "permissions/custom_permissions"), PoolStringArray()));
const char **perms = android_perms;
while (*perms) {
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "permissions/" + String(*perms).to_lower()), false));
perms++;
}
for (int i = 0; i < MAX_USER_PERMISSIONS; i++) {
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "user_permissions/" + itos(i)), false));
}
}
virtual String get_name() const {