diff options
| author | tobitege <tobiasteschner@googlemail.com> | 2015-04-20 15:50:44 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-04-21 09:13:53 +0000 |
| commit | 7451d260d6d3ed5bd8b9f107d134ff965ace0cc0 (patch) | |
| tree | b8e05edb47019a7e2372bad7ad0d248e3d291579 | |
| parent | 8dcea5657c7834a40678ad973ddd2c5bf4f64757 (diff) | |
| download | android_packages_apps_Email-7451d260d6d3ed5bd8b9f107d134ff965ace0cc0.tar.gz android_packages_apps_Email-7451d260d6d3ed5bd8b9f107d134ff965ace0cc0.tar.bz2 android_packages_apps_Email-7451d260d6d3ed5bd8b9f107d134ff965ace0cc0.zip | |
Fix NPE in getHierarchicalFolder
Fixes exceptions like this:
java.lang.NullPointerException: Attempt to read from field 'java.lang.String com.android.mail.providers.Folder.name' on a null object reference
at com.android.email.activity.setup.MailboxSettings$MailboxSettingsFolderLoaderCallbacks.getHierarchicalFolder(MailboxSettings.java:377)
Change-Id: I2c5dda84439caa5d894f5706c9c6a07079cda69c
| -rw-r--r-- | src/com/android/email/activity/setup/MailboxSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java index d6b649a36..e3db75930 100644 --- a/src/com/android/email/activity/setup/MailboxSettings.java +++ b/src/com/android/email/activity/setup/MailboxSettings.java @@ -374,7 +374,9 @@ public class MailboxSettings extends PreferenceActivity { Folder tmp = folder; while (tmp != null && tmp.parent != null && !tmp.parent.toString().isEmpty()) { tmp = folders.get(tmp.parent); - name = tmp.name + "/" + name; + if (tmp != null) { + name = tmp.name + "/" + name; + } } return name; } |