Cleanup PR MobileChromeApps#14: Handle null returns from mapUriToFile.

EduardoKrausME · Feb 19, 2014 · 36ba589 · 36ba589
1 parent a1de053
commit 36ba589
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/android/Zip.java b/src/android/Zip.java
@@ -53,15 +53,14 @@ private void unzipSync(CordovaArgs args, CallbackContext callbackContext) {
             CordovaResourceApi resourceApi = webView.getResourceApi();
 
             File tempFile = resourceApi.mapUriToFile(zipUri);
-            boolean ex = tempFile.exists();
-            if(!ex) {
-                Log.e(LOG_TAG, "Doesn't exist");
+            if(tempFile == null || !tempFile.exists()) {
+                Log.e(LOG_TAG, "Zip file does not exist");
             }
 
             File outputDir = resourceApi.mapUriToFile(outputUri);
             outputDirectory = outputDir.getAbsolutePath();
             outputDirectory += outputDirectory.endsWith(File.separator) ? "" : File.separator;
-            if(!outputDir.exists() && !outputDir.mkdirs()){
+            if(outputDir == null || (!outputDir.exists() && !outputDir.mkdirs())){
                 throw new FileNotFoundException("File: \"" + outputDirectory + "\" not found");
             }