From 43f4465d41b14e96e6e8bf9570c6f4dc8be9a3b1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 27 Dec 2024 02:39:39 -0600 Subject: [PATCH] Remove nullable from parameter --- .../main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt index 54bb95399..20da26acf 100644 --- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt +++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.kt @@ -6,7 +6,6 @@ import com.google.api.client.util.DateTime import com.google.api.services.tasks.model.Task import com.google.api.services.tasks.model.TaskList import com.google.api.services.tasks.model.Tasks -import org.tasks.filters.GtasksFilter import com.todoroo.astrid.dao.TaskDao import com.todoroo.astrid.gtasks.GtasksListService import com.todoroo.astrid.gtasks.api.GtasksApiUtilities @@ -30,6 +29,7 @@ import org.tasks.data.entity.CaldavAccount import org.tasks.data.entity.CaldavCalendar import org.tasks.data.entity.CaldavTask import org.tasks.date.DateTimeUtils.newDateTime +import org.tasks.filters.GtasksFilter import org.tasks.googleapis.InvokerFactory import org.tasks.preferences.DefaultFilterProvider import org.tasks.preferences.PermissionChecker @@ -408,8 +408,8 @@ class GoogleTaskSynchronizer @Inject constructor( } } - fun mergeDates(remoteDueDate: Long, local: org.tasks.data.entity.Task?) { - if (remoteDueDate > 0 && local!!.hasDueTime()) { + fun mergeDates(remoteDueDate: Long, local: org.tasks.data.entity.Task) { + if (remoteDueDate > 0 && local.hasDueTime()) { val oldDate = newDateTime(local.dueDate) val newDate = newDateTime(remoteDueDate) .withHourOfDay(oldDate.hourOfDay) @@ -418,7 +418,7 @@ class GoogleTaskSynchronizer @Inject constructor( local.setDueDateAdjustingHideUntil( createDueDate(org.tasks.data.entity.Task.URGENCY_SPECIFIC_DAY_TIME, newDate.millis)) } else { - local!!.setDueDateAdjustingHideUntil(remoteDueDate) + local.setDueDateAdjustingHideUntil(remoteDueDate) } }