fix access to java env in jnius from the python service + save the instance of the service within a static public PythonService.mService.

tito · tito · commit 63a8722e0765 · 2013-05-11T09:55:52.000+02:00
diff --git a/src/jni/sdl/src/video/android/SDL_androidvideo.c b/src/jni/sdl/src/video/android/SDL_androidvideo.c
@@ -151,3 +151,9 @@ JAVA_EXPORT_NAME(SDLSurfaceView_nativeInitJavaCallbacks) ( JNIEnv*  env, jobject
 	
 	ANDROID_InitOSKeymap();	
 }
+
+JNIEXPORT void JNICALL
+JAVA_EXPORT_NAME(PythonService_nativeInitJavaEnv) ( JNIEnv*  env, jobject thiz )
+{
+	JavaEnv = env;
+}
diff --git a/src/src/org/renpy/android/PythonService.java b/src/src/org/renpy/android/PythonService.java
@@ -8,7 +8,7 @@
 import android.util.Log;
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.os.Process; 
+import android.os.Process;
 
 public class PythonService extends Service  implements Runnable {
 
@@ -22,6 +22,7 @@ public class PythonService extends Service  implements Runnable {
     private String pythonPath;
     // Argument to pass to Python code,
     private String pythonServiceArgument;
+    public Service mService = null;
 
     @Override
     public IBinder onBind(Intent arg0) {
@@ -101,6 +102,8 @@ public void run(){
         } catch(UnsatisfiedLinkError e) {
         }
 
+        this.mService = this;
+        nativeInitJavaEnv();
         nativeStart(androidPrivate, androidArgument, pythonHome, pythonPath,
                 pythonServiceArgument);
     }
@@ -110,4 +113,6 @@ public static native void nativeStart(String androidPrivate, String androidArgum
             String pythonHome, String pythonPath,
             String pythonServiceArgument);
 
+    public static native void nativeInitJavaEnv();
+
 }

Original file line number	Diff line number	Diff line change
`@@ -151,3 +151,9 @@ JAVA_EXPORT_NAME(SDLSurfaceView_nativeInitJavaCallbacks) ( JNIEnv* env, jobject`
`151`	`151`
`152`	`152`	`ANDROID_InitOSKeymap();`
`153`	`153`	`}`
	`154`	`+`
	`155`	`+JNIEXPORT void JNICALL`
	`156`	`+JAVA_EXPORT_NAME(PythonService_nativeInitJavaEnv) ( JNIEnv* env, jobject thiz )`
	`157`	`+{`
	`158`	`+ JavaEnv = env;`
	`159`	`+}`