aboutsummaryrefslogtreecommitdiff
path: root/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-07-22 18:21:20 -0700
committerScott Jackson <daneren2005@gmail.com>2014-07-22 18:21:20 -0700
commit783ef0d0e748ed9438ec0e7b8f77c2e652d01ca1 (patch)
tree58b8f2578a7815e0ebf479b86da58c48310cf97c /src/github
parent0f1a69656d19f3da8a907164e5e1de23dcfb6ac6 (diff)
downloaddsub-783ef0d0e748ed9438ec0e7b8f77c2e652d01ca1.tar.gz
dsub-783ef0d0e748ed9438ec0e7b8f77c2e652d01ca1.tar.bz2
dsub-783ef0d0e748ed9438ec0e7b8f77c2e652d01ca1.zip
Add display of Madsonic specific Last.FM feature role, whatever the heck it does
Diffstat (limited to 'src/github')
-rw-r--r--src/github/daneren2005/dsub/domain/User.java1
-rw-r--r--src/github/daneren2005/dsub/service/parser/UserParser.java1
-rw-r--r--src/github/daneren2005/dsub/view/SettingView.java2
3 files changed, 4 insertions, 0 deletions
diff --git a/src/github/daneren2005/dsub/domain/User.java b/src/github/daneren2005/dsub/domain/User.java
index f04b3d94..f61f98df 100644
--- a/src/github/daneren2005/dsub/domain/User.java
+++ b/src/github/daneren2005/dsub/domain/User.java
@@ -31,6 +31,7 @@ public class User implements Serializable {
public static final String STREAM = "streamRole";
public static final String JUKEBOX = "jukeboxRole";
public static final String SHARE = "shareRole";
+ public static final String LASTFM = "lastFMRole";
public static final List<String> ROLES = new ArrayList<String>();
static {
diff --git a/src/github/daneren2005/dsub/service/parser/UserParser.java b/src/github/daneren2005/dsub/service/parser/UserParser.java
index 558a7bab..931bc4a5 100644
--- a/src/github/daneren2005/dsub/service/parser/UserParser.java
+++ b/src/github/daneren2005/dsub/service/parser/UserParser.java
@@ -50,6 +50,7 @@ public class UserParser extends AbstractParser {
for(String role: User.ROLES) {
parseSetting(user, role);
}
+ parseSetting(user, User.LASTFM);
result.add(user);
} else if ("error".equals(name)) {
diff --git a/src/github/daneren2005/dsub/view/SettingView.java b/src/github/daneren2005/dsub/view/SettingView.java
index 70fb4715..ea89fb01 100644
--- a/src/github/daneren2005/dsub/view/SettingView.java
+++ b/src/github/daneren2005/dsub/view/SettingView.java
@@ -70,6 +70,8 @@ public class SettingView extends UpdateView {
res = R.string.admin_role_jukebox;
} else if(User.SHARE.equals(name)) {
res = R.string.admin_role_share;
+ } else if(User.LASTFM.equals(name)) {
+ res = R.string.admin_role_lastfm;
} else {
// Last resort to display the raw value
view.setText(name);