diff -r 25d4118056e1 -r 3d7ac2b3b703 project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/EngineProtocol/FrontendDataUtils.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/EngineProtocol/FrontendDataUtils.java Tue Aug 09 21:41:52 2011 +0200 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/EngineProtocol/FrontendDataUtils.java Wed Aug 10 01:22:52 2011 +0200 @@ -118,23 +118,23 @@ ArrayList> data = new ArrayList>(6); String[] levels = {c.getString(R.string.human), c.getString(R.string.bot5), c.getString(R.string.bot4), c.getString(R.string.bot3), c.getString(R.string.bot2), c.getString(R.string.bot1)}; int[] images = {R.drawable.human, R.drawable.bot5, R.drawable.bot4, R.drawable.bot3, R.drawable.bot2, R.drawable.bot1}; - + for(int i = 0; i < levels.length; i++){ HashMap map = new HashMap(); map.put("txt", levels[i]); map.put("img", images[i]); data.add(map); } - + return data; } - + public static ArrayList> getHats(Context c){ ArrayList files = Utils.getFilesFromDirWithSuffix(c, "Graphics/Hats", ".png", true); String pathPrefix = Utils.getDownloadPath(c) + "Graphics/Hats/"; int size = files.size(); ArrayList> data = new ArrayList>(size); - + HashMap hashmap; for(String s : files){ hashmap = new HashMap(); @@ -144,25 +144,26 @@ hashmap.put("img", b); data.add(hashmap); } - + return data; } - + public static ArrayList> getTeams(Context c){ ArrayList> ret = new ArrayList>(); - + File teamsDir = new File(c.getFilesDir().getAbsolutePath() + '/' + Team.DIRECTORY_TEAMS); File[] teamFileNames = teamsDir.listFiles(); - - for(File s : teamFileNames){ - Team t = Team.getTeamFromXml(s.getAbsolutePath()); - if(t != null){ - ret.add(teamToHashMap(t)); + if(teamsDir != null){ + for(File s : teamFileNames){ + Team t = Team.getTeamFromXml(s.getAbsolutePath()); + if(t != null){ + ret.add(teamToHashMap(t)); + } } } return ret; } - + public static HashMap teamToHashMap(Team t){ HashMap hashmap = new HashMap(); hashmap.put("team", t);