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 2016-01-30 16:37:36 +01:00
commit 919d700cbe
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
View file

@ -127,7 +127,9 @@ public class MapDataMenuController extends MenuController {
}; };
if (!downloadThread.getIndexes().isDownloadedFromInternet) { if (!downloadThread.getIndexes().isDownloadedFromInternet) {
downloadThread.runReloadIndexFiles(); if (mapActivity.getMyApplication().getSettings().isInternetConnectionAvailable()) {
downloadThread.runReloadIndexFiles();
}
} }
updateData(); updateData();
@ -255,8 +257,10 @@ public class MapDataMenuController extends MenuController {
rightTitleButtonController.visible = indexItem != null && indexItem.isDownloaded(); rightTitleButtonController.visible = indexItem != null && indexItem.isDownloaded();
topRightTitleButtonController.visible = otherIndexItems.size() > 0; topRightTitleButtonController.visible = otherIndexItems.size() > 0;
boolean downloadIndexes = !downloadThread.getIndexes().isDownloadedFromInternet boolean downloadIndexes = getMapActivity().getMyApplication().getSettings().isInternetConnectionAvailable()
&& !downloadThread.getIndexes().isDownloadedFromInternet
&& !downloadThread.getIndexes().downloadFromInternetFailed; && !downloadThread.getIndexes().downloadFromInternetFailed;
boolean isDownloading = indexItem != null && downloadThread.isDownloading(indexItem); boolean isDownloading = indexItem != null && downloadThread.isDownloading(indexItem);
if (isDownloading) { if (isDownloading) {
titleProgressController.setMapDownloadMode(); titleProgressController.setMapDownloadMode();