About dialog, added pictures, multi word search.

[Dictionary.git] / src / com / hughes / android / util / PersistentObjectCache.java

diff --git a/src/com/hughes/android/util/PersistentObjectCache.java b/src/com/hughes/android/util/PersistentObjectCache.java
index aa730bc9edb8772d21766d5845a7ebcefa05b40b..2a3a527b197b5d4fd861a8a4c678737ee3ff61e8 100644 (file)
--- a/src/com/hughes/android/util/PersistentObjectCache.java
+++ b/src/com/hughes/android/util/PersistentObjectCache.java
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.hughes.android.util;
 
 import java.io.File;
@@ -8,7 +22,11 @@ import java.io.ObjectOutputStream;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.hughes.android.dictionary.DictionaryApplication;
+
+import android.app.Application;
 import android.content.Context;
+import android.os.Environment;
 import android.util.Log;
 
 public class PersistentObjectCache {
@@ -56,9 +74,10 @@ public class PersistentObjectCache {
   }
 
   private PersistentObjectCache(final Context context) {
-    dir = context.getFilesDir();
+    final File filesDir = context.getFilesDir();
+    dir = filesDir != null ? filesDir : Environment.getExternalStorageDirectory();
     if (dir == null) {
-      throw new RuntimeException("context.getFilesDir() == null");
+      throw new RuntimeException("context.getFilesDir() == " + context.getFilesDir() + ", Environment.getExternalStorageDirectory()=" + Environment.getExternalStorageDirectory());
     }
   }