diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index 45659697f4..7b96dcb66c 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -27,5 +27,5 @@ Value Live updates on Live updates off - "Last check date: %s" + "Map update date: %s" diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java index b2a0f0466a..c191710f30 100644 --- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java @@ -40,7 +40,6 @@ import static net.osmand.plus.liveupdates.LiveUpdatesHelper.formatDateTime; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.getNameToDisplay; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceDownloadViaWiFi; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceForLocalIndex; -import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceLastCheck; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceTimeOfDayToUpdate; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceUpdateFrequency; @@ -79,10 +78,9 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment { final IncrementalChangesManager changesManager = getMyApplication().getResourceManager().getChangesManager(); final long timestamp = changesManager.getTimestamp(fileNameWithoutExtension); String lastUpdateDate = formatDateTime(getActivity(), timestamp); - OsmandSettings.CommonPreference lastCheckPreference = preferenceLastCheck(localIndexInfo, getSettings()); - String lastCheckDate = formatDateTime(getActivity(), lastCheckPreference.get()); - String lastCheck = lastCheckPreference.get() != -1 ? lastCheckDate : lastUpdateDate; - lastCheckTextView.setText(getString(R.string.last_check_date, lastCheck)); + final long mapTimestamp = changesManager.getMapTimestamp(fileNameWithoutExtension); + String lastCheckDate = formatDateTime(getActivity(), mapTimestamp); + lastCheckTextView.setText(getString(R.string.map_update_date, lastCheckDate)); lastUpdateTextView.setText(getString(R.string.update_date_pattern, lastUpdateDate)); final OsmandSettings.CommonPreference liveUpdatePreference = preferenceForLocalIndex(localIndexInfo, getSettings()); diff --git a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java index 3080d603d4..4bfc6072d1 100644 --- a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java +++ b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java @@ -370,6 +370,11 @@ public class IncrementalChangesManager { return getTimestamp(ruf); } + public long getMapTimestamp(String fileName) { + RegionUpdateFiles ruf = regions.get(fileName.toLowerCase()); + return ruf.mainFileInit; + } + private long getTimestamp(RegionUpdateFiles ruf) { long timestamp = ruf.mainFileInit; for (RegionUpdate ru : ruf.monthUpdates.values()) {