From 62aa673906cc6ecb1d5b19262ab2d918cd8f1b6d Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 4 Feb 2016 18:38:51 -0800
Subject: Add ability to update music folders + have on by default in create

---
 .../java/github/daneren2005/dsub/adapter/SettingsAdapter.java    | 9 +++++----
 .../java/github/daneren2005/dsub/service/RESTMusicService.java   | 9 +++++++++
 app/src/main/java/github/daneren2005/dsub/util/UserUtil.java     | 2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java
index d1deaf6f..ba4b11fc 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java
@@ -55,10 +55,11 @@ public class SettingsAdapter extends SectionAdapter<Setting> {
 		this.editable = editable;
 		this.onItemClickedListener = onItemClickedListener;
 
-		List<Setting> settings = sections.get(0);
-		for(Setting setting: settings) {
-			if(setting.getValue()) {
-				addSelected(setting);
+		for(List<Setting> settings: sections) {
+			for (Setting setting : settings) {
+				if (setting.getValue()) {
+					addSelected(setting);
+				}
 			}
 		}
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java b/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
index a5bb3597..abc743f7 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
@@ -1533,6 +1533,15 @@ public class RESTMusicService implements MusicService {
 			}
 		}
 
+		if(user.getMusicFolderSettings() != null) {
+			for(User.Setting setting: user.getMusicFolderSettings()) {
+				if(setting.getValue()) {
+					names.add("musicFolderId");
+					values.add(setting.getName());
+				}
+			}
+		}
+
 		Reader reader = getReader(context, progressListener, "updateUser", null, names, values);
 		try {
 			new ErrorParser(context, getInstance(context)).parse(reader);
diff --git a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
index bf5d3a29..3f16de21 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
@@ -386,7 +386,7 @@ public final class UserUtil {
 		if(sampleUser.getMusicFolderSettings() != null) {
 			for(User.Setting setting: sampleUser.getMusicFolderSettings()) {
 				User.MusicFolderSetting musicFolderSetting = (User.MusicFolderSetting) setting;
-				user.addMusicFolder(musicFolderSetting, false);
+				user.addMusicFolder(musicFolderSetting, true);
 			}
 		}
 
-- 
cgit v1.2.3