Issue #660 - Catch Android NPE in Environment.getExternalStorageState()

nostra13 · Jul 8, 2014 · 54a9038 · 54a9038
1 parent e56bc0d
commit 54a9038
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/library/src/com/nostra13/universalimageloader/utils/StorageUtils.java b/library/src/com/nostra13/universalimageloader/utils/StorageUtils.java
@@ -65,8 +65,13 @@ public static File getCacheDirectory(Context context) {
 	 */
 	public static File getCacheDirectory(Context context, boolean preferExternal) {
 		File appCacheDir = null;
-		if (preferExternal && MEDIA_MOUNTED
-				.equals(Environment.getExternalStorageState()) && hasExternalStoragePermission(context)) {
+		String externalStorageState;
+		try {
+			externalStorageState = Environment.getExternalStorageState();
+		} catch (NullPointerException e) { // (sh)it happens (Issue #660)
+			externalStorageState = "";
+		}
+		if (preferExternal && MEDIA_MOUNTED.equals(externalStorageState) && hasExternalStoragePermission(context)) {
 			appCacheDir = getExternalCacheDir(context);
 		}
 		if (appCacheDir == null) {