--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/05/03 13:43:53	702
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/05/03 14:54:30	703
@@ -16,95 +16,111 @@
 import android.widget.RemoteViews;
 
 public class Side9WidgetProvider extends AppWidgetProvider  {
-	
-	
+
+
 	//The data needs to be static, since BroadcastReceivers (which WidgetProviders extends) are only valid during onReceive()
 	private static Side9Data usedData;
 	private static Bitmap usedBitmap; 
-	
+	private static long timestamp;
+
+	final static long UDPATESPAN = 6*60*60*1000;
+
+
+	static  {
+		timestamp = 0L;
+	}
+
 	public Side9WidgetProvider() {
 		Log.i("Side9Pigen", "WidgetProvider constructor called");
 	}
-	
+
 	private void setImage(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, Bitmap image) {
-        // Perform this loop procedure for each App Widget that belongs to this provider
+		// Perform this loop procedure for each App Widget that belongs to this provider
 		final int N = appWidgetIds.length; 
-        for (int i=0; i<N; i++) {
-            int appWidgetId = appWidgetIds[i];
-            		            
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
-            		            
-            if (image != null) {
-            	views.setImageViewBitmap(R.id.side9picture, image);
-            } else {
-            	views.setImageViewResource(R.id.side9picture, R.drawable.side9logo);
-            }
-            //views.setTextViewText(R.id.caption, newData.caption);
-            
-            
-            // Launch a browser when user clicks on the image
-            Intent viewIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://ekstrabladet.dk/side9/"));
-            viewIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            PendingIntent pending = PendingIntent.getActivity(context, 0, viewIntent, Intent.FLAG_ACTIVITY_NEW_TASK);		            
-            views.setOnClickPendingIntent(R.id.side9picture, pending);		            
-            
-            // Tell the AppWidgetManager to perform an update on the current App Widget
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-            
-            Log.i("Side9Pigen", "done " + appWidgetId);
-        }	
+		for (int i=0; i<N; i++) {
+			int appWidgetId = appWidgetIds[i];
+
+			RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
+
+			if (image != null) {
+				views.setImageViewBitmap(R.id.side9picture, image);
+			} else {
+				views.setImageViewResource(R.id.side9picture, R.drawable.side9logo);
+			}
+			//views.setTextViewText(R.id.caption, newData.caption);
+
+
+			// Launch a browser when user clicks on the image
+			Intent viewIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://ekstrabladet.dk/side9/"));
+			viewIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			PendingIntent pending = PendingIntent.getActivity(context, 0, viewIntent, Intent.FLAG_ACTIVITY_NEW_TASK);		            
+			views.setOnClickPendingIntent(R.id.side9picture, pending);		            
+
+			// Tell the AppWidgetManager to perform an update on the current App Widget
+			appWidgetManager.updateAppWidget(appWidgetId, views);
+
+			Log.i("Side9Pigen", "done " + appWidgetId);
+		}	
 	}
-		
+
 	@Override
 	public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
 		super.onUpdate(context, appWidgetManager, appWidgetIds);
-				
+
 		Log.i("Side9Pigen", "onUpdate:");
-		
+
 		if (usedBitmap == null) { //load default view
 			usedBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.side9logo);
 		}
-		
+
+
+
 		ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 		if (connMgr.getBackgroundDataSetting() == false)
 		{
 			Log.i("Side9Pigen", "background data disabled");
 			return;
 		}
-		
-        try {
-        	Side9Data newData = Side9Xml.loadXml();
-        	
-        	if (! newData.equals(usedData)) {
-        		
-        		
-        		Log.i("Side9Pigen", "(Re)loading image:" + newData.url);
-	        		        	
-		        URL imgUrl = new URL( newData.url );	        
-		        
-		        URLConnection conn = imgUrl.openConnection();
-		        conn.setConnectTimeout(2000);
-		        Bitmap image = BitmapFactory.decodeStream( conn.getInputStream() );
-		        
-		        usedData = newData; // if we made it to here without exceptions, save the new data
-		        usedBitmap = image;
-		        
-        	} // endif
-        	        	
-        } catch (Exception e) {
-        	Log.e("Side9Pigen", "update failed", e);
-        }
-        
-        setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
-        Log.i("Side9Pigen", "update completed");
+
+		if (System.currentTimeMillis() > (timestamp+UDPATESPAN) ) {
+			Log.i("Side9Pigen", "time elapsed, force XML reload");
+			usedData = null;
+		}
+
+		try {
+			Side9Data newData = Side9Xml.loadXml();
+
+			if (! newData.equals(usedData)) {
+
+
+				Log.i("Side9Pigen", "(Re)loading image:" + newData.url);
+
+				URL imgUrl = new URL( newData.url );	        
+
+				URLConnection conn = imgUrl.openConnection();
+				conn.setConnectTimeout(2500);
+				Bitmap image = BitmapFactory.decodeStream( conn.getInputStream() );
+
+				usedData = newData; // if we made it to here without exceptions, save the new data
+				usedBitmap = image;
+				timestamp = System.currentTimeMillis();
+
+			} // endif
+
+		} catch (Exception e) {
+			Log.e("Side9Pigen", "update failed", e);
+		}
+
+		setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
+		Log.i("Side9Pigen", "update completed");
 	}
 
-	
+
 	//Called when the last widget is removed/disabled
 	@Override
 	public void onDisabled(Context context) {
 		super.onDisabled(context);
-		
+
 		usedData = null; //free memory
 		usedBitmap = null;
 	}