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-09-13 00:48:14 +02:00
commit 35cd638842
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageDialog.java
View file

@ -190,11 +190,14 @@ public class MapillaryImageDialog extends ContextMenuCardDialog {
}
public View getContentView() {
return getWebView();
/*
if (getMapActivity().getMyApplication().getSettings().WEBGL_SUPPORTED.get()) {
return getWebView();
} else {
return getStaticImageView();
}
*/
}
@Override
@ -239,6 +242,7 @@ public class MapillaryImageDialog extends ContextMenuCardDialog {
noInternetView.setVisibility(View.VISIBLE);
}
});
/*
webView.setWebChromeClient(new WebChromeClient() {
@Override
public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
@ -249,6 +253,7 @@ public class MapillaryImageDialog extends ContextMenuCardDialog {
return false;
}
});
*/
noInternetView.findViewById(R.id.retry_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

6
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -1435,11 +1435,7 @@ public class MeasurementToolFragment extends Fragment {
builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
GPXFile gpx = editingCtx.getNewGpxData().getGpxFile();
SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
boolean showOnMap = selectedGpxFile != null;
ActionType actionType = editingCtx.getNewGpxData().getActionType();
saveExistingGpx(gpx, showOnMap, actionType, true);
dismiss(mapActivity);
}
});
}