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

Merge pull request #4206 from osmandapp/fix_crash_in_track_activity

Browse source 
Fix bugs track activity
This commit is contained in:
Alexey 2017-07-26 14:10:54 +03:00 committed by GitHub
commit dcb50e7cfc
3 changed files with 82 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
View file

@ -78,11 +78,52 @@ public class TrackActivity extends TabActivity {
setContentView(R.layout.tab_content); setContentView(R.layout.tab_content);
} }
@Override protected void setGpxDataItem(GpxDataItem gpxDataItem) {
protected void onStart() { this.gpxDataItem = gpxDataItem;
super.onStart(); }
stopped = false;
protected void setGpx(GPXFile result) {
this.gpxFile = result;
if (file == null) {
this.gpxFile = getMyApplication().getSavingTrackHelper().getCurrentGpx();
}
}
public List<GpxDisplayGroup> getGpxFile(boolean useDisplayGroups) {
if (gpxFile == null) {
return new ArrayList<>();
}
if (gpxFile.modifiedTime != modifiedTime) {
modifiedTime = gpxFile.modifiedTime;
GpxSelectionHelper selectedGpxHelper = ((OsmandApplication) getApplication()).getSelectedGpxHelper();
displayGroups = selectedGpxHelper.collectDisplayGroups(gpxFile);
originalGroups.clear();
for (GpxDisplayGroup g : displayGroups) {
originalGroups.add(g.cloneInstance());
}
if (file != null) {
SelectedGpxFile sf = selectedGpxHelper.getSelectedFileByPath(gpxFile.path);
if (sf != null && file != null && sf.getDisplayGroups() != null) {
displayGroups = sf.getDisplayGroups();
}
}
}
if (useDisplayGroups) {
return displayGroups;
} else {
return originalGroups;
}
}
@Override
public void onAttachFragment(Fragment fragment) {
fragList.add(new WeakReference<>(fragment));
}
@Override
protected void onResume() {
super.onResume();
stopped = false;
slidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.sliding_tabs); slidingTabLayout = (PagerSlidingTabStrip) findViewById(R.id.sliding_tabs);
if (slidingTabLayout != null) { if (slidingTabLayout != null) {
slidingTabLayout.setShouldExpand(true); slidingTabLayout.setShouldExpand(true);
@ -157,53 +198,6 @@ public class TrackActivity extends TabActivity {
} }
} }
protected void setGpxDataItem(GpxDataItem gpxDataItem) {
this.gpxDataItem = gpxDataItem;
}
protected void setGpx(GPXFile result) {
this.gpxFile = result;
if (file == null) {
this.gpxFile = getMyApplication().getSavingTrackHelper().getCurrentGpx();
}
}
public List<GpxDisplayGroup> getGpxFile(boolean useDisplayGroups) {
if (gpxFile == null) {
return new ArrayList<>();
}
if (gpxFile.modifiedTime != modifiedTime) {
modifiedTime = gpxFile.modifiedTime;
GpxSelectionHelper selectedGpxHelper = ((OsmandApplication) getApplication()).getSelectedGpxHelper();
displayGroups = selectedGpxHelper.collectDisplayGroups(gpxFile);
originalGroups.clear();
for (GpxDisplayGroup g : displayGroups) {
originalGroups.add(g.cloneInstance());
}
if (file != null) {
SelectedGpxFile sf = selectedGpxHelper.getSelectedFileByPath(gpxFile.path);
if (sf != null && file != null && sf.getDisplayGroups() != null) {
displayGroups = sf.getDisplayGroups();
}
}
}
if (useDisplayGroups) {
return displayGroups;
} else {
return originalGroups;
}
}
@Override
public void onAttachFragment(Fragment fragment) {
fragList.add(new WeakReference<>(fragment));
}
@Override
protected void onResume() {
super.onResume();
}
public OsmandApplication getMyApplication() { public OsmandApplication getMyApplication() {
return (OsmandApplication) getApplication(); return (OsmandApplication) getApplication();
} }

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

