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

add date check in checkIfItemOutdated

Browse source
This commit is contained in:
Chumva 2018-08-01 18:45:08 +03:00
parent 13fcd309c0
commit a0dd42e1e8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
View file

@ -81,7 +81,7 @@ public class IncrementalChangesManager {
List<String> list = new ArrayList<String>(regionUpdateFiles.monthUpdates.keySet());
for (String month : list) {
RegionUpdate ru = regionUpdateFiles.monthUpdates.get(month);
if (ru.obfCreated < dateCreated || checkIfItemOutdated(ru, dateCreated)) {
if (checkIfItemOutdated(ru, dateCreated)) {
log.info("Delete overlapping month update " + ru.file.getName());
resourceManager.closeFile(ru.file.getName());
regionUpdateFiles.monthUpdates.remove(month);
@ -101,7 +101,7 @@ public class IncrementalChangesManager {
if(ru == null) {
continue;
}
if (ru.obfCreated < dateCreated || (checkIfItemOutdated(ru, dateCreated)) ||
if ((checkIfItemOutdated(ru, dateCreated)) ||
(monthRu != null && ru.obfCreated < monthRu.obfCreated)) {
log.info("Delete overlapping day update " + ru.file.getName());
resourceManager.closeFile(ru.file.getName());
@ -420,7 +420,9 @@ public class IncrementalChangesManager {
boolean outdated = false;
Date strDate = null;
String date = ru.date;
if (!Algorithms.isEmpty(date) && ru.obfCreated == dateMainMapCreated) {
if (ru.obfCreated < dateMainMapCreated) {
outdated = true;
} else if (!Algorithms.isEmpty(date) && ru.obfCreated == dateMainMapCreated) {
try {
if (date.endsWith("00")) {
strDate = new SimpleDateFormat("yy_MM", Locale.getDefault()).parse(date);