--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/04/19 12:49:31	649
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/04/28 14:40:33	689
@@ -20,18 +20,50 @@
 	
 	//The data needs to be static, since BroadcastReceivers (which WidgetProviders extends) are only valid during onReceive()
 	private static Side9Data usedData;
+	private static Bitmap usedBitmap; 
 	
 	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
+		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(Side9Xml.BASEURL));
+            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:");
 		
-		final int N = appWidgetIds.length; //
-		
-		Log.e("Side9Pigen", "onUpdate:" + N);
+		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)
@@ -51,39 +83,20 @@
 		        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;
 		        
-		
-		        // Perform this loop procedure for each App Widget that belongs to this provider
-		        for (int i=0; i<N; i++) {
-		            int appWidgetId = appWidgetIds[i];
-		            		            
-		            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
-		            		            
-		            views.setImageViewBitmap(R.id.side9picture, image);
-		            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(Side9Xml.BASEURL));
-		            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);
-		        }	
-	        } //END if (data.equals)
-        	
+        	} // endif
+        	        	
         } catch (Exception e) {
         	Log.e("Side9Pigen", "update failed", e);
         }
+        
+        setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
+        Log.i("Side9Pigen", "update completed");
 	}
 
 	
@@ -93,6 +106,7 @@
 		super.onDisabled(context);
 		
 		usedData = null; //free memory
+		usedBitmap = null;
 	}
 
 }