[Mp-plugins-svn] SF.net SVN: mp-plugins:[4040] trunk/plugins/AndroidRemote/Android/ MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java

[<Rol...@us...>]

Revision: 4040
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4040&view=rev
Author:   Rollsroyc3
Date:     2010-12-16 20:51:21 +0000 (Thu, 16 Dec 2010)

Log Message:
-----------
bugfix

Modified Paths:
--------------
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java	2010-12-16 20:31:18 UTC (rev 4039)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java	2010-12-16 20:51:21 UTC (rev 4040)
@@ -137,28 +137,27 @@
 		public void run() {
 
 			if (slideShow) {
-				if (!randomShow) {
-					int max = pictures.pictureList.size();
+				int max = pictures.pictureList.size();
 
-					if (pictures.selectedPicture < max - 1)
-						pictures.selectedPicture++;
-					else
-						pictures.selectedPicture = 0;
+				if (pictures.selectedPicture < max - 1)
+					pictures.selectedPicture++;
+				else
+					pictures.selectedPicture = 0;
 
-					new setPicture().execute();
-				} else {
-					String req = "http://" + Settings.Server + ":"
-					+ Settings.Port + "/random/pictures/random.jpg";
-					httpHandler handler = new httpHandler();
+				new setPicture().execute();
+			}
+			else if (randomShow) {
+				String req = "http://" + Settings.Server + ":"
+				+ Settings.Port + "/random/pictures/random.jpg";
+				httpHandler handler = new httpHandler();
 
-					Bitmap pic = handler.DownloadImage(req);
+				Bitmap pic = handler.DownloadImage(req);
 
-					ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
-					imagev.setImageBitmap(pic);
+				ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+				imagev.setImageBitmap(pic);
 
-					TextView txt = (TextView) findViewById(R.id.full_text);
-					txt.setText("Random slide show");
-				}
+				TextView txt = (TextView) findViewById(R.id.full_text);
+				txt.setText("Random slide show");
 			}
 
 			mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
@@ -306,21 +305,21 @@
 	public void onLongPress(MotionEvent arg0) {
 		String slidestatus;
 		String randomslidestatus;
-		
+
 		if (slideShow == true) 
 			slidestatus = "Stop slideshow";
 		else
 			slidestatus = "Start slideshow";
-		
+
 		if (randomShow == true) 
 			randomslidestatus = "Stop random slideshow";
 		else
 			randomslidestatus = "Start random slideshow";
-		
-		
+
+
 		final CharSequence[] items = { "Save to sd card", "Open in browser",
 				"Send Picture", slidestatus ,randomslidestatus,  "Cancel" };
-		
+
 		AlertDialog.Builder builder = new AlertDialog.Builder(picturesfullscreen.this);
 		builder.setTitle("Picture optoins");
 		builder.setItems(items, new DialogInterface.OnClickListener() {
@@ -340,12 +339,18 @@
 						slideShow = false;
 					else
 						slideShow = true;
+
+					mHandler.removeCallbacks(mUpdateTimeTask);
+					mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
 					break;
 				case 4:
 					if (randomShow == true)
 						randomShow = false;
 					else
 						randomShow = true;
+
+					mHandler.removeCallbacks(mUpdateTimeTask);
+					mHandler.postDelayed(mUpdateTimeTask, SlideInterval);
 					break;
 				}
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.