Avoid inheriting from Application.

[Dictionary.git] / src / com / hughes / android / dictionary / PreferenceActivity.java

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index 78223848f297f78a15086dc786748823ecaeed38..966f21c7ad7ffe5548f50b343e470ff1b566059d 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -33,7 +33,8 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        final DictionaryApplication application = (DictionaryApplication) getApplication();
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        final DictionaryApplication application = DictionaryApplication.INSTANCE;
         setTheme(application.getSelectedTheme().themeId);
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -88,7 +89,8 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences p, String v) {
-        final DictionaryApplication application = (DictionaryApplication)getApplication();
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        final DictionaryApplication application = DictionaryApplication.INSTANCE;
         File dictDir = application.getDictDir();
         if (!dictDir.isDirectory() || !dictDir.canWrite() ||
                 !application.checkFileCreate(dictDir)) {