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

cleanup

Browse source
This commit is contained in:
simon 2020-10-08 10:03:58 +03:00
parent 0fdc58960a
commit 4eae0ee60a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java
View file

@ -21,9 +21,9 @@ public class IPFSImageCard extends ImageCard {
} catch (JSONException e) { } catch (JSONException e) {
LOG.error(e); LOG.error(e);
} }
this.url = BASE_URL + cid; url = BASE_URL + cid;
this.imageHiresUrl = BASE_URL + cid; imageHiresUrl = BASE_URL + cid;
this.imageUrl = BASE_URL + cid; imageUrl = BASE_URL + cid;
if (!Algorithms.isEmpty(getUrl())) { if (!Algorithms.isEmpty(getUrl())) {
View.OnClickListener onClickListener = new View.OnClickListener() { View.OnClickListener onClickListener = new View.OnClickListener() {
@Override @Override
@ -34,7 +34,7 @@ public class IPFSImageCard extends ImageCard {
} }
}; };
if (!Algorithms.isEmpty(buttonText)) { if (!Algorithms.isEmpty(buttonText)) {
this.onButtonClickListener = onClickListener; onButtonClickListener = onClickListener;
} else { } else {
this.onClickListener = onClickListener; this.onClickListener = onClickListener;
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java
View file

@ -442,7 +442,7 @@ public abstract class ImageCard extends AbstractCard {
Object o = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObject(); Object o = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObject();
if (o instanceof Amenity) { if (o instanceof Amenity) {
Amenity am = (Amenity) o; Amenity am = (Amenity) o;
long amenityId = (am.getId() >> 1); long amenityId = am.getId() >> 1;
getPicturesForPlace(result, amenityId); getPicturesForPlace(result, amenityId);
} }
try { try {

6
OsmAnd/src/net/osmand/plus/views/layers/ContextMenuLayer.java
View file

@ -907,9 +907,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
} }
@NonNull @NonNull
public Map<Object, IContextMenuProvider> selectObjectsForContextMenu(RotatedTileBox tileBox, private Map<Object, IContextMenuProvider> selectObjectsForContextMenu(RotatedTileBox tileBox,
PointF point, boolean acquireObjLatLon, PointF point, boolean acquireObjLatLon,
boolean unknownLocation) { boolean unknownLocation) {
Map<LatLon, BackgroundType> pressedLatLonFull = new HashMap<>(); Map<LatLon, BackgroundType> pressedLatLonFull = new HashMap<>();
Map<LatLon, BackgroundType> pressedLatLonSmall = new HashMap<>(); Map<LatLon, BackgroundType> pressedLatLonSmall = new HashMap<>();
Map<Object, IContextMenuProvider> selectedObjects = new HashMap<>(); Map<Object, IContextMenuProvider> selectedObjects = new HashMap<>();