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

Fix error #7365

Browse source
This commit is contained in:
Victor Shcherb 2020-05-17 14:40:04 +02:00
parent 36ae49de65
commit 9a7fcbd7b8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
View file

@ -1012,8 +1012,7 @@ public class RouteDataObject {
}
public boolean hasNameTagStartsWith(String tagStartsWith) {
int[] nextSegmentNameIds = nameIds;
for (int nm = 0; nm < nameIds.length; nm++) {
for (int nm = 0; nameIds != null && nm < nameIds.length; nm++) {
RouteTypeRule rtr = region.quickGetEncodingRule(nameIds[nm]);
if (rtr != null && rtr.getTag().startsWith(tagStartsWith)) {
return true;

4
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -359,7 +359,7 @@ public class RouteProvider {
insertInitialSegment(params, locs, directions, true);
res = new RouteCalculationResult(locs, directions, params, null, true);
} catch (RuntimeException e) {
e.printStackTrace();
log.error(e.getMessage(), e);
}
return res;
}
@ -815,8 +815,10 @@ public class RouteProvider {
return res;
}
} catch (RuntimeException e) {
log.error("Runtime error: " + e.getMessage(), e);
return new RouteCalculationResult(e.getMessage() );
} catch (InterruptedException e) {
log.error("Interrupted: " + e.getMessage(), e);
return interrupted();
} catch (OutOfMemoryError e) {
// ActivityManager activityManager = (ActivityManager)app.getSystemService(Context.ACTIVITY_SERVICE);