From 5ef2010bfda6b5e471e506651a022f17f761b590 Mon Sep 17 00:00:00 2001 From: daneren2005 Date: Thu, 15 May 2014 10:18:34 -0700 Subject: Create .nomedia in music folder as well as home Subsonic maintains two separate directories: one for music and one for artwork, playlists, etc to be stored. The .nomedia needs to still be in the home folder so that the playlists don't show up, but it is also needed in the music folder to hide those as well. --- src/github/daneren2005/dsub/activity/SettingsActivity.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java index bf72f9a9..530733a5 100644 --- a/src/github/daneren2005/dsub/activity/SettingsActivity.java +++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java @@ -479,18 +479,30 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer private void setHideMedia(boolean hide) { File nomediaDir = new File(FileUtil.getSubsonicDirectory(this), ".nomedia"); + File musicNoMedia = new File(FileUtil.getMusicDirectory(this), ".nomedia"); if (hide && !nomediaDir.exists()) { try { if (!nomediaDir.createNewFile()) { Log.w(TAG, "Failed to create " + nomediaDir); } } catch(Exception e) { - Log.w(TAG, "Failed to create " + nomediaDir); + Log.w(TAG, "Failed to create " + nomediaDir, e); + } + + try { + if(!musicNoMedia.createNewFile()) { + Log.w(TAG, "Failed to create " + musicNoMedia); + } + } catch(Exception e) { + Log.w(TAG, "Failed to create " + musicNoMedia, e); } } else if (nomediaDir.exists()) { if (!nomediaDir.delete()) { Log.w(TAG, "Failed to delete " + nomediaDir); } + if(!musicNoMedia.delete()) { + Log.w(TAG, "Failed to delete " + musicNoMedia); + } } Util.toast(this, R.string.settings_hide_media_toast, false); } -- cgit v1.2.3