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

Updated to fix of 119 bug in Jira

Browse source
This commit is contained in:
unknown 2014-07-02 13:20:26 +03:00
parent 18e88f9e1f
commit fc508f4ce5
1 changed files with 141 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
View file

@ -115,6 +115,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
}); });
return vs; return vs;
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -254,7 +255,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
} }
@Override @Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) { public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
return false; return false;
@ -437,13 +437,22 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
} }
} }
}; };
if(info.gpx != null && info.file != null){ if (info.gpx != null) {
if (info.file == null){
GpxSelectionHelper.SelectedGpxFile selectedGpxFile = selectedGpxHelper.getSelectedCurrentRecordingTrack();
if (selectedGpxFile != null && selectedGpxFile.getGpxFile() == info.gpx){
adapter.item(R.string.local_index_unselect_gpx_file).listen(listener).reg();
} else {
adapter.item(R.string.local_index_select_gpx_file).listen(listener).reg();
}
} else {
if (getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(info.file.getAbsolutePath()) == null) { if (getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(info.file.getAbsolutePath()) == null) {
adapter.item(R.string.local_index_select_gpx_file).listen(listener).reg(); adapter.item(R.string.local_index_select_gpx_file).listen(listener).reg();
} else { } else {
adapter.item(R.string.local_index_unselect_gpx_file).listen(listener).reg(); adapter.item(R.string.local_index_unselect_gpx_file).listen(listener).reg();
} }
} }
}
adapter.item(R.string.show_gpx_route).listen(listener).reg(); adapter.item(R.string.show_gpx_route).listen(listener).reg();
if (info.file != null) { if (info.file != null) {
adapter.item(R.string.local_index_mi_rename).listen(listener).reg(); adapter.item(R.string.local_index_mi_rename).listen(listener).reg();
@ -571,8 +580,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
} }
protected class GpxIndexesAdapter extends OsmandBaseExpandableListAdapter implements Filterable { protected class GpxIndexesAdapter extends OsmandBaseExpandableListAdapter implements Filterable {
Map<String, List<GpxInfo>> data = new LinkedHashMap<String, List<GpxInfo>>(); Map<String, List<GpxInfo>> data = new LinkedHashMap<String, List<GpxInfo>>();
@ -1075,7 +1082,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
} }
public void setGpx(GPXFile gpx) { public void setGpx(GPXFile gpx) {
this.gpx = gpx; this.gpx = gpx;
} }