Fixed possible crash when restoring defaults of the BehaviorPreferenc…

…eFragment.
michael-rapp · Feb 16, 2017 · 467ca98 · 467ca98
1 parent e364cfa
commit 467ca98
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...ava/de/mrapp/android/preference/activity/example/fragment/BehaviorPreferenceFragment.java b/...ava/de/mrapp/android/preference/activity/example/fragment/BehaviorPreferenceFragment.java
@@ -46,8 +46,12 @@ private OnPreferenceChangeListener createOverrideBackButtonChangeListener() {
 
             @Override
             public boolean onPreferenceChange(final Preference preference, final Object newValue) {
-                boolean overrideNavigationIcon = (boolean) newValue;
-                ((PreferenceActivity) getActivity()).overrideNavigationIcon(overrideNavigationIcon);
+                if (newValue != null) {
+                    boolean overrideNavigationIcon = (boolean) newValue;
+                    ((PreferenceActivity) getActivity())
+                            .overrideNavigationIcon(overrideNavigationIcon);
+                }
+
                 return true;
             }
 
@@ -66,8 +70,11 @@ private OnPreferenceChangeListener createHideNavigationChangeListener() {
 
             @Override
             public boolean onPreferenceChange(final Preference preference, final Object newValue) {
-                boolean hideNavigation = (boolean) newValue;
-                ((PreferenceActivity) getActivity()).hideNavigation(hideNavigation);
+                if (newValue != null) {
+                    boolean hideNavigation = (boolean) newValue;
+                    ((PreferenceActivity) getActivity()).hideNavigation(hideNavigation);
+                }
+
                 return true;
             }