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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-31 11:13:45 +01:00
commit 3ba77423ea
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -577,7 +577,7 @@ public class DownloadIndexesThread {
if (date != null && if (date != null &&
!date.equals(indexactivateddate) && !date.equals(indexactivateddate) &&
!date.equals(indexfilesdate)) { !date.equals(indexfilesdate)) {
//This is checked in DownloadIndexAdapter: indexActivatedFileNames.containsKey(sfName)) { //Discrimintaion if item is deactivated to be made elsewhere in the code (DonwloadIndexAdapter, UpdateIndexFragment, etc.): indexActivatedFileNames.containsKey(sfName)) {
if ((item.getType() == DownloadActivityType.NORMAL_FILE && !item.extra) || if ((item.getType() == DownloadActivityType.NORMAL_FILE && !item.extra) ||
item.getType() == DownloadActivityType.ROADS_FILE || item.getType() == DownloadActivityType.ROADS_FILE ||
item.getType() == DownloadActivityType.SRTM_COUNTRY_FILE){ item.getType() == DownloadActivityType.SRTM_COUNTRY_FILE){
@ -604,8 +604,8 @@ public class DownloadIndexesThread {
String indexfilesdate = indexFileNames.get(sfName); String indexfilesdate = indexFileNames.get(sfName);
if (date != null && if (date != null &&
!date.equals(indexactivateddate) && !date.equals(indexactivateddate) &&
!date.equals(indexfilesdate)) { !date.equals(indexfilesdate)) &&
//This is checked in DownloadIndexAdapter: indexActivatedFileNames.containsKey(sfName)) { indexActivatedFileNames.containsKey(sfName)) {
stillUpdate.add(item); stillUpdate.add(item);
} }
} }