Fix crash when listfiles returns null (getodk#2424)

yaroing · Jul 26, 2018 · 570215f · 570215f
1 parent 1034d1d
commit 570215f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/spatial/MapHelper.java b/collect_app/src/main/java/org/odk/collect/android/spatial/MapHelper.java
@@ -194,13 +194,15 @@ private boolean useOfflineBasemapIfAvailable(String basemap) {
         return false;
     }
 
-    public static String[] getOfflineLayerList() {
+    private static String[] getOfflineLayerList() {
         File[] files = new File(Collect.OFFLINE_LAYERS).listFiles();
         ArrayList<String> results = new ArrayList<>();
         results.add(NO_FOLDER_KEY);
-        for (File f : files) {
-            if (f.isDirectory() && !f.isHidden()) {
-                results.add(f.getName());
+        if (files != null) {
+            for (File f : files) {
+                if (f.isDirectory() && !f.isHidden()) {
+                    results.add(f.getName());
+                }
             }
         }
         return results.toArray(new String[0]);