From 8f8650840dd6423e78102f05b9f970d79a95261d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 29 Apr 2020 12:33:20 -0500 Subject: [PATCH] Remove some unnecessary newArrayList calls --- .../java/org/tasks/data/DeletionDaoTests.java | 4 ++-- .../todoroo/astrid/activity/TaskListFragment.java | 5 ++--- .../com/todoroo/astrid/adapter/FilterAdapter.java | 3 +-- .../com/todoroo/astrid/adapter/TaskAdapter.java | 3 +-- .../todoroo/astrid/core/CustomFilterExposer.java | 4 ++-- .../main/java/com/todoroo/astrid/dao/TaskDao.java | 4 ++-- .../com/todoroo/astrid/service/TaskCompleter.java | 3 ++- .../com/todoroo/astrid/service/TaskMover.java | 2 +- .../java/com/todoroo/astrid/service/Upgrader.java | 4 ++-- .../todoroo/astrid/timers/TimerFilterExposer.java | 15 ++++----------- .../java/org/tasks/billing/PurchaseActivity.kt | 3 +-- .../java/org/tasks/caldav/CaldavSynchronizer.java | 4 ++-- app/src/main/java/org/tasks/data/TagDataDao.java | 4 ++-- .../main/java/org/tasks/data/TaskListQuery.java | 5 +++-- app/src/main/java/org/tasks/db/DbUtils.java | 3 +-- .../org/tasks/dialogs/AddAttachmentDialog.java | 6 +++--- .../java/org/tasks/etesync/EteSynchronizer.java | 3 +-- .../org/tasks/filters/FilterCriteriaProvider.java | 4 ++-- .../java/org/tasks/filters/FilterProvider.java | 12 +++++++----- .../java/org/tasks/jobs/NotificationQueue.java | 3 ++- .../tasks/location/LocationPickerActivity.java | 3 +-- .../tasks/notifications/NotificationManager.java | 6 +++--- .../java/org/tasks/tags/TagPickerViewModel.java | 5 ++--- .../java/org/tasks/ui/LocationControlSet.java | 3 +-- 24 files changed, 50 insertions(+), 61 deletions(-) diff --git a/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.java b/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.java index 394d9ac1e..2ff069074 100644 --- a/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.java +++ b/app/src/androidTest/java/org/tasks/data/DeletionDaoTests.java @@ -30,13 +30,13 @@ public class DeletionDaoTests extends InjectingTestCase { @Test public void deleting1000DoesntCrash() { deletionDao.delete( - newArrayList(ContiguousSet.create(Range.closed(1L, 1000L), DiscreteDomain.longs()))); + new ArrayList<>(ContiguousSet.create(Range.closed(1L, 1000L), DiscreteDomain.longs()))); } @Test public void marking998ForDeletionDoesntCrash() { deletionDao.markDeleted( - newArrayList(ContiguousSet.create(Range.closed(1L, 1000L), DiscreteDomain.longs()))); + new ArrayList<>(ContiguousSet.create(Range.closed(1L, 1000L), DiscreteDomain.longs()))); } @Test diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 0c71b3fff..e00fa5a2e 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.activity; import static android.app.Activity.RESULT_OK; import static com.google.common.base.Strings.padStart; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.todoroo.andlib.utility.AndroidUtilities.assertMainThread; import static org.tasks.activities.RemoteListPicker.newRemoteListSupportPicker; @@ -736,9 +735,9 @@ public final class TaskListFragment extends InjectingFragment intent.putExtra(TagPickerActivity.EXTRA_TASKS, selected); intent.putParcelableArrayListExtra( TagPickerActivity.EXTRA_PARTIALLY_SELECTED, - newArrayList(tagDataDao.getByUuid(tags.first))); + new ArrayList<>(tagDataDao.getByUuid(tags.first))); intent.putParcelableArrayListExtra( - TagPickerActivity.EXTRA_SELECTED, newArrayList(tagDataDao.getByUuid(tags.second))); + TagPickerActivity.EXTRA_SELECTED, new ArrayList<>(tagDataDao.getByUuid(tags.second))); startActivityForResult(intent, REQUEST_TAG_TASKS); return true; case R.id.move_tasks: diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index c5229703e..8c73e7064 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.adapter; -import static com.google.common.collect.Lists.newArrayList; import static com.todoroo.andlib.utility.AndroidUtilities.assertMainThread; import android.app.Activity; @@ -143,7 +142,7 @@ public class FilterAdapter extends BaseAdapter { private ArrayList getItems() { assertMainThread(); - return newArrayList(items); + return new ArrayList<>(items); } @NonNull diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index bb4ef3584..a685fd42d 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.adapter; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.primitives.Longs.asList; import com.todoroo.astrid.data.Task; @@ -41,7 +40,7 @@ public class TaskAdapter { } public ArrayList getSelected() { - return newArrayList(selected); + return new ArrayList<>(selected); } public void setSelected(long... ids) { diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index db841171a..662000c45 100644 --- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -6,11 +6,11 @@ package com.todoroo.astrid.core; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import com.todoroo.astrid.api.CustomFilter; import com.todoroo.astrid.api.Filter; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.inject.Inject; @@ -27,7 +27,7 @@ public final class CustomFilterExposer { } public List getFilters() { - List filters = newArrayList(transform(filterDao.getFilters(), this::load)); + List filters = new ArrayList<>(transform(filterDao.getFilters(), this::load)); Collections.sort(filters, new AlphanumComparator<>(AlphanumComparator.FILTER)); return filters; } diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java index 1f3683c4e..3375eae5e 100644 --- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.dao; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.todoroo.andlib.sql.SqlConstants.COUNT; import static com.todoroo.andlib.utility.DateUtilities.now; @@ -32,6 +31,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.PermaSql; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.UUIDHelper; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.tasks.BuildConfig; @@ -234,7 +234,7 @@ public abstract class TaskDao { public abstract List getChildren(List ids); public List findChildrenInList(List ids) { - List result = newArrayList(ids); + List result = new ArrayList<>(ids); result.retainAll(getChildren(ids)); return result; } diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.java b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.java index bb8980c73..14217bd8b 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.java +++ b/app/src/main/java/com/todoroo/astrid/service/TaskCompleter.java @@ -6,6 +6,7 @@ import static com.todoroo.andlib.utility.DateUtilities.now; import com.google.common.collect.Iterables; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.inject.Inject; @@ -35,7 +36,7 @@ public class TaskCompleter { public void setComplete(Task item, boolean completed) { long completionDate = completed ? now() : 0L; setComplete(Collections.singletonList(item), completionDate); - List tasks = newArrayList(googleTaskDao.getChildTasks(item.getId())); + List tasks = new ArrayList<>(googleTaskDao.getChildTasks(item.getId())); List caldavChildren = taskDao.getChildren(item.getId()); if (!caldavChildren.isEmpty()) { tasks.addAll(taskDao.fetch(caldavChildren)); diff --git a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java index f03b0f91e..4171e6db2 100644 --- a/app/src/main/java/com/todoroo/astrid/service/TaskMover.java +++ b/app/src/main/java/com/todoroo/astrid/service/TaskMover.java @@ -65,7 +65,7 @@ public class TaskMover { } public void move(List tasks, Filter selectedList) { - tasks = newArrayList(tasks); + tasks = new ArrayList<>(tasks); tasks.removeAll(googleTaskDao.findChildrenInList(tasks)); tasks.removeAll(taskDao.findChildrenInList(tasks)); taskDao.setParent(0, null, tasks); diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java index 3c62e403e..23e7791ea 100644 --- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java +++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java @@ -1,7 +1,6 @@ package com.todoroo.astrid.service; import static com.google.common.collect.Iterables.transform; -import static com.google.common.collect.Lists.newArrayList; import static org.tasks.Strings.isNullOrEmpty; import static org.tasks.db.DbUtils.batch; @@ -15,6 +14,7 @@ import com.google.common.collect.Multimaps; import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.dao.TaskDao; import java.io.File; +import java.util.ArrayList; import java.util.List; import javax.inject.Inject; import net.fortuna.ical4j.model.property.Geo; @@ -227,7 +227,7 @@ public class Upgrader { } private void applyCaldavSubtasks() { - List updated = newArrayList(); + List updated = new ArrayList<>(); for (CaldavTask task : transform(caldavDao.getTasks(), CaldavTaskContainer::getCaldavTask)) { at.bitfire.ical4android.Task remoteTask = iCalendar.Companion.fromVtodo(task.getVtodo()); diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java index 2b51e63da..e9ee7829d 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -6,17 +6,14 @@ package com.todoroo.astrid.timers; -import static com.google.common.collect.Lists.newArrayList; -import static java.util.Collections.emptyList; - import android.content.Context; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; -import java.util.List; import javax.inject.Inject; +import org.jetbrains.annotations.Nullable; import org.tasks.R; import org.tasks.injection.ForApplication; @@ -36,7 +33,7 @@ public final class TimerFilterExposer { this.taskDao = taskDao; } - public static Filter createFilter(Context context) { + static Filter createFilter(Context context) { Filter filter = new Filter( context.getString(R.string.TFE_workingOn), @@ -46,11 +43,7 @@ public final class TimerFilterExposer { return filter; } - public List getFilters() { - if (taskDao.activeTimers() == 0) { - return emptyList(); - } - - return newArrayList(createFilter(context)); + public @Nullable Filter getFilters() { + return taskDao.activeTimers() == 0 ? null : createFilter(context); } } diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt index afbee5f25..848edb7fc 100644 --- a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt +++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt @@ -14,7 +14,6 @@ import butterknife.OnClick import com.google.android.material.button.MaterialButtonToggleGroup import com.google.common.collect.ContiguousSet import com.google.common.collect.DiscreteDomain -import com.google.common.collect.Lists import com.google.common.collect.Range import org.tasks.LocalBroadcastManager import org.tasks.R @@ -149,7 +148,7 @@ class PurchaseActivity : ThemedInjectingAppCompatActivity(), OnPurchasesUpdated, updateSubscribeButton() setWaitScreen(false) adapter.submitList( - Lists.newArrayList(ContiguousSet.create(Range.closed(1, 10), DiscreteDomain.integers()))) + ArrayList(ContiguousSet.create(Range.closed(1, 10), DiscreteDomain.integers()))) binding.recyclerView.layoutManager = IconLayoutManager(this) binding.recyclerView.adapter = adapter } diff --git a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java index 14b2a7920..e65d4d1f9 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java +++ b/app/src/main/java/org/tasks/caldav/CaldavSynchronizer.java @@ -133,7 +133,7 @@ public class CaldavSynchronizer { Set urls = newHashSet(transform(resources, c -> c.getHref().toString())); Timber.d("Found calendars: %s", urls); for (CaldavCalendar calendar : - caldavDao.findDeletedCalendars(account.getUuid(), newArrayList(urls))) { + caldavDao.findDeletedCalendars(account.getUuid(), new ArrayList<>(urls))) { taskDeleter.delete(calendar); } for (Response resource : resources) { @@ -242,7 +242,7 @@ public class CaldavSynchronizer { } List deleted = - newArrayList( + new ArrayList<>( difference( newHashSet(caldavDao.getObjects(caldavCalendar.getUuid())), newHashSet(remoteObjects))); diff --git a/app/src/main/java/org/tasks/data/TagDataDao.java b/app/src/main/java/org/tasks/data/TagDataDao.java index 5a8f0973c..3c8af877a 100644 --- a/app/src/main/java/org/tasks/data/TagDataDao.java +++ b/app/src/main/java/org/tasks/data/TagDataDao.java @@ -3,7 +3,6 @@ package org.tasks.data; import static com.google.common.collect.FluentIterable.concat; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.transform; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.newHashSet; @@ -22,6 +21,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.UUIDHelper; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -124,7 +124,7 @@ public abstract class TagDataDao { insert(transform(added, td -> new Tag(task, td))); } } - return newArrayList(modified); + return new ArrayList<>(modified); } @Transaction diff --git a/app/src/main/java/org/tasks/data/TaskListQuery.java b/app/src/main/java/org/tasks/data/TaskListQuery.java index 673d5fa8a..11d17e126 100644 --- a/app/src/main/java/org/tasks/data/TaskListQuery.java +++ b/app/src/main/java/org/tasks/data/TaskListQuery.java @@ -21,6 +21,7 @@ import com.todoroo.astrid.api.PermaSql; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; +import java.util.ArrayList; import java.util.List; import org.tasks.preferences.Preferences; @@ -87,7 +88,7 @@ public class TaskListQuery { com.todoroo.astrid.api.Filter filter, Preferences preferences, SubtaskInfo subtasks) { - List fields = newArrayList(FIELDS); + List fields = new ArrayList<>(FIELDS); fields.add(TAG_QUERY); fields.add(INDENT); fields.add(CHILDREN); @@ -180,7 +181,7 @@ public class TaskListQuery { } private static List getNonRecursiveQuery(Filter filter, Preferences preferences) { - List fields = newArrayList(FIELDS); + List fields = new ArrayList<>(FIELDS); fields.add(TAGS); if (filter instanceof GtasksFilter && preferences.isManualSort()) { diff --git a/app/src/main/java/org/tasks/db/DbUtils.java b/app/src/main/java/org/tasks/db/DbUtils.java index 9c9ceeecd..6b516df01 100644 --- a/app/src/main/java/org/tasks/db/DbUtils.java +++ b/app/src/main/java/org/tasks/db/DbUtils.java @@ -1,6 +1,5 @@ package org.tasks.db; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.partition; import com.google.common.base.Function; @@ -16,7 +15,7 @@ public class DbUtils { public static List collect(Collection items, Function, List> func) { if (items.size() < MAX_SQLITE_ARGS) { - return func.apply(items instanceof List ? (List) items : newArrayList(items)); + return func.apply(items instanceof List ? (List) items : new ArrayList<>(items)); } List result = new ArrayList<>(); batch(items, b -> result.addAll(func.apply(b))); diff --git a/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java index cee9e980d..7fe792ee4 100644 --- a/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java +++ b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java @@ -1,6 +1,5 @@ package org.tasks.dialogs; -import static com.google.common.collect.Lists.newArrayList; import static org.tasks.dialogs.RecordAudioDialog.newRecordAudioDialog; import static org.tasks.files.FileHelper.newFilePickerIntent; @@ -11,6 +10,7 @@ import android.os.Bundle; import android.provider.MediaStore.Images.Media; import androidx.annotation.NonNull; import com.todoroo.astrid.files.FilesControlSet; +import java.util.ArrayList; import java.util.List; import javax.inject.Inject; import org.tasks.R; @@ -45,8 +45,8 @@ public class AddAttachmentDialog extends InjectingDialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - List entries = newArrayList(); - final List actions = newArrayList(); + List entries = new ArrayList<>(); + final List actions = new ArrayList<>(); if (device.hasCamera()) { entries.add(getString(R.string.take_a_picture)); actions.add(this::takePicture); diff --git a/app/src/main/java/org/tasks/etesync/EteSynchronizer.java b/app/src/main/java/org/tasks/etesync/EteSynchronizer.java index 6c39ba7f2..f5339e78f 100644 --- a/app/src/main/java/org/tasks/etesync/EteSynchronizer.java +++ b/app/src/main/java/org/tasks/etesync/EteSynchronizer.java @@ -1,7 +1,6 @@ package org.tasks.etesync; import static com.google.common.collect.FluentIterable.from; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; import static com.google.common.collect.Sets.newHashSet; import static java.util.Collections.emptySet; @@ -113,7 +112,7 @@ public class EteSynchronizer { Set uids = newHashSet(Iterables.transform(resources.values(), CollectionInfo::getUid)); Timber.d("Found uids: %s", uids); for (CaldavCalendar calendar : - caldavDao.findDeletedCalendars(account.getUuid(), newArrayList(uids))) { + caldavDao.findDeletedCalendars(account.getUuid(), new ArrayList<>(uids))) { taskDeleter.delete(calendar); } diff --git a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java index 4447e4b13..4b88eee7a 100644 --- a/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java +++ b/app/src/main/java/org/tasks/filters/FilterCriteriaProvider.java @@ -1,7 +1,6 @@ package org.tasks.filters; import static com.google.common.collect.Iterables.transform; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newLinkedHashSet; import android.content.Context; @@ -17,6 +16,7 @@ import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task.Priority; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -99,7 +99,7 @@ public class FilterCriteriaProvider { } public List getAll() { - List result = newArrayList(); + List result = new ArrayList<>(); result.add(getTagFilter()); result.add(getTagNameContainsFilter()); diff --git a/app/src/main/java/org/tasks/filters/FilterProvider.java b/app/src/main/java/org/tasks/filters/FilterProvider.java index ba3f2556d..331ed403d 100644 --- a/app/src/main/java/org/tasks/filters/FilterProvider.java +++ b/app/src/main/java/org/tasks/filters/FilterProvider.java @@ -307,9 +307,11 @@ public class FilterProvider { } private List getFilters() { - ArrayList filters = new ArrayList<>(); - filters.addAll(builtInFilterExposer.getFilters()); - filters.addAll(timerFilterExposer.getFilters()); + ArrayList filters = new ArrayList<>(builtInFilterExposer.getFilters()); + Filter filter = timerFilterExposer.getFilters(); + if (filter != null) { + filters.add(filter); + } filters.addAll(customFilterExposer.getFilters()); return filters; } @@ -322,7 +324,7 @@ public class FilterProvider { account, account.isCollapsed() ? emptyList() - : newArrayList( + : new ArrayList<>( transform( googleTaskListDao.getGoogleTaskFilters(account.getAccount(), now()), GoogleTaskFilters::toGtasksFilter))); @@ -341,7 +343,7 @@ public class FilterProvider { account, account.isCollapsed() ? emptyList() - : newArrayList( + : new ArrayList<>( transform( caldavDao.getCaldavFilters(account.getUuid(), now()), CaldavFilters::toCaldavFilter))); diff --git a/app/src/main/java/org/tasks/jobs/NotificationQueue.java b/app/src/main/java/org/tasks/jobs/NotificationQueue.java index 45410b8dc..fc87d9aa9 100644 --- a/app/src/main/java/org/tasks/jobs/NotificationQueue.java +++ b/app/src/main/java/org/tasks/jobs/NotificationQueue.java @@ -8,6 +8,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; import com.google.common.primitives.Ints; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.inject.Inject; @@ -67,7 +68,7 @@ public class NotificationQueue { } synchronized List getOverdueJobs() { - List result = newArrayList(); + List result = new ArrayList<>(); long cutoff = new DateTime().startOfMinute().plusMinutes(1).getMillis(); for (Long key : jobs.keySet().headSet(cutoff)) { result.addAll(jobs.get(key)); diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.java b/app/src/main/java/org/tasks/location/LocationPickerActivity.java index 8b1011664..5167c6a6d 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerActivity.java +++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.java @@ -1,6 +1,5 @@ package org.tasks.location; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.todoroo.andlib.utility.AndroidUtilities.hideKeyboard; import static org.tasks.PermissionUtil.verifyPermissions; @@ -387,7 +386,7 @@ public class LocationPickerActivity extends InjectingAppCompatActivity private void updateMarkers() { if (map != null) { - map.setMarkers(newArrayList(transform(places, PlaceUsage::getPlace))); + map.setMarkers(transform(places, PlaceUsage::getPlace)); } } diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.java b/app/src/main/java/org/tasks/notifications/NotificationManager.java index 1804223e4..850204d33 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationManager.java +++ b/app/src/main/java/org/tasks/notifications/NotificationManager.java @@ -251,7 +251,7 @@ public class NotificationManager { cancelSummaryNotification(); return; } - ArrayList taskIds = newArrayList(transform(tasks, Task::getId)); + ArrayList taskIds = new ArrayList<>(transform(tasks, Task::getId)); Filter filter = new Filter( context.getString(R.string.notifications), @@ -263,8 +263,8 @@ public class NotificationManager { context.getResources().getQuantityString(R.plurals.task_count, taskCount, taskCount); NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle().setBigContentTitle(summaryTitle); - List titles = newArrayList(); - List ticker = newArrayList(); + List titles = new ArrayList<>(); + List ticker = new ArrayList<>(); for (Task task : tasks) { String title = task.getTitle(); style.addLine(title); diff --git a/app/src/main/java/org/tasks/tags/TagPickerViewModel.java b/app/src/main/java/org/tasks/tags/TagPickerViewModel.java index 468895a46..614977bb0 100644 --- a/app/src/main/java/org/tasks/tags/TagPickerViewModel.java +++ b/app/src/main/java/org/tasks/tags/TagPickerViewModel.java @@ -1,7 +1,6 @@ package org.tasks.tags; import static com.google.common.collect.Iterables.any; -import static com.google.common.collect.Lists.newArrayList; import static org.tasks.Strings.isNullOrEmpty; import androidx.annotation.Nullable; @@ -46,11 +45,11 @@ public class TagPickerViewModel extends ViewModel { } public ArrayList getSelected() { - return newArrayList(selected); + return new ArrayList<>(selected); } ArrayList getPartiallySelected() { - return newArrayList(partiallySelected); + return new ArrayList<>(partiallySelected); } public String getText() { diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.java b/app/src/main/java/org/tasks/ui/LocationControlSet.java index e3b226509..60ef9b28d 100644 --- a/app/src/main/java/org/tasks/ui/LocationControlSet.java +++ b/app/src/main/java/org/tasks/ui/LocationControlSet.java @@ -1,6 +1,5 @@ package org.tasks.ui; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.transform; import static com.todoroo.astrid.data.SyncFlags.FORCE_CALDAV_SYNC; import static org.tasks.PermissionUtil.verifyPermissions; @@ -167,7 +166,7 @@ public class LocationControlSet extends TaskEditControlFragment { dialogBuilder .newDialog(location.getDisplayName()) .setItems( - newArrayList(transform(options, o -> getString(o.first))), + new ArrayList<>(transform(options, o -> getString(o.first))), (dialog, which) -> options.get(which).second.run()) .show(); }