Refactored StorageUtils

Author: nostra13

library/src/com/nostra13/universalimageloader/utils/StorageUtils.java

@@ -15,6 +15,8 @@
  *******************************************************************************/
 package com.nostra13.universalimageloader.utils;
 
+import static android.os.Environment.MEDIA_MOUNTED;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -30,22 +32,23 @@
  */
 public final class StorageUtils {
 
+	private static final String EXTERNAL_STORAGE_PERMISSION = "android.permission.WRITE_EXTERNAL_STORAGE";
 	private static final String INDIVIDUAL_DIR_NAME = "uil-images";
 
 	private StorageUtils() {
 	}
 
 	/**
 	 * Returns application cache directory. Cache directory will be created on SD card
-	 * <i>("/Android/data/[app_package_name]/cache")</i> if card is mounted. Else - Android defines cache directory on
-	 * device's file system.
+	 * <i>("/Android/data/[app_package_name]/cache")</i> if card is mounted and app has appropriate permission. Else -
+	 * Android defines cache directory on device's file system.
 	 * 
 	 * @param context Application context
 	 * @return Cache {@link File directory}
 	 */
 	public static File getCacheDirectory(Context context) {
 		File appCacheDir = null;
-		if (Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED) && hasExternalPermission(context)) {
+		if (Environment.getExternalStorageState().equals(MEDIA_MOUNTED) && hasExternalStoragePermission(context)) {
 			appCacheDir = getExternalCacheDir(context);
 		}
 		if (appCacheDir == null) {
@@ -60,8 +63,8 @@ public static File getCacheDirectory(Context context) {
 
 	/**
 	 * Returns individual application cache directory (for only image caching from ImageLoader). Cache directory will be
-	 * created on SD card <i>("/Android/data/[app_package_name]/cache/uil-images")</i> if card is mounted. Else -
-	 * Android defines cache directory on device's file system.
+	 * created on SD card <i>("/Android/data/[app_package_name]/cache/uil-images")</i> if card is mounted and app has
+	 * appropriate permission. Else - Android defines cache directory on device's file system.
 	 * 
 	 * @param context Application context
 	 * @return Cache {@link File directory}
@@ -79,15 +82,15 @@ public static File getIndividualCacheDirectory(Context context) {
 
 	/**
 	 * Returns specified application cache directory. Cache directory will be created on SD card by defined path if card
-	 * is mounted. Else - Android defines cache directory on device's file system.
+	 * is mounted and app has appropriate permission. Else - Android defines cache directory on device's file system.
 	 * 
 	 * @param context Application context
 	 * @param cacheDir Cache directory path (e.g.: "AppCacheDir", "AppDir/cache/images")
 	 * @return Cache {@link File directory}
 	 */
 	public static File getOwnCacheDirectory(Context context, String cacheDir) {
 		File appCacheDir = null;
-		if (Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED) && hasExternalPermission(context)) {
+		if (Environment.getExternalStorageState().equals(MEDIA_MOUNTED) && hasExternalStoragePermission(context)) {
 			appCacheDir = new File(Environment.getExternalStorageDirectory(), cacheDir);
 		}
 		if (appCacheDir == null || (!appCacheDir.exists() && !appCacheDir.mkdirs())) {
@@ -112,11 +115,9 @@ private static File getExternalCacheDir(Context context) {
 		}
 		return appCacheDir;
 	}
-	
-	private static boolean hasExternalPermission(Context cxt)
-	{
-	    String permission = "android.permission.WRITE_EXTERNAL_STORAGE";
-	    int res = cxt.checkCallingOrSelfPermission(permission);
-	    return (res == PackageManager.PERMISSION_GRANTED);            
+
+	private static boolean hasExternalStoragePermission(Context context) {
+		int perm = context.checkCallingOrSelfPermission(EXTERNAL_STORAGE_PERMISSION);
+		return perm == PackageManager.PERMISSION_GRANTED;
 	}
 }