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

Fix TrackActivity crash

Browse source
This commit is contained in:
Alexey Kulish 2017-07-26 15:58:35 +03:00
parent 92d5ced23c
commit e54028e818
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
View file

@ -121,16 +121,16 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
return view; return view;
} }
public TrackActivity getMyActivity() { public TrackActivity getTrackActivity() {
return (TrackActivity) getActivity(); return (TrackActivity) getActivity();
} }
private GPXFile getGpx() { private GPXFile getGpx() {
return getMyActivity().getGpx(); return getTrackActivity().getGpx();
} }
private GpxDataItem getGpxDataItem() { private GpxDataItem getGpxDataItem() {
return getMyActivity().getGpxDataItem(); return getTrackActivity().getGpxDataItem();
} }
private void expandAllGroups() { private void expandAllGroups() {
@ -160,8 +160,9 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
} }
private List<GpxDisplayGroup> filterGroups() { private List<GpxDisplayGroup> filterGroups() {
List<GpxDisplayGroup> result = getMyActivity().getGpxFile(false);
List<GpxDisplayGroup> groups = new ArrayList<>(); List<GpxDisplayGroup> groups = new ArrayList<>();
if (getTrackActivity() != null) {
List<GpxDisplayGroup> result = getTrackActivity().getGpxFile(false);
for (GpxDisplayGroup group : result) { for (GpxDisplayGroup group : result) {
boolean add = hasFilterType(group.getType()); boolean add = hasFilterType(group.getType());
if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) { if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) {
@ -181,6 +182,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
} }
} }
}
return groups; return groups;
} }
@ -537,8 +539,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
private void selectFavoritesImpl() { private void selectFavoritesImpl() {
if (!selectedItems.isEmpty()) { if (!selectedItems.isEmpty()) {
AlertDialog.Builder b = new AlertDialog.Builder(getMyActivity()); AlertDialog.Builder b = new AlertDialog.Builder(getTrackActivity());
final EditText editText = new EditText(getMyActivity()); final EditText editText = new EditText(getTrackActivity());
String name = selectedItems.iterator().next().group.getName(); String name = selectedItems.iterator().next().group.getName();
if(name.indexOf('\n') > 0) { if(name.indexOf('\n') > 0) {
name = name.substring(0, name.indexOf('\n')); name = name.substring(0, name.indexOf('\n'));
@ -818,7 +820,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
groupColor = gpxItem.locationStart.getColor(groupColor); groupColor = gpxItem.locationStart.getColor(groupColor);
} }
if (groupColor == 0) { if (groupColor == 0) {
groupColor = getMyActivity().getResources().getColor(R.color.gpx_color_point); groupColor = getTrackActivity().getResources().getColor(R.color.gpx_color_point);
} }
icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), groupColor, false)); icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), groupColor, false));
} else { } else {