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

Fix https://github.com/osmandapp/Osmand/issues/2001

Browse source
This commit is contained in:
Alexey Kulish 2016-01-17 14:29:53 +03:00
parent e0d85fdfb5
commit bddcfd58b8
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -59,6 +59,7 @@ import net.osmand.plus.download.ui.UpdatesIndexFragment;
import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin; import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
import net.osmand.plus.srtmplugin.SRTMPlugin; import net.osmand.plus.srtmplugin.SRTMPlugin;
import net.osmand.plus.views.controls.PagerSlidingTabStrip; import net.osmand.plus.views.controls.PagerSlidingTabStrip;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -74,7 +75,7 @@ import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
public class DownloadActivity extends AbstractDownloadActivity implements DownloadEvents, public class DownloadActivity extends AbstractDownloadActivity implements DownloadEvents,
ActivityCompat.OnRequestPermissionsResultCallback{ ActivityCompat.OnRequestPermissionsResultCallback {
private static final Log LOG = PlatformUtil.getLog(DownloadActivity.class); private static final Log LOG = PlatformUtil.getLog(DownloadActivity.class);
public static final int UPDATES_TAB_NUMBER = 2; public static final int UPDATES_TAB_NUMBER = 2;
@ -106,6 +107,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
protected Set<WeakReference<Fragment>> fragSet = new HashSet<>(); protected Set<WeakReference<Fragment>> fragSet = new HashSet<>();
private DownloadIndexesThread downloadThread; private DownloadIndexesThread downloadThread;
protected WorldRegion downloadItem; protected WorldRegion downloadItem;
protected String downloadTargetFileName;
private boolean srtmDisabled; private boolean srtmDisabled;
private boolean srtmNeedsInstallation; private boolean srtmNeedsInstallation;
@ -219,12 +221,18 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
if (downloadItem != null && downloadItem != getMyApplication().getRegions().getWorldRegion() if (downloadItem != null && downloadItem != getMyApplication().getRegions().getWorldRegion()
&& !WorldRegion.WORLD_BASEMAP.equals(downloadItem.getRegionDownloadNameLC())) { && !WorldRegion.WORLD_BASEMAP.equals(downloadItem.getRegionDownloadNameLC())) {
boolean firstMap = !getMyApplication().getSettings().FIRST_MAP_IS_DOWNLOADED.get(); if (!Algorithms.isEmpty(downloadTargetFileName)) {
if (firstMap) { File f = new File(downloadTargetFileName);
initSettingsFirstMap(downloadItem); if (f.exists() && f.lastModified() > System.currentTimeMillis() - 10000) {
boolean firstMap = !getMyApplication().getSettings().FIRST_MAP_IS_DOWNLOADED.get();
if (firstMap) {
initSettingsFirstMap(downloadItem);
}
showGoToMap(downloadItem);
}
} }
showGoToMap(downloadItem);
downloadItem = null; downloadItem = null;
downloadTargetFileName = null;
} }
for (WeakReference<Fragment> ref : fragSet) { for (WeakReference<Fragment> ref : fragSet) {
Fragment f = ref.get(); Fragment f = ref.get();
@ -558,11 +566,13 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
} }
} }
public void setDownloadItem(WorldRegion region) { public void setDownloadItem(WorldRegion region, String targetFileName) {
if (downloadItem == null) { if (downloadItem == null) {
downloadItem = region; downloadItem = region;
downloadTargetFileName = targetFileName;
} else if (region == null) { } else if (region == null) {
downloadItem = null; downloadItem = null;
downloadTargetFileName = null;
} }
} }
@ -817,7 +827,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (getActivity() instanceof DownloadActivity) { if (getActivity() instanceof DownloadActivity) {
((DownloadActivity) getActivity()).setDownloadItem(null); ((DownloadActivity) getActivity()).setDownloadItem(null, null);
} }
dismiss(); dismiss();
} }

2
OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
View file

@ -211,7 +211,7 @@ public class ItemViewHolder {
boolean handled = false; boolean handled = false;
if(parentOptional != null) { if(parentOptional != null) {
WorldRegion region = DownloadResourceGroup.getRegion(parentOptional); WorldRegion region = DownloadResourceGroup.getRegion(parentOptional);
context.setDownloadItem(region); context.setDownloadItem(region, indexItem.getTargetFile(context.getMyApplication()).getAbsolutePath());
} }
if (indexItem.getType() == DownloadActivityType.ROADS_FILE && parentOptional != null) { if (indexItem.getType() == DownloadActivityType.ROADS_FILE && parentOptional != null) {
for (IndexItem ii : parentOptional.getIndividualResources()) { for (IndexItem ii : parentOptional.getIndividualResources()) {