aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-02-15 17:30:34 -0800
committerScott Jackson <daneren2005@gmail.com>2016-02-15 17:30:34 -0800
commit38c243c22bf4a71047da254aadfd77f2c3b32a36 (patch)
treec4d3eb166dfba4dfbf9a5b4bf72353cd532c6075 /app/src
parent7e41d3820e155e2c93db545938955977e86911e3 (diff)
downloaddsub-38c243c22bf4a71047da254aadfd77f2c3b32a36.tar.gz
dsub-38c243c22bf4a71047da254aadfd77f2c3b32a36.tar.bz2
dsub-38c243c22bf4a71047da254aadfd77f2c3b32a36.zip
Fixes #643: Add Video Conversion role
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/domain/User.java4
-rw-r--r--app/src/main/java/github/daneren2005/dsub/view/SettingView.java2
-rw-r--r--app/src/main/res/values/strings.xml1
3 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/User.java b/app/src/main/java/github/daneren2005/dsub/domain/User.java
index b5ee6188..5307828a 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/User.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/User.java
@@ -33,8 +33,9 @@ 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 VIDEO_CONVERSION = "videoConversionRole";
public static final String LASTFM = "lastFMRole";
- public static final List<String> ROLES = new ArrayList<String>();
+ public static final List<String> ROLES = new ArrayList<>();
static {
ROLES.add(ADMIN);
@@ -47,6 +48,7 @@ public class User implements Serializable {
ROLES.add(PODCAST);
ROLES.add(JUKEBOX);
ROLES.add(SHARE);
+ ROLES.add(VIDEO_CONVERSION);
}
private String username;
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 {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e783d641..545cc153 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -548,6 +548,7 @@
<string name="admin.role.stream">Stream music</string>
<string name="admin.role.jukebox">Control jukebox</string>
<string name="admin.role.share">Manage shares</string>
+ <string name="admin.role.video_conversion">Convert videos</string>
<string name="admin.role.lastfm">Use Last.FM feature</string>
<string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>