Merge pull request #2 from sergey-miryanov/master

Allow to pass haxe string as java Object to JNI
openfl · Jan 2, 2014 · 246b023 · 246b023
2 parents 65e7b0b + 94d58bf
commit 246b023
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/dependencies/extension-api/src/org/haxe/extension/Extension.java b/dependencies/extension-api/src/org/haxe/extension/Extension.java
@@ -7,6 +7,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.view.View;
 
 
 public class Extension {
@@ -16,6 +17,7 @@ public class Extension {
 	public static Handler callbackHandler;
 	public static Activity mainActivity;
 	public static Context mainContext;
+	public static View mainView;
 
 
 	/**

diff --git a/project/src/platform/android/JNI.cpp b/project/src/platform/android/JNI.cpp
@@ -600,6 +600,12 @@ bool HaxeToJNI(JNIEnv *inEnv, value inValue, JNIType inType, jvalue &out)
                jobject obj = 0;
                if (!AbstractToJObject(inValue,obj))
                {
+                  if (val_is_string(inValue))
+                  {
+                    out.l = inEnv->NewStringUTF(val_string(inValue));
+                    return true;
+                  }
+
                   ELOG("HaxeToJNI : jniObject not an object %p", inValue);
                   return false;
                }
@@ -1113,7 +1119,7 @@ struct JNIMethod : public lime::Object
             result = alloc_int(env->CallShortMethodA(inObject, mMethod, jargs));
             break;
          case jniInt:
-            result = alloc_int(env->CallIntMethodA(mClass, mMethod, jargs));
+            result = alloc_int(env->CallIntMethodA(inObject, mMethod, jargs));
             break;
          case jniLong:
             result = alloc_int(env->CallLongMethodA(inObject, mMethod, jargs));