From e238c4068466ed71cf4a04162c7ddbf9afce82ee Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele.gobbetti@gmail.com>
Date: Fri, 1 Jun 2012 14:51:56 +0200
Subject: [PATCH 1/2] refresh fix

before the fix only the last datasource was being displayed on screen.
(cherry picked from commit 2c630f7e9f2c893fafc370587e8d963a5468fa21)
---
 src/org/mixare/DataView.java | 16 +++++++++-------
 src/org/mixare/MixView.java  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/org/mixare/DataView.java b/src/org/mixare/DataView.java
index 59ff4240..8a8e01d4 100755
--- a/src/org/mixare/DataView.java
+++ b/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()
diff --git a/src/org/mixare/MixView.java b/src/org/mixare/MixView.java
index e00a82c2..36fa6a43 100755
--- a/src/org/mixare/MixView.java
+++ b/src/org/mixare/MixView.java
@@ -218,7 +218,7 @@ protected void onResume() {
 			killOnError();
 			getMixViewData().getMixContext().doResume(this);
 
-			getDataView().refresh();
+			repaint();
 			getDataView().doStart();
 			getDataView().clearEvents();
 

From 1bc4d0025ad85ea20dab2d933643699caaca595f Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele.gobbetti@gmail.com>
Date: Fri, 1 Jun 2012 14:57:09 +0200
Subject: [PATCH 2/2] versionName bump.

versionCode left unchanged since the previous release was never
published to the market.
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1f653eaf..971e5161 100644
--- a/AndroidManifest.xml
+++ b/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"/>