Check if google task or caldav list is null

pull/685/merge
Alex Baker 8 years ago
parent 636bf4b50e
commit c764e4b0d2

@ -26,6 +26,7 @@ import org.tasks.data.CaldavDao;
import org.tasks.data.CaldavTask; import org.tasks.data.CaldavTask;
import org.tasks.data.GoogleTask; import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskDao; import org.tasks.data.GoogleTaskDao;
import org.tasks.data.GoogleTaskList;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.DefaultFilterProvider; import org.tasks.preferences.DefaultFilterProvider;
@ -61,11 +62,16 @@ public class RemoteListFragment extends TaskEditControlFragment {
} else { } else {
if (task.isNew()) { if (task.isNew()) {
if (task.hasTransitory(GoogleTask.KEY)) { if (task.hasTransitory(GoogleTask.KEY)) {
originalList = GoogleTaskList googleTaskList =
new GtasksFilter(gtasksListService.getList(task.getTransitory(GoogleTask.KEY))); gtasksListService.getList(task.getTransitory(GoogleTask.KEY));
if (googleTaskList != null) {
originalList = new GtasksFilter(googleTaskList);
}
} else if (task.hasTransitory(CaldavTask.KEY)) { } else if (task.hasTransitory(CaldavTask.KEY)) {
originalList = CaldavCalendar caldav = caldavDao.getCalendarByUuid(task.getTransitory(CaldavTask.KEY));
new CaldavFilter(caldavDao.getCalendarByUuid(task.getTransitory(CaldavTask.KEY))); if (caldav != null) {
originalList = new CaldavFilter(caldav);
}
} else { } else {
originalList = defaultFilterProvider.getDefaultRemoteList(); originalList = defaultFilterProvider.getDefaultRemoteList();
} }
@ -73,7 +79,10 @@ public class RemoteListFragment extends TaskEditControlFragment {
GoogleTask googleTask = googleTaskDao.getByTaskId(task.getId()); GoogleTask googleTask = googleTaskDao.getByTaskId(task.getId());
CaldavTask caldavTask = caldavDao.getTask(task.getId()); CaldavTask caldavTask = caldavDao.getTask(task.getId());
if (googleTask != null) { if (googleTask != null) {
originalList = new GtasksFilter(gtasksListService.getList(googleTask.getListId())); GoogleTaskList googleTaskList = gtasksListService.getList(googleTask.getListId());
if (googleTaskList != null) {
originalList = new GtasksFilter(googleTaskList);
}
} else if (caldavTask != null) { } else if (caldavTask != null) {
CaldavCalendar calendarByUuid = caldavDao.getCalendarByUuid(caldavTask.getCalendar()); CaldavCalendar calendarByUuid = caldavDao.getCalendarByUuid(caldavTask.getCalendar());
if (calendarByUuid != null) { if (calendarByUuid != null) {

Loading…
Cancel
Save