projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Make altosdroid code more resilient to weird androidisms
[fw/altos]
/
altosdroid
/
app
/
src
/
main
/
java
/
org
/
altusmetrum
/
AltosDroid
/
AltosMapOnline.java
diff --git
a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java
b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java
index 29979a07cdbf79b871f8e210e03339dd11f4c3d6..272744a35c8355b93eef7178f63c935616668321 100644
(file)
--- a/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java
+++ b/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@
-110,8
+110,6
@@
public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
private boolean pad_set;
private Polyline mPolyline;
private boolean pad_set;
private Polyline mPolyline;
- private View map_view;
-
private double mapAccuracy = -1;
private AltosLatLon my_position = null;
private double mapAccuracy = -1;
private AltosLatLon my_position = null;
@@
-121,25
+119,38
@@
public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
public static class AltosOnlineMapFragment extends SupportMapFragment {
AltosMapOnline c;
public static class AltosOnlineMapFragment extends SupportMapFragment {
AltosMapOnline c;
+ View map_view;
public AltosOnlineMapFragment(AltosMapOnline c) {
this.c = c;
}
public AltosOnlineMapFragment(AltosMapOnline c) {
this.c = c;
}
+ public AltosOnlineMapFragment() {
+ }
+
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- getMapAsync(c);
+ if (c != null)
+ getMapAsync(c);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
c.
map_view = super.onCreateView(inflater, container, savedInstanceState);
- return
c.
map_view;
+ map_view = super.onCreateView(inflater, container, savedInstanceState);
+ return map_view;
}
@Override
public void onDestroyView() {
super.onDestroyView();
}
@Override
public void onDestroyView() {
super.onDestroyView();
- c.map_view = null;
+ map_view = null;
+ }
+ public void set_visible(boolean visible) {
+ if (map_view == null)
+ return;
+ if (visible)
+ map_view.setVisibility(View.VISIBLE);
+ else
+ map_view.setVisibility(View.GONE);
}
}
}
}
@@
-259,12
+270,8
@@
public class AltosMapOnline implements AltosDroidMapInterface, GoogleMap.OnMarke
}
public void set_visible(boolean visible) {
}
public void set_visible(boolean visible) {
- if (map_view == null)
- return;
- if (visible)
- map_view.setVisibility(View.VISIBLE);
- else
- map_view.setVisibility(View.GONE);
+ if (mMapFragment != null)
+ mMapFragment.set_visible(visible);
}
public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
}
public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {