Fix NPE on invalid attachment/backup dirs

pull/281/head
Alex Baker 10 years ago
parent 1d6a5c8f64
commit 7ede7fe48e

@ -56,6 +56,7 @@ public class BackupPreferences extends InjectingPreferenceActivity {
private void updateBackupDirectory() { private void updateBackupDirectory() {
File dir = preferences.getBackupDirectory(); File dir = preferences.getBackupDirectory();
findPreference(getString(R.string.p_backup_dir)).setSummary(dir.getAbsolutePath()); String summary = dir == null ? "" : dir.getAbsolutePath();
findPreference(getString(R.string.p_backup_dir)).setSummary(summary);
} }
} }

@ -100,7 +100,8 @@ public class MiscellaneousPreferences extends InjectingPreferenceActivity {
private void updateAttachmentDirectory() { private void updateAttachmentDirectory() {
File dir = preferences.getAttachmentsDirectory(); File dir = preferences.getAttachmentsDirectory();
findPreference(getString(R.string.p_attachment_dir)).setSummary(dir.getAbsolutePath()); String summary = dir == null ? "" : dir.getAbsolutePath();
findPreference(getString(R.string.p_attachment_dir)).setSummary(summary);
} }
private void initializeCalendarReminderPreference() { private void initializeCalendarReminderPreference() {

Loading…
Cancel
Save