add support for android in webbrowser python module. Merged from pgs4a, thanks tom!

tito · tito · commit e79c8b57a6d1 · 2012-04-17T01:48:53.000+02:00
diff --git a/recipes/android/src/android.pyx b/recipes/android/src/android.pyx
@@ -227,3 +227,22 @@ def check_stop():
 
 def ack_stop():
     android_ackstop()
+
+# -------------------------------------------------------------------
+# URL Opening.
+cdef extern void android_open_url(char *url)
+def open_url(url):
+    android_open_url(url)
+
+# Web browser support.
+class AndroidBrowser(object):
+    def open(self, url, new=0, autoraise=True):
+        open_url(url)
+    def open_new(self, url):
+        open_url(url)
+    def open_new_tab(self, url):
+        open_url(url)
+
+import webbrowser
+webbrowser.register('android', AndroidBrowser, None, -1)
+
diff --git a/recipes/android/src/android_jni.c b/recipes/android/src/android_jni.c
@@ -286,3 +286,28 @@ void android_action_send(char *mimeType, char *filename, char *subject, char *te
 		j_mimeType, j_filename, j_subject, j_text,
 		j_chooser_title);
 }
+
+void android_open_url(char *url) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/SDLSurfaceView");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "openUrl", "(Ljava/lang/String;)V");
+        aassert(mid);
+    }
+
+    PUSH_FRAME;
+
+    (*env)->CallStaticVoidMethod(
+        env, cls, mid,
+        (*env)->NewStringUTF(env, url)
+        );
+
+    POP_FRAME;
+}
+
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -29,13 +29,15 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.opengl.GLSurfaceView;
 import android.view.MotionEvent;
 import android.view.KeyEvent;
+import android.net.Uri;
 import android.os.PowerManager;
 
 import java.io.IOException;
@@ -262,7 +264,7 @@ private void printConfig(EGL10 egl, EGLDisplay display,
 	}
 
     // The activity we're a part of.
-    private Activity mActivity;
+    private static Activity mActivity;
 
     // Have we started yet?
     public boolean mStarted = false;
@@ -937,6 +939,14 @@ static void activateInput() {
         mInputActivated = true;
     }
 
+	static void openUrl(String url) {
+		Log.i("python", "Opening URL: " + url);
+
+		Intent i = new Intent(Intent.ACTION_VIEW);
+		i.setData(Uri.parse(url));
+		mActivity.startActivity(i);
+	}
+
 	// Taken from the "GLES20TriangleRenderer" in Android SDK
 	private int loadShader(int shaderType, String source) {
         int shader = GLES20.glCreateShader(shaderType);
