From 783ef0d0e748ed9438ec0e7b8f77c2e652d01ca1 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 22 Jul 2014 18:21:20 -0700 Subject: Add display of Madsonic specific Last.FM feature role, whatever the heck it does --- src/github/daneren2005/dsub/domain/User.java | 1 + src/github/daneren2005/dsub/service/parser/UserParser.java | 1 + src/github/daneren2005/dsub/view/SettingView.java | 2 ++ 3 files changed, 4 insertions(+) (limited to 'src/github') 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 ROLES = new ArrayList(); 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); -- cgit v1.2.3