url: patched to compile on Android.

libsdl-org · Oct 5, 2020 · 5f68812 · 5f68812
1 parent 84f1b95
commit 5f68812
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
@@ -2284,6 +2284,11 @@ void *SDL_AndroidGetActivity(void)
     return (*env)->CallStaticObjectMethod(env, mActivityClass, midGetContext);
 }
 
+jclass Android_GetActivityClass(void)
+{
+    return mActivityClass;
+}
+
 int SDL_GetAndroidSDKVersion(void)
 {
     static int sdk_version;

diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
@@ -140,6 +140,8 @@ void Android_ActivityMutex_Lock(void);
 void Android_ActivityMutex_Unlock(void);
 void Android_ActivityMutex_Lock_Running(void);
 
+jclass Android_GetActivityClass(void);
+
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */

diff --git a/src/misc/SDL_url.c b/src/misc/SDL_url.c
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../SDL_internal.h"
 #include "SDL_error.h"
 

diff --git a/src/misc/android/SDL_sysurl.c b/src/misc/android/SDL_sysurl.c
@@ -25,6 +25,7 @@
 int
 SDL_SYS_OpenURL(const char *url)
 {
+    jclass mActivityClass = Android_GetActivityClass();
     JNIEnv *env = Android_JNI_GetEnv();
     jstring jurl = (*env)->NewStringUTF(env, url);
     const int ret = (*env)->CallStaticIntMethod(env, mActivityClass, midOpenURL, jurl);