From d1843c8b6310533a32c10c08e3aeb511a5f8be08 Mon Sep 17 00:00:00 2001
From: bju <bju@maxi.fritz.box>
Date: Sun, 20 Mar 2011 00:45:32 +0100
Subject: Removed unneded settings

---
 androvdr/res/values/preferences.xml                    |  4 +---
 androvdr/res/values/preferences_keys.xml               |  2 +-
 androvdr/res/xml/preferences.xml                       |  5 +----
 .../src/de/bjusystems/androvdr/data/Preferences.java   | 11 -----------
 .../bjusystems/androvdr/utils/svdrp/SvdrpClient.java   |  6 +-----
 .../androvdr/utils/wakeup/AsyncWakeupTask.java         | 18 +++++-------------
 6 files changed, 9 insertions(+), 37 deletions(-)

(limited to 'androvdr')

diff --git a/androvdr/res/values/preferences.xml b/androvdr/res/values/preferences.xml
index a354345..36a5e1a 100644
--- a/androvdr/res/values/preferences.xml
+++ b/androvdr/res/values/preferences.xml
@@ -14,7 +14,7 @@
   <string name="vdr_ssl_summary">Use SSL for connections</string>
   
   <!-- channel filter preferences -->
-  <string name="channel_filter_preferences">Limit channels</string>
+  <string name="channel_filter_preferences">Channel settings</string>
   <string name="channel_filter_filter_title">Limit channels</string>
   <string name="channel_filter_filter_summary">Use only given channels</string>
   <string name="channel_filter_last_title">Channels</string>
@@ -24,8 +24,6 @@
   <string name="wakeup_preferences">Remote VDR host wakeup</string>
   <string name="wakeup_enabled_title">Can remote wakeup VDR</string>
   <string name="wakeup_enabled_summary">Enables to remote wakeup the VDR host</string>
-  <string name="wakeup_svdrphelper_title">Use HTTP request for wakeup</string>
-  <string name="wakeup_svdrphelper_summary">Wakeup by HTTP request and not using SvdrpHelper</string>
   <string name="wakeup_url_title">URL for remote wakeup</string>
   <string name="wakeup_url_summary">URL for a request doing the wakeup</string>
   <string name="wakeup_user_title">Wakeup user</string>
diff --git a/androvdr/res/values/preferences_keys.xml b/androvdr/res/values/preferences_keys.xml
index d60b323..36fee64 100644
--- a/androvdr/res/values/preferences_keys.xml
+++ b/androvdr/res/values/preferences_keys.xml
@@ -13,7 +13,7 @@
   <string name="channel_filter_last_key">last_channel</string>
   
   <string name="wakeup_enabled_key">wakeup_enabled</string>
-  <string name="wakeup_svdrphelper_key">wakeup_http</string>
+  
   <string name="wakeup_url_key">wakeup_url</string>
   <string name="wakeup_user_key">wakeup_user</string>
   <string name="wakeup_password_key">wakeup_password</string>
diff --git a/androvdr/res/xml/preferences.xml b/androvdr/res/xml/preferences.xml
index 6d69051..8a84449 100644
--- a/androvdr/res/xml/preferences.xml
+++ b/androvdr/res/xml/preferences.xml
@@ -50,10 +50,7 @@
     android:title="@string/wakeup_enabled_title"
     android:summary="@string/wakeup_enabled_summary"/>
 
-  <CheckBoxPreference
-    android:key="@string/wakeup_svdrphelper_key"
-    android:title="@string/wakeup_svdrphelper_title"
-    android:summary="@string/wakeup_svdrphelper_summary"/>
+  
 
   <EditTextPreference
     android:key="@string/wakeup_url_key"
