|
|
@ -44,7 +44,7 @@ public class UserDao extends AbstractDao { |
|
|
|
"playlist_year, playlist_bit_rate, playlist_duration, playlist_format, playlist_file_size, " + |
|
|
|
"playlist_year, playlist_bit_rate, playlist_duration, playlist_format, playlist_file_size, " + |
|
|
|
"last_fm_enabled, last_fm_username, last_fm_password, transcode_scheme, show_now_playing, selected_music_folder_id, " + |
|
|
|
"last_fm_enabled, last_fm_username, last_fm_password, transcode_scheme, show_now_playing, selected_music_folder_id, " + |
|
|
|
"party_mode_enabled, now_playing_allowed, avatar_scheme, system_avatar_id, changed, show_chat, show_artist_info, auto_hide_play_queue, " + |
|
|
|
"party_mode_enabled, now_playing_allowed, avatar_scheme, system_avatar_id, changed, show_chat, show_artist_info, auto_hide_play_queue, " + |
|
|
|
"view_as_list, default_album_list, queue_following_songs, show_side_bar, list_reload_delay"; |
|
|
|
"view_as_list, default_album_list, queue_following_songs, show_side_bar, list_reload_delay, keyboard_shortcuts_enabled"; |
|
|
|
|
|
|
|
|
|
|
|
private static final Integer ROLE_ID_ADMIN = 1; |
|
|
|
private static final Integer ROLE_ID_ADMIN = 1; |
|
|
|
private static final Integer ROLE_ID_DOWNLOAD = 2; |
|
|
|
private static final Integer ROLE_ID_DOWNLOAD = 2; |
|
|
@ -188,7 +188,7 @@ public class UserDao extends AbstractDao { |
|
|
|
settings.getAvatarScheme().name(), settings.getSystemAvatarId(), settings.getChanged(), |
|
|
|
settings.getAvatarScheme().name(), settings.getSystemAvatarId(), settings.getChanged(), |
|
|
|
settings.isShowChatEnabled(), settings.isShowArtistInfoEnabled(), settings.isAutoHidePlayQueue(), |
|
|
|
settings.isShowChatEnabled(), settings.isShowArtistInfoEnabled(), settings.isAutoHidePlayQueue(), |
|
|
|
settings.isViewAsList(), settings.getDefaultAlbumList().getId(), settings.isQueueFollowingSongs(), |
|
|
|
settings.isViewAsList(), settings.getDefaultAlbumList().getId(), settings.isQueueFollowingSongs(), |
|
|
|
settings.isShowSideBar(), settings.getListReloadDelay()}); |
|
|
|
settings.isShowSideBar(), settings.getListReloadDelay(), settings.isKeyboardShortcutsEnabled()}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static String encrypt(String s) { |
|
|
|
private static String encrypt(String s) { |
|
|
@ -350,6 +350,7 @@ public class UserDao extends AbstractDao { |
|
|
|
settings.setQueueFollowingSongs(rs.getBoolean(col++)); |
|
|
|
settings.setQueueFollowingSongs(rs.getBoolean(col++)); |
|
|
|
settings.setShowSideBar(rs.getBoolean(col++)); |
|
|
|
settings.setShowSideBar(rs.getBoolean(col++)); |
|
|
|
settings.setListReloadDelay((Integer) rs.getObject(col++)); |
|
|
|
settings.setListReloadDelay((Integer) rs.getObject(col++)); |
|
|
|
|
|
|
|
settings.setKeyboardShortcutsEnabled(rs.getBoolean(col++)); |
|
|
|
|
|
|
|
|
|
|
|
return settings; |
|
|
|
return settings; |
|
|
|
} |
|
|
|
} |
|
|
|