aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/view
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-02-17 17:28:47 -0800
committerScott Jackson <daneren2005@gmail.com>2016-02-17 17:28:47 -0800
commitb347afd7ba73219852d59c4f43d363f24449d8cd (patch)
tree5f6feb5577bdf4ae83429a5e667d309d99a5febe /app/src/main/java/github/daneren2005/dsub/view
parent7e16b7b7ebc8e5e00e11eaa862527903ccc1f58a (diff)
parentd5900f8e94e9111699ddaab717a2b3ad5c664003 (diff)
downloaddsub-b347afd7ba73219852d59c4f43d363f24449d8cd.tar.gz
dsub-b347afd7ba73219852d59c4f43d363f24449d8cd.tar.bz2
dsub-b347afd7ba73219852d59c4f43d363f24449d8cd.zip
Merge branch 'switch-network'
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/view')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/view/SettingView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SettingView.java b/app/src/main/java/github/daneren2005/dsub/view/SettingView.java
index efd8bc83..6dc116f8 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SettingView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/SettingView.java
@@ -81,6 +81,8 @@ public class SettingView extends UpdateView2<Setting, Boolean> {
res = R.string.admin_role_jukebox;
} else if(User.SHARE.equals(name)) {
res = R.string.admin_role_share;
+ } else if(User.VIDEO_CONVERSION.equals(name)) {
+ res = R.string.admin_role_video_conversion;
} else if(User.LASTFM.equals(name)) {
res = R.string.admin_role_lastfm;
} else {