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

MapActivity now finishes if it fails to open *.gpx file

Browse source
This commit is contained in:
GaidamakUA 2016-04-18 15:24:53 +03:00
parent 733dfd3062
commit 2c58bd0582
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/helpers/ExternalApiHelper.java
View file

@ -37,7 +37,6 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
public class ExternalApiHelper { public class ExternalApiHelper {
private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(ExternalApiHelper.class); private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(ExternalApiHelper.class);
public static final String API_CMD_SHOW_GPX = "show_gpx"; public static final String API_CMD_SHOW_GPX = "show_gpx";
@ -60,8 +59,8 @@ public class ExternalApiHelper {
public static final String API_CMD_SUBSCRIBE_VOICE_NOTIFICATIONS = "subscribe_voice_notifications"; public static final String API_CMD_SUBSCRIBE_VOICE_NOTIFICATIONS = "subscribe_voice_notifications";
public static final int VERSION_CODE = 1; public static final int VERSION_CODE = 1;
public static final String PARAM_NAME = "name"; public static final String PARAM_NAME = "name";
public static final String PARAM_DESC = "desc"; public static final String PARAM_DESC = "desc";
public static final String PARAM_CATEGORY = "category"; public static final String PARAM_CATEGORY = "category";
@ -111,7 +110,6 @@ public class ExternalApiHelper {
public static final int RESULT_CODE_ERROR_GPX_NOT_FOUND = 20; public static final int RESULT_CODE_ERROR_GPX_NOT_FOUND = 20;
public static final int RESULT_CODE_ERROR_INVALID_PROFILE = 30; public static final int RESULT_CODE_ERROR_INVALID_PROFILE = 30;
private MapActivity mapActivity; private MapActivity mapActivity;
private int resultCode; private int resultCode;
private boolean finish; private boolean finish;
@ -153,6 +151,7 @@ public class ExternalApiHelper {
gpx = GPXUtilities.loadGPXFile(mapActivity, new ByteArrayInputStream(gpxStr.getBytes())); gpx = GPXUtilities.loadGPXFile(mapActivity, new ByteArrayInputStream(gpxStr.getBytes()));
} }
} else { } else {
finish = true;
resultCode = RESULT_CODE_ERROR_GPX_NOT_FOUND; resultCode = RESULT_CODE_ERROR_GPX_NOT_FOUND;
} }
@ -179,6 +178,7 @@ public class ExternalApiHelper {
} }
resultCode = Activity.RESULT_OK; resultCode = Activity.RESULT_OK;
} else { } else {
finish = true;
resultCode = RESULT_CODE_ERROR_GPX_NOT_FOUND; resultCode = RESULT_CODE_ERROR_GPX_NOT_FOUND;
} }
@ -283,17 +283,17 @@ public class ExternalApiHelper {
long eta = time + System.currentTimeMillis() / 1000; long eta = time + System.currentTimeMillis() / 1000;
result.putExtra(PARAM_ETA, eta); result.putExtra(PARAM_ETA, eta);
result.putExtra(PARAM_DISTANCE_LEFT, routingHelper.getLeftDistance()); result.putExtra(PARAM_DISTANCE_LEFT, routingHelper.getLeftDistance());
NextDirectionInfo ni = routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), true); NextDirectionInfo ni = routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), true);
if(ni.distanceTo > 0) { if (ni.distanceTo > 0) {
updateTurnInfo("next_", result, ni); updateTurnInfo("next_", result, ni);
ni = routingHelper.getNextRouteDirectionInfoAfter(ni, new NextDirectionInfo(), true); ni = routingHelper.getNextRouteDirectionInfoAfter(ni, new NextDirectionInfo(), true);
if(ni.distanceTo > 0) { if (ni.distanceTo > 0) {
updateTurnInfo("after_next", result, ni); updateTurnInfo("after_next", result, ni);
} }
} }
routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), false); routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), false);
if(ni.distanceTo > 0) { if (ni.distanceTo > 0) {
updateTurnInfo("no_speak_next_", result, ni); updateTurnInfo("no_speak_next_", result, ni);
} }
} }
@ -393,12 +393,12 @@ public class ExternalApiHelper {
private void updateTurnInfo(String prefix, Intent result, NextDirectionInfo ni) { private void updateTurnInfo(String prefix, Intent result, NextDirectionInfo ni) {
result.putExtra(prefix + PARAM_NT_DISTANCE, ni.distanceTo); result.putExtra(prefix + PARAM_NT_DISTANCE, ni.distanceTo);
result.putExtra(prefix + PARAM_NT_IMMINENT, ni.imminent); result.putExtra(prefix + PARAM_NT_IMMINENT, ni.imminent);
if(ni.directionInfo != null && ni.directionInfo.getTurnType() != null) { if (ni.directionInfo != null && ni.directionInfo.getTurnType() != null) {
TurnType tt = ni.directionInfo.getTurnType(); TurnType tt = ni.directionInfo.getTurnType();
RouteDirectionInfo a = ni.directionInfo; RouteDirectionInfo a = ni.directionInfo;
result.putExtra(prefix + PARAM_NT_DIRECTION_NAME, RoutingHelper.formatStreetName(a.getStreetName(), a.getRef(), a.getDestinationName())); result.putExtra(prefix + PARAM_NT_DIRECTION_NAME, RoutingHelper.formatStreetName(a.getStreetName(), a.getRef(), a.getDestinationName()));
result.putExtra(prefix + PARAM_NT_DIRECTION_TURN, tt.toXmlString()); result.putExtra(prefix + PARAM_NT_DIRECTION_TURN, tt.toXmlString());
if(tt.getLanes() != null) { if (tt.getLanes() != null) {
result.putExtra(prefix + PARAM_NT_DIRECTION_LANES, Arrays.toString(tt.getLanes())); result.putExtra(prefix + PARAM_NT_DIRECTION_LANES, Arrays.toString(tt.getLanes()));
} }
} }