Fix:Android:Fixed rare crash in MapDownloader

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5207 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 7 insertions, 4 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index df699192..6a1401ad 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -638,7 +638,7 @@ public class NavitMapDownloader extends Thread
 		StatFs fsInfo = new StatFs(MAP_FILENAME_PATH);

 		return (long)fsInfo.getAvailableBlocks() * fsInfo.getBlockSize();

 	}

-	

+

 	public static NavitMap[] getAvailableMaps()

 	{

 		class filterMaps implements FilenameFilter {

@@ -649,11 +649,14 @@ public class NavitMapDownloader extends Thread
 				return false;

 			}

 		}

+		NavitMap maps[] = new NavitMap[0];

 		File map_dir = new File(MAP_FILENAME_PATH);

 		String map_file_names[] = map_dir.list(new filterMaps());

-		NavitMap maps[] = new NavitMap[map_file_names.length];

-		for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {

-			maps[map_file_index] = new NavitMap(MAP_FILENAME_PATH, map_file_names[map_file_index]);

+		if (map_file_names != null) {

+			maps = new NavitMap[map_file_names.length];

+			for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) {

+				maps[map_file_index] = new NavitMap(MAP_FILENAME_PATH, map_file_names[map_file_index]);

+			}

 		}

 		return maps;

 	}