Android: Renamed SDLActivity's Java method used for APK expansion files. The name was not correct.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index cbb055f..48d0ede 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -669,7 +669,7 @@ public class SDLActivity extends Activity {
}
}
- // APK extension files support
+ // APK expansion files support
/** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
private Object expansionFile;
@@ -678,16 +678,25 @@ public class SDLActivity extends Activity {
private Method expansionFileMethod;
/**
- * This method is called by SDL using JNI.
+ * This method was called by SDL using JNI.
+ * @deprecated because of an incorrect name
*/
+ @Deprecated
public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
+ return openAPKExpansionInputStream(fileName);
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public InputStream openAPKExpansionInputStream(String fileName) throws IOException {
// Get a ZipResourceFile representing a merger of both the main and patch files
if (expansionFile == null) {
Integer mainVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"));
Integer patchVersion = Integer.valueOf(nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"));
try {
- // To avoid direct dependency on Google APK extension library that is
+ // To avoid direct dependency on Google APK expansion library that is
// not a part of Android SDK we access it using reflection
expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
.getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index e47203c..d16d4be 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -785,9 +785,9 @@ fallback:
"open", "(Ljava/lang/String;I)Ljava/io/InputStream;");
inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /* ACCESS_RANDOM */);
if (Android_JNI_ExceptionOccurred(SDL_FALSE)) {
- // Try fallback to APK Extension files
+ /* Try fallback to APK expansion files */
mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, context),
- "openAPKExtensionInputStream", "(Ljava/lang/String;)Ljava/io/InputStream;");
+ "openAPKExpansionInputStream", "(Ljava/lang/String;)Ljava/io/InputStream;");
inputStream = (*mEnv)->CallObjectMethod(mEnv, context, mid, fileNameJString);
if (Android_JNI_ExceptionOccurred(SDL_FALSE)) {