@ -322,29 +322,28 @@ public class SplitSegmentFragment extends OsmAndListFragment {
} }
private List<GpxDisplayGroup> filterGroups(boolean useDisplayGroups) { private List<GpxDisplayGroup> filterGroups(boolean useDisplayGroups) {
if (getTrackActivity() == null) {
return null;
}
List<GpxDisplayGroup> result = getTrackActivity().getGpxFile(useDisplayGroups);
List<GpxDisplayGroup> groups = new ArrayList<>(); List<GpxDisplayGroup> groups = new ArrayList<>();
for (GpxDisplayGroup group : result) { if (getTrackActivity() != null) {
boolean add = hasFilterType(group.getType()); List<GpxDisplayGroup> result = getTrackActivity().getGpxFile(useDisplayGroups);
if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) { for (GpxDisplayGroup group : result) {
Iterator<GpxDisplayItem> item = group.getModifiableList().iterator(); boolean add = hasFilterType(group.getType());
while (item.hasNext()) { if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) {
GpxDisplayItem it2 = item.next(); Iterator<GpxDisplayItem> item = group.getModifiableList().iterator();
if (it2.analysis != null && it2.analysis.totalDistance < 100) { while (item.hasNext()) {
item.remove(); GpxDisplayItem it2 = item.next();
if (it2.analysis != null && it2.analysis.totalDistance < 100) {
item.remove();
}
}
if (group.getModifiableList().isEmpty()) {
add = false;
} }
} }
if (group.getModifiableList().isEmpty()) { if (add) {
add = false; groups.add(group);
} }
}
if (add) {
groups.add(group);
}
}
} }
return groups; return groups;
} }
@ -657,9 +656,6 @@ public class SplitSegmentFragment extends OsmAndListFragment {
} }
if (mSelectedGpxFile != null) { if (mSelectedGpxFile != null) {
List<GpxDisplayGroup> groups = getDisplayGroups(); List<GpxDisplayGroup> groups = getDisplayGroups();
if (groups == null) {
return;
}
mSelectedGpxFile.setDisplayGroups(groups); mSelectedGpxFile.setDisplayGroups(groups);
} }
updateContent(); updateContent();

42
OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
View file

@ -710,29 +710,28 @@ public class TrackSegmentFragment extends OsmAndListFragment {
} }
private List<GpxDisplayGroup> filterGroups(boolean useDisplayGroups) { private List<GpxDisplayGroup> filterGroups(boolean useDisplayGroups) {
if (getTrackActivity() == null) {
return null;
}
List<GpxDisplayGroup> result = getTrackActivity().getGpxFile(useDisplayGroups);
List<GpxDisplayGroup> groups = new ArrayList<>(); List<GpxDisplayGroup> groups = new ArrayList<>();
for (GpxDisplayGroup group : result) { if (getTrackActivity() != null) {
boolean add = hasFilterType(group.getType()); List<GpxDisplayGroup> result = getTrackActivity().getGpxFile(useDisplayGroups);
if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) { for (GpxDisplayGroup group : result) {
Iterator<GpxDisplayItem> item = group.getModifiableList().iterator(); boolean add = hasFilterType(group.getType());
while (item.hasNext()) { if (isArgumentTrue(ARG_TO_FILTER_SHORT_TRACKS)) {
GpxDisplayItem it2 = item.next(); Iterator<GpxDisplayItem> item = group.getModifiableList().iterator();
if (it2.analysis != null && it2.analysis.totalDistance < 100) { while (item.hasNext()) {
item.remove(); GpxDisplayItem it2 = item.next();
if (it2.analysis != null && it2.analysis.totalDistance < 100) {
item.remove();
}
}
if (group.getModifiableList().isEmpty()) {
add = false;
} }
} }
if (group.getModifiableList().isEmpty()) { if (add) {
add = false; groups.add(group);
} }
}
if (add) {
groups.add(group);
}
}
} }
return groups; return groups;
} }
@ -746,7 +745,9 @@ public class TrackSegmentFragment extends OsmAndListFragment {
} }
adapter.setNotifyOnChange(true); adapter.setNotifyOnChange(true);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
updateHeader(); if (getActivity() != null) {
updateHeader();
}
} }
protected List<GpxDisplayItem> flatten(List<GpxDisplayGroup> groups) { protected List<GpxDisplayItem> flatten(List<GpxDisplayGroup> groups) {
@ -1541,9 +1542,6 @@ public class TrackSegmentFragment extends OsmAndListFragment {
} }
if (mSelectedGpxFile != null) { if (mSelectedGpxFile != null) {
List<GpxDisplayGroup> groups = getDisplayGroups(); List<GpxDisplayGroup> groups = getDisplayGroups();
if (groups == null) {
return;
}
mSelectedGpxFile.setDisplayGroups(groups); mSelectedGpxFile.setDisplayGroups(groups);
} }
if (mFragment.isVisible()) { if (mFragment.isVisible()) {