Commit be2e3c3a authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Fix potential null pointer dereference

parent 97bf4438

app/src/main/java/net/fabiszewski/ulogger/SettingsActivity.java

+12 −4
Original line number Diff line number Diff line
@@ -45,10 +45,14 @@ public class SettingsActivity extends PreferenceActivity { 
    private void onCreatePreferenceActivity() {

        addPreferencesFromResource(R.xml.preferences);

        final Preference prefHost = findPreference("prefHost");

        if (prefHost != null) {

            prefHost.setOnPreferenceChangeListener(hostChanged);

        }

        final Preference prefLiveSync = findPreference("prefLiveSync");

        if (prefLiveSync != null) {

            prefLiveSync.setOnPreferenceChangeListener(liveSyncChanged);

        }

    }



    /**

     * On change listener to validate server url
@@ -110,10 +114,14 @@ public class SettingsActivity extends PreferenceActivity { 
            super.onCreate(savedInstanceState);

            addPreferencesFromResource(R.xml.preferences);

            final Preference prefHost = findPreference("prefHost");

            if (prefHost != null) {

                prefHost.setOnPreferenceChangeListener(hostChanged);

            }

            final Preference prefLiveSync = findPreference("prefLiveSync");

            if (prefLiveSync != null) {

                prefLiveSync.setOnPreferenceChangeListener(liveSyncChanged);

            }

        }



    }

}