--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/05/31 14:14:59	771
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/27 10:41:10	925
@@ -7,14 +7,18 @@
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 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;
 
@@ -26,11 +30,9 @@
 	private static Side9Data usedData;
 	private static Bitmap usedBitmap; 
 	private static long timestamp;
+	private static boolean reloadData;
 
-	final static long UDPATESPAN = 3*60*60*1000;
-	
-	final static String SAVEDIR = "/sdcard/Side9/"; 
-
+	final static long UDPATESPAN = 4*60*60*1000;
 
 	static  {
 		timestamp = 0L;
@@ -39,8 +41,18 @@
 	public Side9WidgetProvider() {
 		Log.i(TAG, "WidgetProvider constructor called");
 	}
+	
+	public void resetStatics() {
+		Log.i(TAG, "resetStatics");
+		usedData = null; 
+		usedBitmap = 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++) {
@@ -48,37 +60,28 @@
 
 			RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
 
-			if (image != null) {
-				views.setImageViewBitmap(R.id.side9picture, image);
+			if (usedBitmap != null) {
+				views.setImageViewBitmap(R.id.side9picture, usedBitmap);
 			} else {
 				views.setImageViewResource(R.id.side9picture, R.drawable.side9logo);
 			}
-			//views.setTextViewText(R.id.caption, newData.caption);
-
-
-
-			
-			//View single file
-//			Intent viewIntent = new Intent(android.content.Intent.ACTION_VIEW);
-	//		viewIntent.setDataAndType(Uri.parse("file:///sdcard/Side9/20100531_400.jpg"), "image/png");
-			
-			//view single file
-			//Intent viewIntent = new Intent(Intent.ACTION_VIEW);
-			//Uri u = Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "1" );
-			//viewIntent.setData(u);
-			
-			//Intent viewIntent = new Intent();
-			//viewIntent.setClassName("com.android.camera", "com.android.camera.GalleryPicker");
 			
+			boolean showcaption = context.
+					getSharedPreferences(Side9WidgetProvider.TAG, Context.MODE_PRIVATE).
+					getBoolean(Side9Config.PREFS_SHOWCAPTION, false);
+			
+			if (showcaption == true && usedData != null) {
+				views.setTextViewText(R.id.caption, " " + usedData.caption + " ");
+				views.setViewVisibility(R.id.caption, View.VISIBLE);
+			} else {
+				views.setViewVisibility(R.id.caption, View.GONE);
+			}
 
-			Intent viewIntent = new Intent();
-			viewIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-			viewIntent.setAction(Intent.ACTION_MAIN);
-			viewIntent.setComponent(new ComponentName("com.android.camera", ".GalleryPicker"));
-			viewIntent.setFlags(0x10200000); 
 
-			
-			
+			//Intent viewIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("http://www.ekstrabladet.dk/side9/"));			
+
+			Intent viewIntent = new Intent(context, dk.thoerup.side9.PictureOverview.class );
+						
 			
 			PendingIntent pending = PendingIntent.getActivity(context, 0, viewIntent, Intent.FLAG_ACTIVITY_NEW_TASK);		            
 			views.setOnClickPendingIntent(R.id.side9picture, pending);		            
@@ -109,15 +112,17 @@
 			return;
 		}
 
+		//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() > (timestamp+UDPATESPAN) ) {
 			Log.i(TAG, "time elapsed, force XML reload");
-			usedData = null;
+			reloadData = true;
 		}
 
 		try {
 			Side9Data newData = Side9Xml.loadXml();
 
-			if (! newData.equals(usedData)) {
+			if (! newData.equals(usedData) || reloadData == true) {
 
 
 				Log.i(TAG, "(Re)loading image:" + newData.url);
@@ -127,7 +132,7 @@
 				usedData = newData; // if we made it to here without exceptions, save the new data
 				usedBitmap = image;
 				timestamp = System.currentTimeMillis();
-				
+				reloadData = false;
 
 			} // endif
 
@@ -135,46 +140,92 @@
 			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);
 		
-		File file = new File( SAVEDIR + data.getFilename() );
+		final String savepath = Environment.getExternalStorageDirectory() + "/Side9";
 		
-		if (saveImage == true) {			
+		File file = new File( savepath + "/" + data.getFilename() );
+		
+		/* if the picture changes later on the day we do NOT want to use an old and invalid image		
+ 		if (saveImage == true) {			
 			if (file.exists()) {
 				return BitmapFactory.decodeFile(file.getAbsolutePath());
 			}
-		}
+		}*/
+		
 				
 		byte imageData[] = HttpUtil.getContent(data.url, 2500);
 		
 		if (saveImage == true) {
-			File savedir = new File(SAVEDIR);
-			savedir.mkdirs();
-			
-			FileOutputStream fos = new FileOutputStream(file);
-			fos.write(imageData);
-			fos.close();
+			if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+				File savedir = new File(savepath);
+				savedir.mkdirs();
+				
+				if (file.exists()) {
+					file.delete();
+				}
+				
+				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);								
+				context.sendBroadcast(rescan);
+				
+			} else {
+				Log.i(TAG, "sdcard is not mounted");
+			}
 		}
 		
-		return BitmapFactory.decodeByteArray(imageData, 0, imageData.length);
+		 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) {
 		super.onDisabled(context);
 		Log.i(TAG, "onDisabled");
-
-		usedData = null; //free memory
-		usedBitmap = null;
+		
+		resetStatics();//free memory
 	}
 
+	@Override
+	public void onEnabled(Context context) {
+		super.onEnabled(context);
+		Log.i(TAG, "onEnabled");
+		
+		resetStatics();//free memory
+	}
+	
 }