From c1277c1cd65606335fd46636a1e3cefe9f42cfb3 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 8 Apr 2015 20:12:58 +0200
Subject: Fixed bug not updating reading after language change

---
 .../java/com/camilstaps/taize/MainActivity.java    |  2 ++
 .../com/camilstaps/taize/SettingsActivity.java     | 26 ++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java
index 19c5fb6..4f22a38 100644
--- a/app/src/main/java/com/camilstaps/taize/MainActivity.java
+++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java
@@ -82,6 +82,8 @@ public class MainActivity extends ActionBarActivity
     protected void setupContent() {
         setDailyReading();
         setDailyReadingBibleText();
+
+        Log.d("MAIN", "Setting up content");
     }
 
     private void setDailyReading() {
diff --git a/app/src/main/java/com/camilstaps/taize/SettingsActivity.java b/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
index 3fe43d1..48e06ae 100644
--- a/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
+++ b/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
@@ -20,18 +20,6 @@ public class SettingsActivity extends PreferenceActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit();
-
-        SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-                if (key.equals(SettingsFragment.PREF_LANGUAGE_READINGS)) {
-                    Taize.clearDailyReadingsSet(getApplicationContext());
-                } else if (key.equals(SettingsFragment.PREF_VERSION_BIBLE)) {
-                    Taize.forceNewDailyReadingBibleText(getApplicationContext(), new NullListener<String>());
-                }
-            }
-        };
-        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     }
 
     private static Preference.OnPreferenceChangeListener onPreferenceChangeListener = new Preference.OnPreferenceChangeListener() {
@@ -60,6 +48,8 @@ public class SettingsActivity extends PreferenceActivity {
         public static final String PREF_LANGUAGE_READINGS = "pref_language_reading";
         public static final String PREF_VERSION_BIBLE = "pref_version_bible";
 
+        private SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener;
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
@@ -67,6 +57,18 @@ public class SettingsActivity extends PreferenceActivity {
 
             bindSummaryToValue(findPreference(PREF_LANGUAGE_READINGS));
             bindSummaryToValue(findPreference(PREF_VERSION_BIBLE));
+
+            sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+                @Override
+                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+                    if (key.equals(SettingsFragment.PREF_LANGUAGE_READINGS)) {
+                        Taize.clearDailyReadingsSet(getActivity());
+                    } else if (key.equals(SettingsFragment.PREF_VERSION_BIBLE)) {
+                        Taize.forceNewDailyReadingBibleText(getActivity(), new NullListener<String>());
+                    }
+                }
+            };
+            PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
         }
     }
 
-- 
cgit v1.2.3