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

Fix selecting route points and finish action mode in onPause

Browse source
This commit is contained in:
Chumva 2019-04-04 18:28:49 +03:00
parent f5b015d501
commit c05dbf7536
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,6 +157,9 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
setUpdateEnable(false); setUpdateEnable(false);
if (actionMode != null) {
actionMode.finish();
}
if (optionsMenu != null) { if (optionsMenu != null) {
optionsMenu.close(); optionsMenu.close();
} }
@ -1004,7 +1007,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
public void onClick(View v) { public void onClick(View v) {
List<GpxDisplayItem> items = itemGroups.get(group); List<GpxDisplayItem> items = itemGroups.get(group);
if (ch.isChecked()) { if (ch.isChecked()) {
if (groupPosition == 0) { if (groupPosition == 0 && groups.size() > 1) {
setTrackPointsSelection(true); setTrackPointsSelection(true);
} else { } else {
setGroupSelection(items, groupPosition, true); setGroupSelection(items, groupPosition, true);
@ -1027,7 +1030,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
} }
private void setTrackPointsSelection(boolean select) { private void setTrackPointsSelection(boolean select) {
if (groups.size() > 1) { if (!groups.isEmpty()) {
setGroupSelection(null, 0, select); setGroupSelection(null, 0, select);
for (int i = 1; i < groups.size(); i++) { for (int i = 1; i < groups.size(); i++) {
GpxDisplayGroup g = groups.get(i); GpxDisplayGroup g = groups.get(i);