From c7b2111115a3a8956388dd40832a1628bba0fc9d Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 28 Mar 2016 00:40:53 +0200
Subject: [PATCH] Moved the tag editors album cover folder.

---
 .../tageditor/AbsTagEditorActivity.java          |  2 +-
 .../mainactivity/folders/FoldersFragment.java    | 16 +++++++++-------
 .../com/kabouzeid/gramophone/util/MusicUtil.java |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index 6b67e479..4a8eb621 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -298,7 +298,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                 File albumArtFile = null;
                 if (info.artworkInfo != null && info.artworkInfo.artwork != null) {
                     try {
-                        albumArtFile = MusicUtil.createAlbumArtFile(String.valueOf(info.artworkInfo.albumId)).getCanonicalFile();
+                        albumArtFile = MusicUtil.createAlbumArtFile().getCanonicalFile();
                         info.artworkInfo.artwork.compress(Bitmap.CompressFormat.PNG, 0, new FileOutputStream(albumArtFile));
                         artwork = ArtworkFactory.createArtworkFromFile(albumArtFile);
                     } catch (IOException e) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
index 8dd5125a..530a1041 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java
@@ -273,15 +273,17 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
     }
 
     public static File getDefaultStartDirectory() {
-        File externalStorageDir = Environment.getExternalStorageDirectory();
-        File musicFolder = new File(externalStorageDir, "Music");
+        File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
         File startFolder;
-        if (musicFolder.exists() && musicFolder.isDirectory()) {
-            startFolder = musicFolder;
-        } else if (externalStorageDir.exists() && externalStorageDir.isDirectory()) {
-            startFolder = externalStorageDir;
+        if (musicDir.exists() && musicDir.isDirectory()) {
+            startFolder = musicDir;
         } else {
-            startFolder = new File("/"); // root
+            File externalStorage = Environment.getExternalStorageDirectory();
+            if (externalStorage.exists() && externalStorage.isDirectory()) {
+                startFolder = externalStorage;
+            } else {
+                startFolder = new File("/"); // root
+            }
         }
         return startFolder;
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index 24816f20..99194a59 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -127,20 +127,20 @@ public class MusicUtil {
     }
 
     @NonNull
-    public static File createAlbumArtFile(String name) {
-        return new File(createAlbumArtDir(), name + System.currentTimeMillis());
+    public static File createAlbumArtFile() {
+        return new File(createAlbumArtDir(), String.valueOf(System.currentTimeMillis()));
     }
 
     @NonNull
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public static File createAlbumArtDir() {
-        File albumArtDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), "/.albumart/");
+        File albumArtDir = new File(Environment.getExternalStorageDirectory(), "/albumthumbs/");
         if (!albumArtDir.exists()) {
             albumArtDir.mkdirs();
             try {
                 new File(albumArtDir, ".nomedia").createNewFile();
             } catch (IOException e) {
-                Log.e(TAG, "error while creating .nomedia file", e);
+                e.printStackTrace();
             }
         }
         return albumArtDir;