diff options
| -rw-r--r-- | src/de/danoeh/antennapod/storage/DownloadRequester.java | 19 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/util/NumberGenerator.java | 4 |
2 files changed, 9 insertions, 14 deletions
diff --git a/src/de/danoeh/antennapod/storage/DownloadRequester.java b/src/de/danoeh/antennapod/storage/DownloadRequester.java index 6aaabafaa..be4661063 100644 --- a/src/de/danoeh/antennapod/storage/DownloadRequester.java +++ b/src/de/danoeh/antennapod/storage/DownloadRequester.java @@ -24,7 +24,7 @@ import android.os.RemoteException; import android.content.Intent; import android.webkit.URLUtil; -public class DownloadRequester { +public class DownloadRequester {// TODO handle externalstorage missing private static final String TAG = "DownloadRequester"; private static final int currentApi = android.os.Build.VERSION.SDK_INT; @@ -32,7 +32,6 @@ public class DownloadRequester { public static String EXTRA_ITEM_ID = "extra.de.danoeh.antennapod.storage.item_id"; public static String ACTION_DOWNLOAD_QUEUED = "action.de.danoeh.antennapod.storage.downloadQueued"; - private static boolean STORE_ON_SD = true; public static String IMAGE_DOWNLOADPATH = "images/"; @@ -77,7 +76,7 @@ public class DownloadRequester { // TODO Set Allowed Network Types DownloadManager manager = (DownloadManager) context .getSystemService(Context.DOWNLOAD_SERVICE); - + long downloadId = manager.enqueue(request); item.setDownloadId(downloadId); item.setFile_url(dest.toString()); @@ -125,7 +124,7 @@ public class DownloadRequester { notifyDownloadService(context); } } - + /** Cancels all running downloads */ public void cancelAllDownloads(Context context) { Log.d(TAG, "Cancelling all running downloads"); @@ -149,7 +148,7 @@ public class DownloadRequester { } return null; } - + /** Returns true if there is at least one Feed in the downloads queue. */ public boolean isDownloadingFeeds() { for (FeedFile f : downloads) { @@ -159,7 +158,7 @@ public class DownloadRequester { } return false; } - + /** Checks if feedfile is in the downloads list */ public boolean isDownloadingFile(FeedFile item) { for (FeedFile f : downloads) { @@ -201,11 +200,9 @@ public class DownloadRequester { } public String getMediafilePath(Context context, FeedMedia media) { - return context - .getExternalFilesDir( - MEDIA_DOWNLOADPATH - + media.getItem().getFeed().getTitle() + "/") - .toString(); + File externalStorage = context.getExternalFilesDir(MEDIA_DOWNLOADPATH + + NumberGenerator.generateLong(media.getItem().getFeed().getTitle()) + "/"); + return externalStorage.toString(); } public String getMediafilename(FeedMedia media) { diff --git a/src/de/danoeh/antennapod/util/NumberGenerator.java b/src/de/danoeh/antennapod/util/NumberGenerator.java index 6f9ac2e78..515d14809 100644 --- a/src/de/danoeh/antennapod/util/NumberGenerator.java +++ b/src/de/danoeh/antennapod/util/NumberGenerator.java @@ -18,8 +18,6 @@ public final class NumberGenerator { * @return The generated random value * */ public static long generateLong(final String strSeed) { - long seed = (long) strSeed.hashCode(); - Log.d(TAG, "Taking " + seed + " as seed."); - return new Random(seed).nextLong(); + return strSeed.hashCode(); } } |