diff options
| author | bju <bju@maxi.fritz.box> | 2011-03-20 00:45:32 +0100 |
|---|---|---|
| committer | bju <bju@maxi.fritz.box> | 2011-03-20 00:45:32 +0100 |
| commit | d1843c8b6310533a32c10c08e3aeb511a5f8be08 (patch) | |
| tree | 13157509bd5f210ad3b8e4ad145624e0dc92a640 /androvdr/src | |
| parent | 4702ecb836a85bfe3dbc19d8e6716e16756f0569 (diff) | |
| download | vdr-manager-d1843c8b6310533a32c10c08e3aeb511a5f8be08.tar.gz vdr-manager-d1843c8b6310533a32c10c08e3aeb511a5f8be08.tar.bz2 | |
Removed unneded settings
Diffstat (limited to 'androvdr/src')
3 files changed, 6 insertions, 29 deletions
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 */ @@ -106,14 +104,6 @@ public class Preferences { } /** - * 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) { } |