Merge branch 'hotfix/0.9.2'

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="26" android:versionName="0.9.1" package="org.mixare" android:installLocation="auto">
+      android:versionCode="26" android:versionName="0.9.2" package="org.mixare" android:installLocation="auto">
 
     <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="10"/>
 

src/org/mixare/DataView.java

@@ -95,6 +95,8 @@ public class DataView {
 	private ScreenLine rrl = new ScreenLine();
 	private float rx = 10, ry = 20;
 	private float addX = 0, addY = 0;
+
+	private List<Marker> markers;
 
 	/**
 	 * Constructor
@@ -198,22 +200,22 @@ public void draw(PaintScreen dw) {
 		// Load Layer
 		if (state.nextLStatus == MixState.NOT_STARTED && !frozen) {
 			loadDrawLayer();
+			markers = new ArrayList<Marker>();
 		}
 		else if (state.nextLStatus == MixState.PROCESSING) {
 			DownloadManager dm = mixContext.getDownloadManager();
 			DownloadResult dRes = null;
 
-			if(dm.getResultSize() > 0){
-				List<Marker> markers = downloadDrawResults(dm, dRes);
-				dataHandler = new DataHandler();
-				dataHandler.addMarkers(markers);
-				dataHandler.onLocationChanged(curFix);
-			}
+			markers.addAll(downloadDrawResults(dm, dRes));
 
 			if (dm.isDone()) {
 				retry = 0;
 				state.nextLStatus = MixState.DONE;
-
+
+				dataHandler = new DataHandler();
+				dataHandler.addMarkers(markers);
+				dataHandler.onLocationChanged(curFix);
+
 				if (refresh == null) { // start the refresh timer if it is null
 					refresh = new Timer(false);
 					Date date = new Date(System.currentTimeMillis()

src/org/mixare/MixView.java

@@ -218,7 +218,7 @@ protected void onResume() {
 			killOnError();
 			getMixViewData().getMixContext().doResume(this);
 
-			getDataView().refresh();
+			repaint();
 			getDataView().doStart();
 			getDataView().clearEvents();