commit bf6476849b108273fab4568cfe18a98b2e82ed61
author stopiccot <alexey.petruchik@gmail.com> Wed Apr 23 03:42:32 2014 +0300
committer stopiccot <alexey.petruchik@gmail.com> Wed Apr 23 03:42:32 2014 +0300
tree c5bf2fda5486159e2531b1a549aa4e8214b48573
parent a2968dab76359fc843258223ea2e12053159c607

Fixing issues discovered by Philipp Wiesemann

android-project/src/org/libsdl/app/SDLActivity.java

diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index b4c6569..a717ef1 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -300,7 +300,7 @@
                                                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 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);
         }

include/SDL_hints.h

diff --git a/include/SDL_hints.h b/include/SDL_hints.h
index 46ebef0..90d3453 100644
--- a/include/SDL_hints.h
+++ b/include/SDL_hints.h
@@ -443,7 +443,7 @@
 /**
  * \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"
 
 
 /**

src/core/android/SDL_android.c

diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 555c4ed..d4bc2d8 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -385,7 +385,7 @@
     (*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);