Replace Iterables.removeIf

pull/996/head
Alex Baker 4 years ago
parent 9ff83d5bfd
commit bb84f0d3c3

@ -2,7 +2,6 @@ package org.tasks.caldav
import at.bitfire.ical4android.Task import at.bitfire.ical4android.Task
import at.bitfire.ical4android.Task.Companion.tasksFromReader import at.bitfire.ical4android.Task.Companion.tasksFromReader
import com.google.common.collect.Iterables
import com.todoroo.andlib.utility.DateUtilities import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.dao.TaskDao import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.helper.UUIDHelper import com.todoroo.astrid.helper.UUIDHelper
@ -37,7 +36,7 @@ class iCalendar @Inject constructor(
private val caldavDao: CaldavDao) { private val caldavDao: CaldavDao) {
companion object { companion object {
private val IS_PARENT: (RelatedTo?) -> Boolean = { r: RelatedTo? -> private val IS_PARENT = { r: RelatedTo? ->
r!!.parameters.isEmpty || r.getParameter(Parameter.RELTYPE) === RelType.PARENT r!!.parameters.isEmpty || r.getParameter(Parameter.RELTYPE) === RelType.PARENT
} }
@ -60,7 +59,7 @@ class iCalendar @Inject constructor(
fun setParent(remote: Task, value: String?) { fun setParent(remote: Task, value: String?) {
val relatedTo = remote.relatedTo val relatedTo = remote.relatedTo
if (isNullOrEmpty(value)) { if (isNullOrEmpty(value)) {
Iterables.removeIf(relatedTo, IS_PARENT) relatedTo.removeAll(relatedTo.filter(IS_PARENT))
} else { } else {
val parent = relatedTo.find(IS_PARENT) val parent = relatedTo.find(IS_PARENT)
if (parent != null) { if (parent != null) {

Loading…
Cancel
Save