[Mp-plugins-svn] SF.net SVN: mp-plugins:[4088] trunk/plugins/AndroidRemote

[<kro...@us...>]

Revision: 4088
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4088&view=rev
Author:   kroko_koenig
Date:     2011-02-02 13:55:02 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
fixed settings, forwarding still not working

Modified Paths:
--------------
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java
    trunk/plugins/AndroidRemote/Server/AndroidRemote.suo

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java	2011-02-01 14:33:14 UTC (rev 4087)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java	2011-02-02 13:55:02 UTC (rev 4088)
@@ -55,7 +55,7 @@
 	
 		txtInstance.setText("Instance name (" + AppSettings.getInstance() + ")");
 		txtName.setText(AppSettings.getName());
-		txtServer.setText(AppSettings.getServer());
+		txtServer.setText(AppSettings.getSavedServer());
 		txtPort.setText(AppSettings.getPort());
 		txtMac.setText(AppSettings.getMacId());
 	}

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java	2011-02-01 14:33:14 UTC (rev 4087)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java	2011-02-02 13:55:02 UTC (rev 4088)
@@ -44,7 +44,20 @@
 	{
 		return settings.getInt("Instance", 1);
 	}
-	
+	public static String getSavedServer()
+	{
+		switch(getInstance())
+		{
+		case 1:
+			return getServer1();
+		case 2:
+			return getServer2();
+		case 3:
+			return getServer3();
+		}
+		
+		return null;
+	}
 	public static String getServer()
 	{
 		String dns = "";
@@ -53,10 +66,13 @@
 		{
 		case 1:
 			dns = getServer1();
+			break;
 		case 2:
 			dns = getServer2();
+			break;
 		case 3:
 			dns = getServer3();
+			break;
 		}
 		
 		InetAddress in;

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java	2011-02-01 14:33:14 UTC (rev 4087)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java	2011-02-02 13:55:02 UTC (rev 4088)
@@ -49,8 +49,8 @@
 		try {
 			HttpURLConnection conn = (HttpURLConnection) myFileUrl
 					.openConnection();
-			conn.setConnectTimeout(5000);
-			conn.setReadTimeout(10000);
+			//conn.setConnectTimeout(5000);
+			//conn.setReadTimeout(10000);
 			conn.setRequestMethod("GET");
 			conn.setDoInput(true);
 			conn.connect();

Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
===================================================================
(Binary files differ)


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