Ver Fonte

Fix string array parameter check with jni

volzhs há 9 anos atrás
pai
commit
456b7733fc
2 ficheiros alterados com 4 adições e 4 exclusões
  1. 2 2
      platform/android/godot_android.cpp
  2. 2 2
      platform/android/java_glue.cpp

+ 2 - 2
platform/android/godot_android.cpp

@@ -910,7 +910,7 @@ static Variant::Type get_jni_type(const String& p_type) {
 		{"java.lang.String",Variant::STRING},
 		{"[I",Variant::INT_ARRAY},
 		{"[F",Variant::REAL_ARRAY},
-		{"[java.lang.String",Variant::STRING_ARRAY},
+		{"[Ljava.lang.String;",Variant::STRING_ARRAY},
 		{NULL,Variant::NIL}
 	};
 
@@ -941,7 +941,7 @@ static const char* get_jni_sig(const String& p_type) {
 		{"java.lang.String","Ljava/lang/String;"},
 		{"[I","[I"},
 		{"[F","[F"},
-		{"[java.lang.String","[Ljava/lang/String;"},
+		{"[Ljava.lang.String;","[Ljava/lang/String;"},
 		{NULL,"V"}
 	};
 

+ 2 - 2
platform/android/java_glue.cpp

@@ -1563,7 +1563,7 @@ static Variant::Type get_jni_type(const String& p_type) {
 		{"[I",Variant::INT_ARRAY},
 		{"[B",Variant::RAW_ARRAY},
 		{"[F",Variant::REAL_ARRAY},
-		{"[java.lang.String",Variant::STRING_ARRAY},
+		{"[Ljava.lang.String;",Variant::STRING_ARRAY},
 		{"org.godotengine.godot.Dictionary", Variant::DICTIONARY},
 		{NULL,Variant::NIL}
 	};
@@ -1599,7 +1599,7 @@ static const char* get_jni_sig(const String& p_type) {
 		{"[I","[I"},
 		{"[B","[B"},
 		{"[F","[F"},
-		{"[java.lang.String","[Ljava/lang/String;"},
+		{"[Ljava.lang.String;","[Ljava/lang/String;"},
 		{NULL,"V"}
 	};