From c8bbb2f99eb5cce84685ee797ba5580764cd102a Mon Sep 17 00:00:00 2001
From: Shaka Huang <shaka@cs03.org>
Date: Sun, 4 Dec 2011 23:46:47 +0800
Subject: [PATCH] Remove unused code

Also re-arrange codes

Signed-off-by: Shaka Huang <shaka@cs03.org>
---
 .../widget/WidgetService.java                 | 43 ++++++-------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/com/corner23/android/beautyclocklivewallpaper/widget/WidgetService.java b/src/com/corner23/android/beautyclocklivewallpaper/widget/WidgetService.java
index a4f8a03..c3662c3 100755
--- a/src/com/corner23/android/beautyclocklivewallpaper/widget/WidgetService.java
+++ b/src/com/corner23/android/beautyclocklivewallpaper/widget/WidgetService.java
@@ -36,7 +36,6 @@ public class WidgetService extends Service implements SharedPreferences.OnShared
 	private int mScreenWidth = 0;
 	
 	private SharedPreferences mPrefs;
-	private File PictureFile = null;
 	
 	private boolean mRegScreenBR = false;
 	private boolean mRegTimeBR = false;
@@ -141,7 +140,7 @@ private void unregisterTimeBroadcastReceiver() {
 		}
 	}
 	
-	private Bitmap updateBeautyBitmap() {
+	private String getPicturePath() {
 		mTime.setToNow();		
 		int hour = mTime.hour;
 		int minute = mTime.minute;
@@ -151,7 +150,6 @@ private Bitmap updateBeautyBitmap() {
 		// check SD card first
 		String fname = String.format("%s/%02d%02d.jpg", storePath, hour, minute);
 		File _f_sdcard = new File(fname);
-		PictureFile = _f_sdcard;
 		if (!_f_sdcard.exists()) {
 			fname = String.format("%s/%02d%02d.jpg", getCacheDir().getAbsolutePath(), hour, minute);
 			File _f_cache = new File(fname);
@@ -164,22 +162,22 @@ private Bitmap updateBeautyBitmap() {
 				
 				return null;
 			}
-			PictureFile = _f_cache;
 		}
 		
 		Log.d(TAG, fname);
-		return BitmapFactory.decodeFile(fname);
+		return fname;
 	}
 
 	private Bitmap ResizeBitmap(Bitmap bitmap) {
 		if (bitmap == null) {
-			Log.d(TAG, "null !");
+			Log.d(TAG, "NULL Bitmap !");
 			return null;
 		}
 		
 		int width = bitmap.getWidth();
 		int height = bitmap.getHeight();
 		if (width == 0 || height == 0) {
+			Log.d(TAG, "Bitmap format error !");
 			return null;
 		}
 		
@@ -187,30 +185,13 @@ private Bitmap ResizeBitmap(Bitmap bitmap) {
 			return null;
 		}
 				
-		int maxWidth = mScreenWidth;
-		int maxHeight = mScreenHeight;
-/*		
-		if (height > maxHeight) {
-			double ratio = (double) maxHeight / height;
-			height = maxHeight;
-			width = (int) (width * ratio);
-			bScaled = true;
-		}
-		
-		if (width > maxWidth) {
-			double ratio = (double) maxWidth / width;
-			width = maxWidth;
-			height = (int) (height * ratio);
-			bScaled = true;
-		}
-*/
 		if (height > width) {
-			double ratio = (double) maxHeight / height;
-			height = maxHeight;
+			double ratio = (double) mScreenHeight / height;
+			height = mScreenHeight;
 			width = (int) (width * ratio);
 		} else {
-			double ratio = (double) maxWidth / width;
-			width = maxWidth;
+			double ratio = (double) mScreenWidth / width;
+			width = mScreenWidth;
 			height = (int) (height * ratio);
 		}
 		
@@ -231,12 +212,14 @@ private void updateWidget(Context context) {
 		
 		remoteViews.setTextViewText(R.id.TimeTextView, String.format(DISPLAYTIME_FORMAT, mTime.hour, mTime.minute));
 		remoteViews.setOnClickPendingIntent(R.id.BeautyClockImageView, pendingIntent);
+		remoteViews.setViewVisibility(R.id.ShareIt, View.GONE);
 		
-		Bitmap bitmap = updateBeautyBitmap();
-		if (bitmap == null) {
+		String fname = getPicturePath();
+		if (fname == null) {
 			remoteViews.setImageViewResource(R.id.BeautyClockImageView, R.drawable.beautyclock_retry);
-			remoteViews.setViewVisibility(R.id.ShareIt, View.GONE);
 		} else {
+			File PictureFile = new File(fname);
+			Bitmap bitmap = BitmapFactory.decodeFile(fname);
 			Bitmap bitmap_scaled = ResizeBitmap(bitmap);
 			if (bitmap_scaled != null) {
 				remoteViews.setImageViewBitmap(R.id.BeautyClockImageView, bitmap_scaled);