From 1e82139ccf600c2668ccb1d14fc29ff045d4340b Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Mon, 17 Jul 2017 09:12:03 +0400 Subject: [PATCH] [android] Check the "Display Showcase" option on the current PreferenceScreen before deleting it --- .../maps/settings/SettingsPrefsFragment.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java index cb81594376..d44a209a13 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java @@ -295,10 +295,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment initPlayServicesPrefsCallbacks(); initAutoZoomPrefsCallbacks(); initSimplifiedTrafficColorsPrefsCallbacks(); - - if (!MytargetHelper.isShowcaseSwitchedOnServer()) - getPreferenceScreen().removePreference(findPreference(getString(R.string.pref_showcase_switched_on))); - + initDisplayShowcasePrefs(); initLoggingEnabledPrefsCallbacks(); initUseMobileDataPrefsCallbacks(); @@ -351,6 +348,18 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment return super.onPreferenceTreeClick(preference); } + private void initDisplayShowcasePrefs() + { + if (MytargetHelper.isShowcaseSwitchedOnServer()) + return; + + Preference pref = findPreference(getString(R.string.pref_showcase_switched_on)); + if (pref == null) + return; + + getPreferenceScreen().removePreference(pref); + } + private void initLangInfoLink() { if (mLangInfoLink != null)