diff --git a/androvdr/src/de/bjusystems/androvdr/data/Preferences.java b/androvdr/src/de/bjusystems/androvdr/data/Preferences.java
index 2caaf32..f317915 100644
--- a/androvdr/src/de/bjusystems/androvdr/data/Preferences.java
+++ b/androvdr/src/de/bjusystems/androvdr/data/Preferences.java
@@ -23,8 +23,6 @@ public class Preferences {
 	private String channels;
 	/** Enable remote wakeup */
 	private boolean wakeupEnabled;
-	/** Wakeup by HTTP request */
-	private boolean wakeupHttp;
 	/** URL of the wakeup script */
 	private String wakeupUrl;
 	/** User for wakeup */
@@ -105,14 +103,6 @@ public class Preferences {
 		return wakeupEnabled;
 	}
 
-	/**
-	 * Gets the wakeup method
-	 * @return true, wenn wakeup by http request
-	 */
-	public boolean isWakeupHttp() {
-		return wakeupHttp;
-	}
-
 	/**
 	 * Gets the URL for the wakeup request
 	 * @return wakeup url
@@ -248,7 +238,6 @@ public class Preferences {
 		prefs.filterChannels = getBoolean(context, sharedPrefs, R.string.channel_filter_filter_key, false);
 
 		prefs.wakeupEnabled = getBoolean(context, sharedPrefs, R.string.wakeup_enabled_key, false);
-		prefs.wakeupHttp = getBoolean(context, sharedPrefs, R.string.wakeup_svdrphelper_key, false);
 		prefs.wakeupUrl = getString(context, sharedPrefs, R.string.wakeup_url_key, "");
 		prefs.wakeupUser = getString(context, sharedPrefs, R.string.wakeup_user_key, "");
 		prefs.wakeupPassword = getString(context, sharedPrefs, R.string.wakeup_password_key, "");
diff --git a/androvdr/src/de/bjusystems/androvdr/utils/svdrp/SvdrpClient.java b/androvdr/src/de/bjusystems/androvdr/utils/svdrp/SvdrpClient.java
index 868e2f7..a3eadff 100644
--- a/androvdr/src/de/bjusystems/androvdr/utils/svdrp/SvdrpClient.java
+++ b/androvdr/src/de/bjusystems/androvdr/utils/svdrp/SvdrpClient.java
@@ -104,11 +104,7 @@ public abstract class SvdrpClient<Result> {
 		try {
 			// connect
 			informListener(SvdrpEvent.CONNECTING, null);
-			if (prefs.isSSL()) {
-				throw new IllegalArgumentException("SSL not implemented yet");
-			} else {
-				socket = new Socket(prefs.getSvdrpHost(), prefs.getSvdrpPort());
-			}
+			socket = new Socket(prefs.getSvdrpHost(), prefs.getSvdrpPort());
 			informListener(SvdrpEvent.CONNECTED, null);
 		} catch (final IOException e) {
 			informListener(SvdrpEvent.CONNECT_ERROR, null);
diff --git a/androvdr/src/de/bjusystems/androvdr/utils/wakeup/AsyncWakeupTask.java b/androvdr/src/de/bjusystems/androvdr/utils/wakeup/AsyncWakeupTask.java
index 7002140..a5603db 100644
--- a/androvdr/src/de/bjusystems/androvdr/utils/wakeup/AsyncWakeupTask.java
+++ b/androvdr/src/de/bjusystems/androvdr/utils/wakeup/AsyncWakeupTask.java
@@ -33,19 +33,11 @@ public class AsyncWakeupTask extends AsyncTask<Object, WakeupProgress, Void> {
 		boolean ok = false;
 		try {
 
-			// send request
-			if (prefs.isWakeupHttp()) {
-				// wakeup by http request
-				final HttpHelper httpHelper = new HttpHelper();
-				httpHelper.performGet(prefs.getWakeupUrl(), prefs.getWakeupUser(), prefs.getWakeupPassword(), null);
-				// request sent
-				ok = true;
-			} else {
-				// wakeup by SvdrpHelper
-				final WakeupClient client = new WakeupClient();
-				client.run();
-				ok = client.getState().equals(WakeupState.OK);
-			}
+			// wakeup by http request
+			final HttpHelper httpHelper = new HttpHelper();
+			httpHelper.performGet(prefs.getWakeupUrl(), prefs.getWakeupUser(), prefs.getWakeupPassword(), null);
+			// request sent
+			ok = true;
 
 		} catch (final Exception e) {
 		}
-- 
cgit v1.2.3