Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e30f6bd09b
4 changed files with 33 additions and 1 deletions
|
@ -209,6 +209,14 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
|
||||||
initListExpandedState();
|
initListExpandedState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (actionMode != null) {
|
||||||
|
actionMode.finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private int getSelectedFavoritesCount() {
|
private int getSelectedFavoritesCount() {
|
||||||
int count = 0;
|
int count = 0;
|
||||||
for (Set<FavouritePoint> set : favoritesSelected.values()) {
|
for (Set<FavouritePoint> set : favoritesSelected.values()) {
|
||||||
|
|
|
@ -136,6 +136,14 @@ public class NotesFragment extends OsmAndListFragment {
|
||||||
listView.setAdapter(listAdapter);
|
listView.setAdapter(listAdapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (actionMode != null) {
|
||||||
|
actionMode.finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayAdapter<?> getAdapter() {
|
public ArrayAdapter<?> getAdapter() {
|
||||||
return listAdapter;
|
return listAdapter;
|
||||||
|
@ -462,8 +470,13 @@ public class NotesFragment extends OsmAndListFragment {
|
||||||
startActivity(Intent.createChooser(intent, getString(R.string.share_note)));
|
startActivity(Intent.createChooser(intent, getString(R.string.share_note)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
private File generateGPXForRecordings(Set<Recording> selected) {
|
private File generateGPXForRecordings(Set<Recording> selected) {
|
||||||
File tmpFile = new File(getActivity().getCacheDir(), "share/noteLocations.gpx");
|
File externalCacheDir = getActivity().getExternalCacheDir();
|
||||||
|
if (externalCacheDir == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
File tmpFile = new File(externalCacheDir, "share/noteLocations.gpx");
|
||||||
tmpFile.getParentFile().mkdirs();
|
tmpFile.getParentFile().mkdirs();
|
||||||
GPXFile file = new GPXFile();
|
GPXFile file = new GPXFile();
|
||||||
for (Recording r : selected) {
|
for (Recording r : selected) {
|
||||||
|
|
|
@ -207,6 +207,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
|
||||||
asyncProcessor.cancel(false);
|
asyncProcessor.cancel(false);
|
||||||
asyncProcessor = null;
|
asyncProcessor = null;
|
||||||
}
|
}
|
||||||
|
if (actionMode != null) {
|
||||||
|
actionMode.finish();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateCurrentTrack() {
|
public void updateCurrentTrack() {
|
||||||
|
|
|
@ -332,6 +332,14 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo
|
||||||
fetchData();
|
fetchData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (actionMode != null) {
|
||||||
|
actionMode.finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void fetchData() {
|
private void fetchData() {
|
||||||
boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
|
boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
|
||||||
osmEdits = new ArrayList<>();
|
osmEdits = new ArrayList<>();
|
||||||
|
|
Loading…
Reference in a new issue