diff --git a/android-project/app/src/main/java/org/libsdl/app/SDL.java b/android-project/app/src/main/java/org/libsdl/app/SDL.java index d5d3d69ae7..d9650a72e4 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDL.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDL.java @@ -1,8 +1,8 @@ package org.libsdl.app; +import android.app.Activity; import android.content.Context; -import java.lang.Class; import java.lang.reflect.Method; /** @@ -28,12 +28,12 @@ public class SDL { } // This function stores the current activity (SDL or not) - static public void setContext(Context context) { + static public void setContext(Activity context) { SDLAudioManager.setContext(context); mContext = context; } - static public Context getContext() { + static public Activity getContext() { return mContext; } @@ -86,5 +86,5 @@ public class SDL { } } - protected static Context mContext; + protected static Activity mContext; } diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index 61b4b8d51e..59d03a03d0 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -1262,7 +1262,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh /** * This method is called by SDL using JNI. */ - public static Context getContext() { + public static Activity getContext() { return SDL.getContext(); } diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c index cd12a58bb4..33d7815ff4 100644 --- a/src/core/android/SDL_android.c +++ b/src/core/android/SDL_android.c @@ -635,7 +635,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl midClipboardSetText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardSetText", "(Ljava/lang/String;)V"); midCreateCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "createCustomCursor", "([IIIII)I"); midDestroyCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "destroyCustomCursor", "(I)V"); - midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;"); + midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/app/Activity;"); midGetManifestEnvironmentVariables = (*env)->GetStaticMethodID(env, mActivityClass, "getManifestEnvironmentVariables", "()Z"); midGetNativeSurface = (*env)->GetStaticMethodID(env, mActivityClass, "getNativeSurface", "()Landroid/view/Surface;"); midInitTouch = (*env)->GetStaticMethodID(env, mActivityClass, "initTouch", "()V");