Skip to content
Permalink
Browse files

Android: Added additional error messages for APK expansion file use.

  • Loading branch information
philippwiesemann committed Sep 17, 2015
1 parent 6e7c479 commit 625d39b164301759f2a5b9197086f3af0dd9f5a8
Showing with 14 additions and 4 deletions.
  1. +14 −4 android-project/src/org/libsdl/app/SDLActivity.java
@@ -703,8 +703,15 @@ public InputStream openAPKExpansionInputStream(String fileName) throws IOExcepti
return null; // no expansion use if no patch version was set
}

Integer mainVersion = Integer.valueOf(mainHint);
Integer patchVersion = Integer.valueOf(patchHint);
Integer mainVersion;
Integer patchVersion;
try {
mainVersion = Integer.valueOf(mainHint);
patchVersion = Integer.valueOf(patchHint);
} catch (NumberFormatException ex) {
ex.printStackTrace();
throw new IOException("No valid file versions set for APK expansion files", ex);
}

try {
// To avoid direct dependency on Google APK expansion library that is
@@ -719,6 +726,7 @@ public InputStream openAPKExpansionInputStream(String fileName) throws IOExcepti
ex.printStackTrace();
expansionFile = null;
expansionFileMethod = null;
throw new IOException("Could not access APK expansion support library", ex);
}
}

@@ -727,12 +735,14 @@ public InputStream openAPKExpansionInputStream(String fileName) throws IOExcepti
try {
fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName);
} catch (Exception ex) {
// calling "getInputStream" failed
ex.printStackTrace();
fileStream = null;
throw new IOException("Could not open stream from APK expansion file", ex);
}

if (fileStream == null) {
throw new IOException();
// calling "getInputStream" was successful but null was returned
throw new IOException("Could not open stream from APK expansion file");
}

return fileStream;

0 comments on commit 625d39b

Please sign in to comment.