diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-06-13 06:58:40 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-06-13 06:58:40 -0700 |
| commit | 4a6eb7e598697c8e2ac64952613512070db5288d (patch) | |
| tree | 114171ca4b9c65b0a51d1aa832d8237447390b91 /src | |
| parent | 77001c332c4f1a903c3efcd48e397469366ce79f (diff) | |
| download | dsub-4a6eb7e598697c8e2ac64952613512070db5288d.tar.gz dsub-4a6eb7e598697c8e2ac64952613512070db5288d.tar.bz2 dsub-4a6eb7e598697c8e2ac64952613512070db5288d.zip | |
Fix web commits with rework of admin descriptions
Diffstat (limited to 'src')
| -rw-r--r-- | src/github/daneren2005/dsub/domain/User.java | 3 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/view/SettingView.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/github/daneren2005/dsub/domain/User.java b/src/github/daneren2005/dsub/domain/User.java index 052985b3..f04b3d94 100644 --- a/src/github/daneren2005/dsub/domain/User.java +++ b/src/github/daneren2005/dsub/domain/User.java @@ -34,15 +34,14 @@ public class User implements Serializable { public static final List<String> ROLES = new ArrayList<String>();
static {
- ROLES.add(scrobbling);
ROLES.add(ADMIN);
ROLES.add(SETTINGS);
+ ROLES.add(STREAM);
ROLES.add(DOWNLOAD);
ROLES.add(UPLOAD);
ROLES.add(COVERART);
ROLES.add(COMMENT);
ROLES.add(PODCAST);
- ROLES.add(STREAM);
ROLES.add(JUKEBOX);
ROLES.add(SHARE);
}
diff --git a/src/github/daneren2005/dsub/view/SettingView.java b/src/github/daneren2005/dsub/view/SettingView.java index 8f265f0f..70fb4715 100644 --- a/src/github/daneren2005/dsub/view/SettingView.java +++ b/src/github/daneren2005/dsub/view/SettingView.java @@ -20,6 +20,9 @@ import android.view.LayoutInflater; import android.view.View;
import android.widget.CheckedTextView;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.User;
+
import static github.daneren2005.dsub.domain.User.Setting;
public class SettingView extends UpdateView {
@@ -46,7 +49,7 @@ public class SettingView extends UpdateView { int res = -1;
if(User.SCROBBLING.equals(name)) {
- res = R.string.scrobblingEnabled;
+ res = R.string.admin_scrobblingEnabled;
} else if(User.ADMIN.equals(name)) {
res = R.string.admin_role_admin;
} else if(User.SETTINGS.equals(name)) {
@@ -69,7 +72,7 @@ public class SettingView extends UpdateView { res = R.string.admin_role_share;
} else {
// Last resort to display the raw value
- view.setText(name;
+ view.setText(name);
}
if(res != -1) {
|