--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/03 09:39:56	793
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/27 15:48:24	927
@@ -15,7 +15,10 @@
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Environment;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
 import android.widget.RemoteViews;
 import dk.thoerup.androidutils.HttpUtil;
 
@@ -24,14 +27,15 @@
 	public static final String TAG = "Side9Pigen";
 
 	//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;
+	private static Side9Data mUsedData;
+	private static Bitmap mUsedBitmap; 
+	private static long mTimestamp;
+	private static boolean mReloadData;
 
 	final static long UDPATESPAN = 4*60*60*1000;
 
 	static  {
-		timestamp = 0L;
+		mTimestamp = 0L;
 	}
 
 	public Side9WidgetProvider() {
@@ -40,15 +44,15 @@
 	
 	public void resetStatics() {
 		Log.i(TAG, "resetStatics");
-		usedData = null; 
-		usedBitmap = null;		
+		mUsedData = null; 
+		mUsedBitmap = null;		
 	}
 	
 	
 
 
 
-	private void setImage(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, Bitmap image) {
+	private void setImage(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
 		// 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++) {
@@ -56,12 +60,22 @@
 
 			RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
 
-			if (image != null) {
-				views.setImageViewBitmap(R.id.side9picture, image);
+			if (mUsedBitmap != null) {
+				views.setImageViewBitmap(R.id.side9picture, mUsedBitmap);
 			} else {
 				views.setImageViewResource(R.id.side9picture, R.drawable.side9logo);
 			}
-			//views.setTextViewText(R.id.caption, newData.caption);
+			
+			boolean showcaption = context.
+					getSharedPreferences(Side9WidgetProvider.TAG, Context.MODE_PRIVATE).
+					getBoolean(Side9Config.PREFS_SHOWCAPTION, false);
+			
+			if (showcaption == true && mUsedData != null) {
+				views.setTextViewText(R.id.caption, " " + mUsedData.caption + " ");
+				views.setViewVisibility(R.id.caption, View.VISIBLE);
+			} else {
+				views.setViewVisibility(R.id.caption, View.GONE);
+			}
 
 
 			//Intent viewIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("http://www.ekstrabladet.dk/side9/"));			
@@ -85,8 +99,8 @@
 
 		Log.i(TAG, "onUpdate:");
 
-		if (usedBitmap == null) { //load default view
-			usedBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.side9logo);
+		if (mUsedBitmap == null) { //load default view
+			mUsedBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.side9logo);
 		}
 
 
@@ -98,25 +112,27 @@
 			return;
 		}
 
-		if (System.currentTimeMillis() > (timestamp+UDPATESPAN) ) {
+		//we need to do a full reload of all data now and then because eb.dk sometimes are a bit slow with publishing the new 
+		//daily picture, and this is a (crude) way to ensure we have the latest data
+		if (System.currentTimeMillis() > (mTimestamp+UDPATESPAN) ) {
 			Log.i(TAG, "time elapsed, force XML reload");
-			usedData = null;
+			mReloadData = true;
 		}
 
 		try {
 			Side9Data newData = Side9Xml.loadXml();
 
-			if (! newData.equals(usedData)) {
+			if (! newData.equals(mUsedData) || mReloadData == true) {
 
 
 				Log.i(TAG, "(Re)loading image:" + newData.url);
 
 				Bitmap image = getImageData(context, newData);
 
-				usedData = newData; // if we made it to here without exceptions, save the new data
-				usedBitmap = image;
-				timestamp = System.currentTimeMillis();
-				
+				mUsedData = newData; // if we made it to here without exceptions, save the new data
+				mUsedBitmap = image;
+				mTimestamp = System.currentTimeMillis();
+				mReloadData = false;
 
 			} // endif
 
@@ -124,14 +140,14 @@
 			Log.e("Side9Pigen", "update failed", e);
 		}
 
-		setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
+		setImage(context,appWidgetManager,appWidgetIds);
 		Log.i("Side9Pigen", "update completed");
 	}
 	
 	Bitmap getImageData(Context context, Side9Data data) throws IOException {	
 		
 		SharedPreferences prefs = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
-		boolean saveImage = prefs.getBoolean("saveimage", false);
+		boolean saveImage = prefs.getBoolean(Side9Config.PREFS_SAVEIMAGE, false);
 		
 		final String savepath = Environment.getExternalStorageDirectory() + "/Side9";
 		
@@ -159,6 +175,14 @@
 				FileOutputStream fos = new FileOutputStream(file);
 				fos.write(imageData);
 				fos.close();
+				
+				File infoFile = new File( file.toString().replace(".jpg", ".txt"));
+				if (infoFile.exists()) {
+					infoFile.delete();
+				}
+				fos = new FileOutputStream(infoFile);
+				fos.write(data.caption.getBytes());
+				fos.close();
 
 				Intent rescan = new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://" + Environment.getExternalStorageDirectory()) );
 				rescan.putExtra("read-only", false);								
@@ -169,12 +193,24 @@
 			}
 		}
 		
-		Bitmap full = BitmapFactory.decodeByteArray(imageData, 0, imageData.length);
-		Bitmap scaled = Bitmap.createScaledBitmap(full, 400, 577, true);
-		return scaled;
+		 DisplayMetrics metrics = new DisplayMetrics();
+		 WindowManager wmgr = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+		 wmgr.getDefaultDisplay().getMetrics(metrics);
+		 int w = metrics.widthPixels - (2*40);
+		 int h = getHeight(w);
+		 
+		 Log.e(TAG, "w=" + w + "   h=" + h);
+		
+		 Bitmap full = BitmapFactory.decodeByteArray(imageData, 0, imageData.length);
+		 Bitmap scaled = Bitmap.createScaledBitmap(full, w, h, true);
+		 return scaled;
+	}
+
+	private static int getHeight(int w) {
+		double h = w * (650.0 / 450.0);
+		return (int)h;
 	}
-
-
+	
 	//Called when the last widget is removed/disabled
 	@Override
 	public void onDisabled(Context context) {