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

Merge pull request #4223 from osmandapp/crash_split_segments

Browse source 
Fix crash in split segments
This commit is contained in:
vshcherb 2017-07-28 12:29:04 +03:00 committed by GitHub
commit 40b9ef6071
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java
View file

@ -576,7 +576,12 @@ public class SplitSegmentFragment extends OsmAndListFragment {
String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app); String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app); String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app);
String maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed); String maxMinSpeed;
if (maxSpeed.contains(" ")) {
maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
} else {
maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf("-")).concat("/").concat(minSpeed);
}
if (minMaxSpeedLayoutWidth == 0) { if (minMaxSpeedLayoutWidth == 0) {
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
@ -591,7 +596,7 @@ public class SplitSegmentFragment extends OsmAndListFragment {
minMaxSpeedPaint.getTextBounds(maxMinSpeed, 0, maxMinSpeed.length(), minMaxSpeedTextBounds); minMaxSpeedPaint.getTextBounds(maxMinSpeed, 0, maxMinSpeed.length(), minMaxSpeedTextBounds);
int minMaxStringWidth = minMaxSpeedTextBounds.width(); int minMaxStringWidth = minMaxSpeedTextBounds.width();
if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) { if (analysis.minSpeed == 0) {
(convertView.findViewById(R.id.max_speed_value)) (convertView.findViewById(R.id.max_speed_value))
.setVisibility(View.VISIBLE); .setVisibility(View.VISIBLE);
(convertView.findViewById(R.id.min_speed_value)) (convertView.findViewById(R.id.min_speed_value))