From 1c73953ad3b391485dd30d595204b4ae7be749bd Mon Sep 17 00:00:00 2001 From: James Sanford Date: Wed, 20 Feb 2013 15:45:54 -0800 Subject: [PATCH] Fix one more spot that assumed external storage was available. --- src/com/froop/app/kegs/ConfigFile.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/froop/app/kegs/ConfigFile.java b/src/com/froop/app/kegs/ConfigFile.java index a23000d..557ae93 100644 --- a/src/com/froop/app/kegs/ConfigFile.java +++ b/src/com/froop/app/kegs/ConfigFile.java @@ -44,7 +44,12 @@ class ConfigFile { } public String getCachePath() { - return mContext.getExternalCacheDir().getPath(); + File cacheDir = mContext.getExternalCacheDir(); + if (cacheDir == null) { + // Use internal storage if external directory is not available. + cacheDir = mContext.getCacheDir(); + } + return cacheDir.getPath(); } public String[] getAllImageDirs() { @@ -53,11 +58,11 @@ class ConfigFile { String externalStorage; File externalDir = Environment.getExternalStorageDirectory(); - if (externalDir != null) { - externalStorage = externalDir.getPath(); - } else { + if (externalDir == null) { // Try harder. It is OK if this does not exist. externalStorage = "/mnt/sdcard"; + } else { + externalStorage = externalDir.getPath(); } String[] dirs = {