Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5c2bb438 authored by Wiktor Kwapisiewicz's avatar Wiktor Kwapisiewicz
Browse files

Fix NPE when accessing settings screens 

Previous PR did not check if preferences to be removed exist on the
current screen and failed when the current screen was not the
notification settings.

Fixes #3782.
parent e6e0d7c1

app/ui/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt

+6 −4
Original line number Original line Diff line number Diff line
@@ -165,10 +165,12 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { 
    }

    }





    private fun initializeNotifications() {

    private fun initializeNotifications() {

        findPreference(PREFERENCE_OPEN_NOTIFICATION_SETTINGS)?.let {

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

                PRE_SDK26_NOTIFICATION_PREFERENCES.forEach { findPreference(it).remove() }

                PRE_SDK26_NOTIFICATION_PREFERENCES.forEach { findPreference(it).remove() }

            } else {

            } else {

            findPreference(PREFERENCE_OPEN_NOTIFICATION_SETTINGS).remove()

                it.remove()

            }

        }

        }

    }

    }