From 3cdae42d6500619f9105134606e722f1fa49c847 Mon Sep 17 00:00:00 2001 From: stopiccot Date: Wed, 23 Apr 2014 03:42:32 +0300 Subject: [PATCH] Fixing issues discovered by Philipp Wiesemann --- android-project/src/org/libsdl/app/SDLActivity.java | 6 +++--- include/SDL_hints.h | 2 +- src/core/android/SDL_android.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java index b4c6569e25a5f..a717ef1cf6f71 100644 --- a/android-project/src/org/libsdl/app/SDLActivity.java +++ b/android-project/src/org/libsdl/app/SDLActivity.java @@ -300,7 +300,7 @@ public static native int nativeAddJoystick(int device_id, String name, int is_accelerometer, int nbuttons, int naxes, int nhats, int nballs); public static native int nativeRemoveJoystick(int device_id); - public static native String getHint(String name); + public static native String nativeGetHint(String name); public static void flipBuffers() { SDLActivity.nativeFlipBuffers(); @@ -507,8 +507,8 @@ public static void pollInputDevices() { public InputStream openAPKExtensionInputStream(String fileName) throws IOException { // Get a ZipResourceFile representing a merger of both the main and patch files if (expansionFile == null) { - Integer mainVersion = Integer.parseInt(getHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION")); - Integer patchVersion = Integer.parseInt(getHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION")); + Integer mainVersion = Integer.parseInt(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION")); + Integer patchVersion = Integer.parseInt(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION")); expansionFile = APKExpansionSupport.getAPKExpansionZipFile(this, mainVersion, patchVersion); } diff --git a/include/SDL_hints.h b/include/SDL_hints.h index 46ebef048533a..90d34532af19a 100644 --- a/include/SDL_hints.h +++ b/include/SDL_hints.h @@ -443,7 +443,7 @@ extern "C" { /** * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc. */ -#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_PATCH_VERSION" +#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION" /** diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c index 555c4edbc3f78..d4bc2d861c260 100644 --- a/src/core/android/SDL_android.c +++ b/src/core/android/SDL_android.c @@ -385,7 +385,7 @@ void Java_org_libsdl_app_SDLInputConnection_nativeSetComposingText( (*env)->ReleaseStringUTFChars(env, text, utftext); } -jstring Java_org_libsdl_app_SDLActivity_getHint(JNIEnv* env, jclass cls, jstring name) { +jstring Java_org_libsdl_app_SDLActivity_nativeGetHint(JNIEnv* env, jclass cls, jstring name) { const char *utfname = (*env)->GetStringUTFChars(env, name, NULL); const char *hint = SDL_GetHint(utfname);