Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix download

Browse source
This commit is contained in:
Victor Shcherb 2014-06-05 22:19:52 +02:00
parent 52c6fc5da5
commit a00a477415
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -281,11 +281,16 @@ public class DownloadIndexesThread {
} }
// reindex vector maps all at one time // reindex vector maps all at one time
ResourceManager manager = app.getResourceManager(); ResourceManager manager = app.getResourceManager();
manager.indexVoiceFiles(this);
List<String> warnings = new ArrayList<String>(); List<String> warnings = new ArrayList<String>();
manager.indexVoiceFiles(this);
if (vectorMapsToReindex) { if (vectorMapsToReindex) {
warnings = manager.indexingMaps(this); warnings = manager.indexingMaps(this);
} }
List<String> wns = manager.indexAdditionalMaps(this);
if(wns != null) {
warnings.addAll(wns);
}
if (!warnings.isEmpty()) { if (!warnings.isEmpty()) {
return warnings.get(0); return warnings.get(0);
} }

6
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -415,11 +415,15 @@ public class ResourceManager {
warnings.addAll(indexingMaps(progress)); warnings.addAll(indexingMaps(progress));
warnings.addAll(indexVoiceFiles(progress)); warnings.addAll(indexVoiceFiles(progress));
warnings.addAll(OsmandPlugin.onIndexingFiles(progress)); warnings.addAll(OsmandPlugin.onIndexingFiles(progress));
warnings.addAll(context.getAppCustomization().onIndexingFiles(progress, indexFileNames)); warnings.addAll(indexAdditionalMaps(progress));
return warnings; return warnings;
} }
public List<String> indexAdditionalMaps(IProgress progress) {
return context.getAppCustomization().onIndexingFiles(progress, indexFileNames);
}
private void indexRegionsBoundaries(IProgress progress, boolean overwrite) { private void indexRegionsBoundaries(IProgress progress, boolean overwrite) {
try { try {
File file = context.getAppPath("regions.ocbf"); File file = context.getAppPath("regions.ocbf");