avoid nullpointer

sitewaerts · May 29, 2018 · a26ddd0 · a26ddd0
1 parent 07ffde6
commit a26ddd0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/android/de/sitewaerts/cordova/documentviewer/DocumentViewerPlugin.java b/src/android/de/sitewaerts/cordova/documentviewer/DocumentViewerPlugin.java
@@ -673,7 +673,10 @@ private void deleteRecursive(File f, boolean self)
     private boolean canGetFile(String fileArg)
     {
         // TODO: better check for assets files ...
-        return fileArg.startsWith(ASSETS) || getFile(fileArg).exists();
+        if(fileArg.startsWith(ASSETS))
+            return true;
+        File f = getFile(fileArg);
+        return f != null && f.exists();
     }
 
     @SuppressLint("ObsoleteSdkInt")
@@ -797,7 +800,7 @@ private File getAccessibleFileOld(String fileArg)
         else
         {
             File file = getFile(fileArg);
-            if (!file.exists() || !file.isFile())
+            if (file == null || !file.exists() || !file.isFile())
                 return null;
 
             // detect private files, copy to accessible tmp dir if necessary