summaryrefslogtreecommitdiff
path: root/vdrmanager/src/de
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2011-11-04 01:32:04 +0100
committerlado <herrlado@gmail.com>2011-11-04 01:32:04 +0100
commitaf6aa81ee61d8baa0b4b1b6e83e8e8994f3a21f6 (patch)
treec99b6ec2f5a4647cfae4ad7206db51dc4c69b823 /vdrmanager/src/de
parent829e3e7d9124ce4ab9a662376e03c6671d543b83 (diff)
downloadvdr-manager-af6aa81ee61d8baa0b4b1b6e83e8e8994f3a21f6.tar.gz
vdr-manager-af6aa81ee61d8baa0b4b1b6e83e8e8994f3a21f6.tar.bz2
getting ready for profiles
Diffstat (limited to 'vdrmanager/src/de')
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrListActivity.java8
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrPreferencesActivity.java21
-rw-r--r--vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java8
3 files changed, 35 insertions, 2 deletions
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrListActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrListActivity.java
new file mode 100644
index 0000000..d0955cf
--- /dev/null
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrListActivity.java
@@ -0,0 +1,8 @@
+package de.bjusystems.vdrmanager.gui;
+
+import android.app.ListActivity;
+import android.preference.PreferenceActivity;
+
+public class VdrListActivity extends ListActivity {
+
+}
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrPreferencesActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrPreferencesActivity.java
new file mode 100644
index 0000000..62f9953
--- /dev/null
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/VdrPreferencesActivity.java
@@ -0,0 +1,21 @@
+package de.bjusystems.vdrmanager.gui;
+
+import de.bjusystems.vdrmanager.R;
+import de.bjusystems.vdrmanager.data.Preferences;
+import android.os.Bundle;
+
+public class VdrPreferencesActivity extends BasePreferencesActivity {
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+
+ super.onCreate(savedInstanceState);
+
+ this.getPreferenceManager().setSharedPreferencesName(
+ Preferences.getPreferenceFile(this));
+ this.addPreferencesFromResource(R.xml.vdr_prefs);
+
+
+ }
+}
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java
index 741250f..9f93525 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java
@@ -82,7 +82,7 @@ public class ChannelClient extends SvdrpClient<Channel> implements
* parameter for lste
*/
@Override
- public void run() throws SvdrpException {
+ synchronized public void run() throws SvdrpException {
if (inited == true) {
informListener(SvdrpEvent.CACHE_HIT, null);
} else {
@@ -100,7 +100,7 @@ public class ChannelClient extends SvdrpClient<Channel> implements
return R.string.progress_channels_loading;
}
- ArrayList<Channel> currentChannels = null;
+ ArrayList<Channel> currentChannels = new ArrayList<Channel>();
private void received(Channel c) {
if (c.isGroupSeparator()) {
@@ -108,6 +108,10 @@ public class ChannelClient extends SvdrpClient<Channel> implements
currentChannels = new ArrayList<Channel>();
groupChannels.put(c.getName(), currentChannels);
} else {
+ if(channelGroups.isEmpty()){//receiver channel with no previous group
+ channelGroups.add("");
+ groupChannels.put("", currentChannels);
+ }
channels.add(c);
currentChannels.add(c);
String provider = c.getProvider();