X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;fp=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=822f1f79036f2328858fe6075fc419bc45749143;hb=79f2677143f85a2807b8d4e297f3617aafbd34da;hp=a2b0b25b75cf2da4f9d63d3d4d4fd852109f83a1;hpb=6e3c4493cfa8d92d96808d14d1c12abb35ecb442;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
index a2b0b25b..822f1f79 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -437,11 +437,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 
 		if (telem_state != null) {
 			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
-			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
+			Integer[] new_serial = telem_state.keySet().toArray(new Integer[0]);
 
 			/* remove deleted keys */
 			for (int serial : old_serial) {
-				if (!telem_state.states.containsKey(serial))
+				if (!telem_state.containsKey(serial))
 					rockets.remove(serial);
 			}
 
@@ -449,7 +449,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 
 			for (int serial : new_serial) {
 				Rocket 		rocket;
-				AltosState	t_state = telem_state.states.get(serial);
+				AltosState	t_state = telem_state.get(serial);
 				if (rockets.containsKey(serial))
 					rocket = rockets.get(serial);
 				else {
@@ -459,7 +459,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 				if (t_state.gps != null) {
 					AltosLatLon	latlon = new AltosLatLon(t_state.gps.lat, t_state.gps.lon);
 					rocket.set_position(latlon, t_state.received_time);
-					if (state.cal_data().serial == serial)
+					if (state != null && state.cal_data().serial == serial)
 						there = latlon;
 				}
 				if (state != null)