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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-12-11 14:45:12 +01:00
commit e30f6bd09b
4 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -209,6 +209,14 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
initListExpandedState();
}
@Override
public void onPause() {
super.onPause();
if (actionMode != null) {
actionMode.finish();
}
}
private int getSelectedFavoritesCount() {
int count = 0;
for (Set<FavouritePoint> set : favoritesSelected.values()) {

15
OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
View file

@ -136,6 +136,14 @@ public class NotesFragment extends OsmAndListFragment {
listView.setAdapter(listAdapter);
}
@Override
public void onPause() {
super.onPause();
if (actionMode != null) {
actionMode.finish();
}
}
@Override
public ArrayAdapter<?> getAdapter() {
return listAdapter;
@ -462,8 +470,13 @@ public class NotesFragment extends OsmAndListFragment {
startActivity(Intent.createChooser(intent, getString(R.string.share_note)));
}
@Nullable
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();
GPXFile file = new GPXFile();
for (Recording r : selected) {

3
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -207,6 +207,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
asyncProcessor.cancel(false);
asyncProcessor = null;
}
if (actionMode != null) {
actionMode.finish();
}
}
public void updateCurrentTrack() {

8
OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
View file

@ -332,6 +332,14 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo
fetchData();
}
@Override
public void onPause() {
super.onPause();
if (actionMode != null) {
actionMode.finish();
}
}
private void fetchData() {
boolean portrait = AndroidUiHelper.isOrientationPortrait(getActivity());
osmEdits = new ArrayList<>();