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

Fixed bug with null reference

Browse source
This commit is contained in:
Denis 2014-07-28 22:14:36 +03:00
parent 9ec98b0f4f
commit 840b46f576
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/plus/sherpafy/WaypointDialogHelper.java
View file

@ -31,12 +31,25 @@ public class WaypointDialogHelper {
public static boolean OVERLAP_LAYOUT = true;
public WaypointDialogHelper(OsmandApplication app) {
this.mapActivity = app.mapActivity;
this.app = app;
this.mainLayout = (FrameLayout) ((FrameLayout) mapActivity.getLayout()).getChildAt(0);
if (mapActivity != null){
this.mainLayout = (FrameLayout) ((FrameLayout) mapActivity.getLayout()).getChildAt(0);
this.mapActivity = app.mapActivity;
}
}
public void addDialogWithShift() {
//if map activity is null - try to get it from app again
if (mapActivity == null){
mapActivity = app.mapActivity;
if (mapActivity != null){
mainLayout = (FrameLayout) ((FrameLayout) mapActivity.getLayout()).getChildAt(0);
} else {
return;
}
}
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
final LayoutInflater vi = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);