From 38c243c22bf4a71047da254aadfd77f2c3b32a36 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 15 Feb 2016 17:30:34 -0800
Subject: Fixes #643: Add Video Conversion role

---
 app/src/main/java/github/daneren2005/dsub/domain/User.java      | 4 +++-
 app/src/main/java/github/daneren2005/dsub/view/SettingView.java | 2 ++
 app/src/main/res/values/strings.xml                             | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/src')

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>
-- 
cgit v1.2.3