From c95fa9a1df7e6bdad1e21505494655c6e86e3054 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 9 Apr 2020 12:37:17 -0500 Subject: [PATCH] Add final modifiers --- .../java/org/tasks/caldav/AppleRemindersTests.java | 2 +- .../androidTest/java/org/tasks/caldav/NextCloudTests.java | 2 +- .../androidTest/java/org/tasks/caldav/SynologyTests.java | 2 +- .../androidTest/java/org/tasks/caldav/ThunderbirdTests.java | 2 +- .../java/com/todoroo/astrid/activity/TaskListFragment.java | 2 +- .../com/todoroo/astrid/adapter/NavigationDrawerAdapter.java | 2 +- .../java/org/tasks/activities/FilterSelectionActivity.java | 2 +- .../main/java/org/tasks/activities/RemoteListPicker.java | 2 +- app/src/main/java/org/tasks/backup/TasksJsonImporter.java | 2 +- app/src/main/java/org/tasks/billing/Inventory.java | 2 +- app/src/main/java/org/tasks/dialogs/IconLayoutManager.java | 2 +- app/src/main/java/org/tasks/filters/AlphanumComparator.java | 2 +- app/src/main/java/org/tasks/filters/PlaceFilter.java | 2 +- app/src/main/java/org/tasks/jobs/WorkManager.java | 2 +- .../java/org/tasks/location/LocationPickerActivity.java | 2 +- .../main/java/org/tasks/location/LocationSearchAdapter.java | 2 +- app/src/main/java/org/tasks/location/MapboxMapFragment.java | 2 +- .../main/java/org/tasks/location/PlaceSearchViewModel.java | 6 +++--- .../java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java | 6 +++--- .../java/org/tasks/tasklist/PagedListRecyclerAdapter.java | 2 +- app/src/main/java/org/tasks/ui/TaskListViewModel.java | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/src/androidTest/java/org/tasks/caldav/AppleRemindersTests.java b/app/src/androidTest/java/org/tasks/caldav/AppleRemindersTests.java index 320d46ca7..c17a5394e 100644 --- a/app/src/androidTest/java/org/tasks/caldav/AppleRemindersTests.java +++ b/app/src/androidTest/java/org/tasks/caldav/AppleRemindersTests.java @@ -15,7 +15,7 @@ import org.tasks.time.DateTime; @RunWith(AndroidJUnit4.class) public class AppleRemindersTests { - private TimeZone defaultTimeZone = TimeZone.getDefault(); + private final TimeZone defaultTimeZone = TimeZone.getDefault(); @Before public void before() { diff --git a/app/src/androidTest/java/org/tasks/caldav/NextCloudTests.java b/app/src/androidTest/java/org/tasks/caldav/NextCloudTests.java index 4b8cc193d..8dab2a693 100644 --- a/app/src/androidTest/java/org/tasks/caldav/NextCloudTests.java +++ b/app/src/androidTest/java/org/tasks/caldav/NextCloudTests.java @@ -15,7 +15,7 @@ import org.tasks.time.DateTime; @RunWith(AndroidJUnit4.class) public class NextCloudTests { - private TimeZone defaultTimeZone = TimeZone.getDefault(); + private final TimeZone defaultTimeZone = TimeZone.getDefault(); @Before public void before() { diff --git a/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java b/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java index 3dc3b6d8e..2199f3e0f 100644 --- a/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java +++ b/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java @@ -13,7 +13,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class SynologyTests { - private TimeZone defaultTimeZone = TimeZone.getDefault(); + private final TimeZone defaultTimeZone = TimeZone.getDefault(); @Before public void before() { diff --git a/app/src/androidTest/java/org/tasks/caldav/ThunderbirdTests.java b/app/src/androidTest/java/org/tasks/caldav/ThunderbirdTests.java index 2ae4c0adf..57c79e58a 100644 --- a/app/src/androidTest/java/org/tasks/caldav/ThunderbirdTests.java +++ b/app/src/androidTest/java/org/tasks/caldav/ThunderbirdTests.java @@ -15,7 +15,7 @@ import org.tasks.time.DateTime; @RunWith(AndroidJUnit4.class) public class ThunderbirdTests { - private TimeZone defaultTimeZone = TimeZone.getDefault(); + private final TimeZone defaultTimeZone = TimeZone.getDefault(); @Before public void before() { 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 18004c204..866172d66 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -185,7 +185,7 @@ public final class TaskListFragment extends InjectingFragment private TaskAdapter taskAdapter = null; private TaskListRecyclerAdapter recyclerAdapter; private Filter filter; - private PublishSubject searchSubject = PublishSubject.create(); + private final PublishSubject searchSubject = PublishSubject.create(); private Disposable searchDisposable; private MenuItem search; private String searchQuery; diff --git a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java index 87cc5b316..cc6c7795e 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java +++ b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java @@ -54,7 +54,7 @@ public class NavigationDrawerAdapter extends RecyclerView.Adapter { private OnClick onClick; private Filter selected = null; - private AsyncListDiffer differ; + private final AsyncListDiffer differ; @Inject public NavigationDrawerAdapter( diff --git a/app/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/app/src/main/java/org/tasks/activities/FilterSelectionActivity.java index e721facdb..44f512c26 100644 --- a/app/src/main/java/org/tasks/activities/FilterSelectionActivity.java +++ b/app/src/main/java/org/tasks/activities/FilterSelectionActivity.java @@ -33,7 +33,7 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity { private CompositeDisposable disposables; private Filter selected; - private BroadcastReceiver refreshReceiver = new BroadcastReceiver() { + private final BroadcastReceiver refreshReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { refresh(); diff --git a/app/src/main/java/org/tasks/activities/RemoteListPicker.java b/app/src/main/java/org/tasks/activities/RemoteListPicker.java index 9306ac661..5d253db4a 100644 --- a/app/src/main/java/org/tasks/activities/RemoteListPicker.java +++ b/app/src/main/java/org/tasks/activities/RemoteListPicker.java @@ -43,7 +43,7 @@ public class RemoteListPicker extends InjectingDialogFragment @Inject LocalBroadcastManager localBroadcastManager; private CompositeDisposable disposables; - private BroadcastReceiver refreshReceiver = new BroadcastReceiver() { + private final BroadcastReceiver refreshReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { refresh(); diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java index 999fc5e54..27ee58d3a 100644 --- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java +++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java @@ -66,7 +66,7 @@ public class TasksJsonImporter { private final Preferences preferences; private final LocationDao locationDao; - private ImportResult result = new ImportResult(); + private final ImportResult result = new ImportResult(); @Inject public TasksJsonImporter( diff --git a/app/src/main/java/org/tasks/billing/Inventory.java b/app/src/main/java/org/tasks/billing/Inventory.java index a2d04c47b..593fc8358 100644 --- a/app/src/main/java/org/tasks/billing/Inventory.java +++ b/app/src/main/java/org/tasks/billing/Inventory.java @@ -21,7 +21,7 @@ public class Inventory { private final SignatureVerifier signatureVerifier; private final LocalBroadcastManager localBroadcastManager; - private Map purchases = new HashMap<>(); + private final Map purchases = new HashMap<>(); private Purchase subscription = null; @Inject diff --git a/app/src/main/java/org/tasks/dialogs/IconLayoutManager.java b/app/src/main/java/org/tasks/dialogs/IconLayoutManager.java index 4d3a1e33b..2de961932 100644 --- a/app/src/main/java/org/tasks/dialogs/IconLayoutManager.java +++ b/app/src/main/java/org/tasks/dialogs/IconLayoutManager.java @@ -7,7 +7,7 @@ import org.tasks.R; public class IconLayoutManager extends GridLayoutManager { - private int iconSize; + private final int iconSize; public IconLayoutManager(Context context) { super(context, DEFAULT_SPAN_COUNT, RecyclerView.VERTICAL, false); diff --git a/app/src/main/java/org/tasks/filters/AlphanumComparator.java b/app/src/main/java/org/tasks/filters/AlphanumComparator.java index a6c333f36..b9577f9b8 100644 --- a/app/src/main/java/org/tasks/filters/AlphanumComparator.java +++ b/app/src/main/java/org/tasks/filters/AlphanumComparator.java @@ -43,7 +43,7 @@ import java.util.Comparator; */ public class AlphanumComparator implements Comparator { - public static Function FILTER = f -> f.listingTitle; + public static final Function FILTER = f -> f.listingTitle; private final Function getTitle; diff --git a/app/src/main/java/org/tasks/filters/PlaceFilter.java b/app/src/main/java/org/tasks/filters/PlaceFilter.java index b72cb55aa..d367eda31 100644 --- a/app/src/main/java/org/tasks/filters/PlaceFilter.java +++ b/app/src/main/java/org/tasks/filters/PlaceFilter.java @@ -37,7 +37,7 @@ public class PlaceFilter extends Filter { } }; - private Place place; + private final Place place; private static final Table G2 = Geofence.TABLE.as("G2"); private static final Field G2_PLACE = Field.field("G2.place"); private static final Field G2_TASK = Field.field("G2.task"); diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.java b/app/src/main/java/org/tasks/jobs/WorkManager.java index 538cecc35..5a0407d45 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManager.java +++ b/app/src/main/java/org/tasks/jobs/WorkManager.java @@ -62,7 +62,7 @@ public class WorkManager { private final GoogleTaskListDao googleTaskListDao; private final CaldavDao caldavDao; private final AlarmManager alarmManager; - private androidx.work.WorkManager workManager; + private final androidx.work.WorkManager workManager; @Inject public WorkManager( diff --git a/app/src/main/java/org/tasks/location/LocationPickerActivity.java b/app/src/main/java/org/tasks/location/LocationPickerActivity.java index 5c31e47b0..7e5dac87c 100644 --- a/app/src/main/java/org/tasks/location/LocationPickerActivity.java +++ b/app/src/main/java/org/tasks/location/LocationPickerActivity.java @@ -125,7 +125,7 @@ public class LocationPickerActivity extends InjectingAppCompatActivity private List places = Collections.emptyList(); private int offset; private MenuItem search; - private PublishSubject searchSubject = PublishSubject.create(); + private final PublishSubject searchSubject = PublishSubject.create(); private PlaceSearchViewModel viewModel; @Override diff --git a/app/src/main/java/org/tasks/location/LocationSearchAdapter.java b/app/src/main/java/org/tasks/location/LocationSearchAdapter.java index 62e9033b2..cf447c1b4 100644 --- a/app/src/main/java/org/tasks/location/LocationSearchAdapter.java +++ b/app/src/main/java/org/tasks/location/LocationSearchAdapter.java @@ -129,7 +129,7 @@ public class LocationSearchAdapter extends RecyclerView.Adapter public static class FooterViewHolder extends RecyclerView.ViewHolder { - View divider; + final View divider; FooterViewHolder(@NonNull View itemView, @DrawableRes int attributionRes) { super(itemView); diff --git a/app/src/main/java/org/tasks/location/MapboxMapFragment.java b/app/src/main/java/org/tasks/location/MapboxMapFragment.java index f43cf24b0..7c106db91 100644 --- a/app/src/main/java/org/tasks/location/MapboxMapFragment.java +++ b/app/src/main/java/org/tasks/location/MapboxMapFragment.java @@ -31,7 +31,7 @@ public class MapboxMapFragment implements MapFragment, OnMapReadyCallback, OnMar private MapFragmentCallback callbacks; private boolean dark; private MapboxMap map; - private Map markers = new HashMap<>(); + private final Map markers = new HashMap<>(); public MapboxMapFragment(Context context) { this.context = context; diff --git a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.java b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.java index cfe3f31a9..eee885919 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchViewModel.java +++ b/app/src/main/java/org/tasks/location/PlaceSearchViewModel.java @@ -17,9 +17,9 @@ import org.tasks.data.Place; public class PlaceSearchViewModel extends ViewModel { private PlaceSearchProvider searchProvider; - private MutableLiveData> searchResults = new MutableLiveData<>(); - private MutableLiveData> error = new MutableLiveData<>(); - private MutableLiveData selection = new MutableLiveData<>(); + private final MutableLiveData> searchResults = new MutableLiveData<>(); + private final MutableLiveData> error = new MutableLiveData<>(); + private final MutableLiveData selection = new MutableLiveData<>(); void setSearchProvider(PlaceSearchProvider searchProvider) { this.searchProvider = searchProvider; diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java index f613de727..e2d88e4d8 100644 --- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java +++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.java @@ -37,9 +37,9 @@ public class DragAndDropRecyclerAdapter extends TaskListRecyclerAdapter { private final TaskListFragment taskList; private final RecyclerView recyclerView; private List list; - private PublishSubject> publishSubject = PublishSubject.create(); - private CompositeDisposable disposables = new CompositeDisposable(); - private Queue, DiffResult>> updates = new LinkedList<>(); + private final PublishSubject> publishSubject = PublishSubject.create(); + private final CompositeDisposable disposables = new CompositeDisposable(); + private final Queue, DiffResult>> updates = new LinkedList<>(); private boolean dragging; public DragAndDropRecyclerAdapter( diff --git a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java index 2d439d04a..c96f7b8c1 100644 --- a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java +++ b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.java @@ -14,7 +14,7 @@ import org.tasks.data.TaskContainer; public class PagedListRecyclerAdapter extends TaskListRecyclerAdapter { private final RecyclerView recyclerView; - private AsyncPagedListDiffer differ; + private final AsyncPagedListDiffer differ; public PagedListRecyclerAdapter( TaskAdapter adapter, diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.java b/app/src/main/java/org/tasks/ui/TaskListViewModel.java index bb74d5592..ad54a7edc 100644 --- a/app/src/main/java/org/tasks/ui/TaskListViewModel.java +++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.java @@ -40,7 +40,7 @@ public class TaskListViewModel extends ViewModel implements Observer> tasks = new MutableLiveData<>(); private Filter filter; private boolean manualSort; - private CompositeDisposable disposable = new CompositeDisposable(); + private final CompositeDisposable disposable = new CompositeDisposable(); private LiveData> internal; public void setFilter(@NonNull Filter filter) {