--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/01 09:14:19	778
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/16 07:40:59	854
@@ -7,7 +7,6 @@
 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;
@@ -17,6 +16,7 @@
 import android.net.Uri;
 import android.os.Environment;
 import android.util.Log;
+import android.view.View;
 import android.widget.RemoteViews;
 import dk.thoerup.androidutils.HttpUtil;
 
@@ -29,10 +29,7 @@
 	private static Bitmap usedBitmap; 
 	private static long timestamp;
 
-	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;
@@ -52,7 +49,7 @@
 
 
 
-	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++) {
@@ -60,38 +57,25 @@
 
 			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);
-
-
-			Intent viewIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("http://www.ekstrabladet.dk/side9/"));			
-
-			
-			//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("showcaption", false);
 			
+			if (showcaption == true) {
+				views.setTextViewText(R.id.caption, " " + usedData.caption + " ");
+			} 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);		            
@@ -148,7 +132,7 @@
 			Log.e("Side9Pigen", "update failed", e);
 		}
 
-		setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
+		setImage(context,appWidgetManager,appWidgetIds);
 		Log.i("Side9Pigen", "update completed");
 	}
 	
@@ -157,7 +141,9 @@
 		SharedPreferences prefs = context.getSharedPreferences(TAG, Context.MODE_PRIVATE);
 		boolean saveImage = prefs.getBoolean("saveimage", false);
 		
-		File file = new File( SAVEDIR + data.getFilename() );
+		final String savepath = Environment.getExternalStorageDirectory() + "/Side9";
+		
+		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) {			
@@ -171,7 +157,7 @@
 		
 		if (saveImage == true) {
 			if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-				File savedir = new File(SAVEDIR);
+				File savedir = new File(savepath);
 				savedir.mkdirs();
 				
 				if (file.exists()) {
@@ -181,12 +167,19 @@
 				FileOutputStream fos = new FileOutputStream(file);
 				fos.write(imageData);
 				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);
+		Bitmap full = BitmapFactory.decodeByteArray(imageData, 0, imageData.length);
+		Bitmap scaled = Bitmap.createScaledBitmap(full, 400, 577, true);
+		return scaled;
 	}