From b0b67908d9bce1e10c70e5455aece6678e9f8c4a Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 17 Aug 2016 11:04:25 -0500 Subject: [PATCH] Add final modifier --- src/debug/java/org/tasks/BuildSetup.java | 2 +- .../gtasks/OrderedMetadataListFragmentHelper.java | 6 +++--- .../astrid/gtasks/OrderedMetadataListUpdater.java | 2 +- .../com/todoroo/astrid/gtasks/api/MoveRequest.java | 2 +- .../todoroo/astrid/gtasks/sync/GtasksSyncService.java | 2 +- .../astrid/gtasks/sync/GtasksTaskContainer.java | 4 ++-- .../java/org/tasks/billing/PurchaseHelper.java | 2 +- .../java/org/tasks/location/GeofenceApi.java | 6 +++--- src/googleplay/java/org/tasks/location/GoogleApi.java | 2 +- src/main/java/com/todoroo/andlib/sql/Criterion.java | 2 +- .../com/todoroo/astrid/activity/TaskListFragment.java | 2 +- .../java/com/todoroo/astrid/adapter/FilterAdapter.java | 4 ++-- .../java/com/todoroo/astrid/adapter/TaskAdapter.java | 4 ++-- .../com/todoroo/astrid/backup/TasksXmlImporter.java | 6 +++--- .../com/todoroo/astrid/core/CustomFilterAdapter.java | 4 ++-- .../java/com/todoroo/astrid/dao/StoreObjectDao.java | 2 +- .../com/todoroo/astrid/notes/CommentsController.java | 2 +- .../todoroo/astrid/provider/Astrid2TaskProvider.java | 4 ++-- .../todoroo/astrid/provider/SqlContentProvider.java | 2 +- .../com/todoroo/astrid/reminders/ReminderService.java | 4 ++-- .../astrid/repeats/RepeatTaskCompleteListener.java | 2 +- .../java/com/todoroo/astrid/service/TaskCreator.java | 2 +- .../subtasks/AstridOrderedListFragmentHelper.java | 4 ++-- .../todoroo/astrid/subtasks/SubtasksFilterUpdater.java | 2 +- .../com/todoroo/astrid/ui/HideUntilControlSet.java | 10 +++++----- .../java/com/todoroo/astrid/ui/ReminderControlSet.java | 6 +++--- .../com/todoroo/astrid/voice/VoiceInputAssistant.java | 2 +- .../java/org/tasks/filters/FilterCriteriaProvider.java | 10 +++++----- .../java/org/tasks/injection/ApplicationModule.java | 2 +- .../java/org/tasks/injection/DialogFragmentModule.java | 2 +- .../tasks/injection/NativeDialogFragmentModule.java | 2 +- src/main/java/org/tasks/locale/Locale.java | 2 +- .../org/tasks/preferences/AppearancePreferences.java | 4 ++-- src/main/java/org/tasks/preferences/Device.java | 2 +- .../tasks/preferences/FragmentPermissionRequestor.java | 2 +- .../org/tasks/receivers/ListNotificationReceiver.java | 2 +- .../tasks/receivers/RepeatConfirmationReceiver.java | 2 +- .../org/tasks/receivers/TaskNotificationReceiver.java | 2 +- src/main/java/org/tasks/reminders/SnoozeDialog.java | 2 +- .../java/org/tasks/scheduling/BackgroundScheduler.java | 2 +- .../java/org/tasks/sync/RecordSyncStatusCallback.java | 4 ++-- src/main/java/org/tasks/time/FixedMillisProvider.java | 2 +- src/main/java/org/tasks/ui/CheckBoxes.java | 10 +++++----- src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java | 2 +- .../java/org/tasks/ui/ProgressDialogAsyncTask.java | 4 ++-- src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java | 2 +- src/main/java/org/tasks/ui/TimePreference.java | 2 +- src/main/java/org/tasks/ui/WidgetCheckBoxes.java | 6 +++--- src/main/java/org/tasks/widget/TasksWidget.java | 2 +- 49 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/debug/java/org/tasks/BuildSetup.java b/src/debug/java/org/tasks/BuildSetup.java index 2b166c2c3..433f044d6 100644 --- a/src/debug/java/org/tasks/BuildSetup.java +++ b/src/debug/java/org/tasks/BuildSetup.java @@ -14,7 +14,7 @@ import javax.inject.Inject; import timber.log.Timber; public class BuildSetup { - private Context context; + private final Context context; @Inject public BuildSetup(@ForApplication Context context) { diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java index 42b1aecb4..055d9b344 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java @@ -51,10 +51,10 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm private final DisplayMetrics metrics = new DisplayMetrics(); private final OrderedMetadataListUpdater updater; - private DialogBuilder dialogBuilder; - private CheckBoxes checkBoxes; + private final DialogBuilder dialogBuilder; + private final CheckBoxes checkBoxes; private final TagService tagService; - private ThemeCache themeCache; + private final ThemeCache themeCache; private final TaskListFragment fragment; private final Preferences preferences; diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java index 6c9211536..3b3e3104f 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/OrderedMetadataListUpdater.java @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicReference; abstract public class OrderedMetadataListUpdater { - private MetadataDao metadataDao; + private final MetadataDao metadataDao; public interface OrderedListIterator { void processTask(long taskId, Metadata metadata); diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java b/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java index 48196e0ab..79eddac75 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/api/MoveRequest.java @@ -19,7 +19,7 @@ import timber.log.Timber; public class MoveRequest { private final GtasksInvoker service; - private String taskId; + private final String taskId; private final String destinationList; private String parentId; private String priorSiblingId; diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index 4334429d4..e18f2e242 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java @@ -65,7 +65,7 @@ public class GtasksSyncService { } private class MoveOp implements SyncOnSaveOperation { - Metadata metadata; + final Metadata metadata; public MoveOp(Metadata metadata) { this.metadata = metadata; diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java index e7fb78762..2027e51a1 100644 --- a/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java +++ b/src/googleplay/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java @@ -16,8 +16,8 @@ import java.util.ArrayList; public class GtasksTaskContainer { - public Task task; - public ArrayList metadata; + public final Task task; + public final ArrayList metadata; public Metadata gtaskMetadata; private final long updateTime; diff --git a/src/googleplay/java/org/tasks/billing/PurchaseHelper.java b/src/googleplay/java/org/tasks/billing/PurchaseHelper.java index 5fe275fe2..73febeeeb 100644 --- a/src/googleplay/java/org/tasks/billing/PurchaseHelper.java +++ b/src/googleplay/java/org/tasks/billing/PurchaseHelper.java @@ -38,7 +38,7 @@ public class PurchaseHelper implements IabHelper.OnIabSetupFinishedListener { private final Tracker tracker; private final Broadcaster broadcaster; private final InventoryHelper inventory; - private Executor executor; + private final Executor executor; private PurchaseHelperCallback activityResultCallback; private IabHelper iabHelper; diff --git a/src/googleplay/java/org/tasks/location/GeofenceApi.java b/src/googleplay/java/org/tasks/location/GeofenceApi.java index 784a0b557..cd0601888 100644 --- a/src/googleplay/java/org/tasks/location/GeofenceApi.java +++ b/src/googleplay/java/org/tasks/location/GeofenceApi.java @@ -29,9 +29,9 @@ import static java.util.Collections.singletonList; public class GeofenceApi { - private Context context; - private Preferences preferences; - private PermissionChecker permissionChecker; + private final Context context; + private final Preferences preferences; + private final PermissionChecker permissionChecker; @Inject public GeofenceApi(@ForApplication Context context, Preferences preferences, PermissionChecker permissionChecker) { diff --git a/src/googleplay/java/org/tasks/location/GoogleApi.java b/src/googleplay/java/org/tasks/location/GoogleApi.java index dcf3a769e..ba82149b5 100644 --- a/src/googleplay/java/org/tasks/location/GoogleApi.java +++ b/src/googleplay/java/org/tasks/location/GoogleApi.java @@ -15,7 +15,7 @@ import timber.log.Timber; public class GoogleApi implements GoogleApiClient.ConnectionCallbacks { - private GoogleApiClient.Builder builder; + private final GoogleApiClient.Builder builder; private GoogleApiClient googleApiClient; private GoogleApiClientConnectionHandler googleApiClientConnectionHandler; diff --git a/src/main/java/com/todoroo/andlib/sql/Criterion.java b/src/main/java/com/todoroo/andlib/sql/Criterion.java index dd5ab76bc..bfd63b379 100644 --- a/src/main/java/com/todoroo/andlib/sql/Criterion.java +++ b/src/main/java/com/todoroo/andlib/sql/Criterion.java @@ -19,7 +19,7 @@ public abstract class Criterion { this.operator = operator; } - public static Criterion all = new Criterion(Operator.exists) { + public static final Criterion all = new Criterion(Operator.exists) { @Override protected void populate(StringBuilder sb) { sb.append(1); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index c0bae5bbb..a07e48e3e 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -149,7 +149,7 @@ public class TaskListFragment extends InjectingListFragment implements @BindView(R.id.task_list_coordinator) CoordinatorLayout coordinatorLayout; private TaskAdapter taskAdapter = null; - private RefreshReceiver refreshReceiver = new RefreshReceiver(); + private final RefreshReceiver refreshReceiver = new RefreshReceiver(); private TaskListFragmentCallbackHandler callbacks; protected final AtomicReference sqlQueryTemplate = new AtomicReference<>(); diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 7dd8da1d8..f585e8557 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -53,7 +53,7 @@ public class FilterAdapter extends ArrayAdapter { private final FilterProvider filterProvider; private final FilterCounter filterCounter; private final Activity activity; - private boolean navigationDrawer; + private final boolean navigationDrawer; private final Locale locale; private final FilterListUpdateReceiver filterListUpdateReceiver = new FilterListUpdateReceiver(); @@ -187,7 +187,7 @@ public class FilterAdapter extends ArrayAdapter { * ============================================================ selection * ====================================================================== */ - private FilterListItem selection = null; + private final FilterListItem selection = null; /* ====================================================================== * ============================================================= receiver diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 4f65e7733..17039bdf3 100644 --- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -122,9 +122,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable { private final Context context; private final TaskListFragment fragment; - private DialogBuilder dialogBuilder; + private final DialogBuilder dialogBuilder; private final TagService tagService; - private ThemeCache themeCache; + private final ThemeCache themeCache; private final Resources resources; private OnCompletedTaskListener onCompletedTaskListener = null; private final LayoutInflater inflater; diff --git a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index 99811d5ab..cec7bf86b 100644 --- a/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -148,9 +148,9 @@ public class TasksXmlImporter { private class Format2TaskImporter { XmlPullParser xpp; - Task currentTask = new Task(); - Metadata metadata = new Metadata(); - TagData tagdata = new TagData(); + final Task currentTask = new Task(); + final Metadata metadata = new Metadata(); + final TagData tagdata = new TagData(); public Format2TaskImporter() { } public Format2TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException { diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java index 6e03ba6b8..343ecee46 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -37,7 +37,7 @@ import java.util.List; class CustomFilterAdapter extends ArrayAdapter { private final CustomFilterActivity activity; - private DialogBuilder dialogBuilder; + private final DialogBuilder dialogBuilder; private final LayoutInflater inflater; private final Locale locale; @@ -52,7 +52,7 @@ class CustomFilterAdapter extends ArrayAdapter { // --- view event handling - private View.OnClickListener filterClickListener = new View.OnClickListener() { + private final View.OnClickListener filterClickListener = new View.OnClickListener() { @Override public void onClick(View v) { ViewHolder viewHolder = (ViewHolder) v.getTag(); diff --git a/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java b/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java index 348515781..db943ffb3 100644 --- a/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java +++ b/src/main/java/com/todoroo/astrid/dao/StoreObjectDao.java @@ -25,7 +25,7 @@ public class StoreObjectDao { private final DatabaseDao dao; - private static Criterion isSavedFilter = StoreObject.TYPE.eq(SavedFilter.TYPE); + private static final Criterion isSavedFilter = StoreObject.TYPE.eq(SavedFilter.TYPE); @Inject public StoreObjectDao(Database database) { diff --git a/src/main/java/com/todoroo/astrid/notes/CommentsController.java b/src/main/java/com/todoroo/astrid/notes/CommentsController.java index 1ff71952e..f78e75dcb 100644 --- a/src/main/java/com/todoroo/astrid/notes/CommentsController.java +++ b/src/main/java/com/todoroo/astrid/notes/CommentsController.java @@ -44,7 +44,7 @@ public class CommentsController { private final UserActivityDao userActivityDao; private final ArrayList items = new ArrayList<>(); private final Activity activity; - private Preferences preferences; + private final Preferences preferences; private int commentItems = 10; private Task task; diff --git a/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index 159ef9aa1..4ffe57829 100644 --- a/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -71,10 +71,10 @@ public class Astrid2TaskProvider extends InjectingContentProvider { private final static String TAGS_ID = "tags_id"; - private static String[] TASK_FIELD_LIST = new String[] { NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE, + private static final String[] TASK_FIELD_LIST = new String[] { NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE, IMPORTANCE, IDENTIFIER, TAGS_ID }; - private static String[] TAGS_FIELD_LIST = new String[] { ID, NAME }; + private static final String[] TAGS_FIELD_LIST = new String[] { ID, NAME }; private static final int URI_TASKS = 0; private static final int URI_TAGS = 1; diff --git a/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java index 2b6291c17..0a61fb8bc 100644 --- a/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java +++ b/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java @@ -35,7 +35,7 @@ public class SqlContentProvider extends InjectingContentProvider { // --- instance variables - private static UriMatcher uriMatcher; + private static final UriMatcher uriMatcher; static { uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java index d1d9581a9..813bb98cc 100644 --- a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java +++ b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java @@ -77,8 +77,8 @@ public final class ReminderService { private AlarmScheduler scheduler; private long now = -1; // For tracking when reminders might be scheduled all at once - private Context context; - private Preferences preferences; + private final Context context; + private final Preferences preferences; @Inject ReminderService(@ForApplication Context context, Preferences preferences, AlarmManager alarmManager) { diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java index 6202d0e52..ee0c457e0 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java @@ -169,7 +169,7 @@ public class RepeatTaskCompleteListener extends InjectingBroadcastReceiver { } } - private static Comparator weekdayCompare = (object1, object2) -> object1.wday.javaDayNum - object2.wday.javaDayNum; + private static final Comparator weekdayCompare = (object1, object2) -> object1.wday.javaDayNum - object2.wday.javaDayNum; private static WeekdayNum findNextWeekday(List byDay, DateTime date) { WeekdayNum next = byDay.get(0); diff --git a/src/main/java/com/todoroo/astrid/service/TaskCreator.java b/src/main/java/com/todoroo/astrid/service/TaskCreator.java index c889f7c90..c1356cb64 100644 --- a/src/main/java/com/todoroo/astrid/service/TaskCreator.java +++ b/src/main/java/com/todoroo/astrid/service/TaskCreator.java @@ -16,7 +16,7 @@ public class TaskCreator { private final TaskService taskService; private final GCalHelper gcalHelper; - private Preferences preferences; + private final Preferences preferences; @Inject public TaskCreator(TaskService taskService, GCalHelper gcalHelper, Preferences preferences) { diff --git a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index c4696e1ce..306c2d3a4 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -46,8 +46,8 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen private final DisplayMetrics metrics = new DisplayMetrics(); private final AstridOrderedListUpdater updater; - private DialogBuilder dialogBuilder; - private CheckBoxes checkBoxes; + private final DialogBuilder dialogBuilder; + private final CheckBoxes checkBoxes; private final TagService tagService; private final TaskListFragment fragment; private final Preferences preferences; diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java index 782abc42c..13113af04 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java @@ -11,7 +11,7 @@ import javax.inject.Inject; public class SubtasksFilterUpdater extends SubtasksUpdater { - private TaskListMetadataDao taskListMetadataDao; + private final TaskListMetadataDao taskListMetadataDao; @Inject public SubtasksFilterUpdater(TaskListMetadataDao taskListMetadataDao, TaskService taskService) { diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index d907f10f8..cf413a773 100644 --- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -55,8 +55,8 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt public static final int TAG = R.string.TEA_ctrl_hide_until_pref; - private static String EXTRA_CUSTOM = "extra_custom"; - private static String EXTRA_SELECTION = "extra_selection"; + private static final String EXTRA_CUSTOM = "extra_custom"; + private static final String EXTRA_SELECTION = "extra_selection"; private static final int SPECIFIC_DATE = -1; private static final int EXISTING_TIME_UNSET = -2; @@ -222,9 +222,9 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt * */ private class HideUntilValue { - public String label; - public int setting; - public long date; + public final String label; + public final int setting; + public final long date; public HideUntilValue(String label, int setting) { this(label, setting, 0); diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 872f33c0e..323ec059d 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -97,10 +97,10 @@ public class ReminderControlSet extends TaskEditControlFragment { private RandomReminderControlSet randomControlSet; private boolean whenDue; private boolean whenOverdue; - private List spinnerOptions = new ArrayList<>(); + private final List spinnerOptions = new ArrayList<>(); private ArrayAdapter remindAdapter; - private Set alarms = new LinkedHashSet<>(); - private Set geofences = new LinkedHashSet<>(); + private final Set alarms = new LinkedHashSet<>(); + private final Set geofences = new LinkedHashSet<>(); @OnItemSelected(R.id.reminder_alarm) void ringModeSelected(int position) { diff --git a/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java b/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java index 2b2383b76..b137445f4 100644 --- a/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -57,7 +57,7 @@ public class VoiceInputAssistant { * Use the mightier constructor to specify your own requestCode in this case for every additional use on an fragment. * If you only use one microphone-button on an fragment, you can leave it to its default, VOICE_RECOGNITION_REQUEST_CODE. */ - private Fragment fragment; + private final Fragment fragment; /** * This constructor can be called from a widget with a voice-button calling a dummy-activity. diff --git a/src/main/java/org/tasks/filters/FilterCriteriaProvider.java b/src/main/java/org/tasks/filters/FilterCriteriaProvider.java index c3e13ca26..84e9f475f 100644 --- a/src/main/java/org/tasks/filters/FilterCriteriaProvider.java +++ b/src/main/java/org/tasks/filters/FilterCriteriaProvider.java @@ -45,11 +45,11 @@ public class FilterCriteriaProvider { private static final String IDENTIFIER_TAG_IS = "tag_is"; //$NON-NLS-1$ private static final String IDENTIFIER_TAG_CONTAINS = "tag_contains"; //$NON-NLS-1$ - private Context context; - private TagService tagService; - private GtasksListService gtasksListService; - private GtasksMetadata gtasksMetadata; - private Resources r; + private final Context context; + private final TagService tagService; + private final GtasksListService gtasksListService; + private final GtasksMetadata gtasksMetadata; + private final Resources r; private final SyncAdapterHelper syncAdapterHelper; @Inject diff --git a/src/main/java/org/tasks/injection/ApplicationModule.java b/src/main/java/org/tasks/injection/ApplicationModule.java index 03cfbf457..7b6c23adb 100644 --- a/src/main/java/org/tasks/injection/ApplicationModule.java +++ b/src/main/java/org/tasks/injection/ApplicationModule.java @@ -21,7 +21,7 @@ import static org.tasks.ui.WidgetCheckBoxes.newWidgetCheckBoxes; @Module public class ApplicationModule { - private Context context; + private final Context context; public ApplicationModule(Context context) { this.context = context; diff --git a/src/main/java/org/tasks/injection/DialogFragmentModule.java b/src/main/java/org/tasks/injection/DialogFragmentModule.java index 7c2f8bf6b..ad301db28 100644 --- a/src/main/java/org/tasks/injection/DialogFragmentModule.java +++ b/src/main/java/org/tasks/injection/DialogFragmentModule.java @@ -8,7 +8,7 @@ import dagger.Provides; @Module public class DialogFragmentModule { - private DialogFragment dialogFragment; + private final DialogFragment dialogFragment; public DialogFragmentModule(DialogFragment dialogFragment) { this.dialogFragment = dialogFragment; diff --git a/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java b/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java index 8e71e7c41..d91f18ae6 100644 --- a/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java +++ b/src/main/java/org/tasks/injection/NativeDialogFragmentModule.java @@ -8,7 +8,7 @@ import dagger.Provides; @Module public class NativeDialogFragmentModule { - private DialogFragment dialogFragment; + private final DialogFragment dialogFragment; public NativeDialogFragmentModule(DialogFragment dialogFragment) { this.dialogFragment = dialogFragment; diff --git a/src/main/java/org/tasks/locale/Locale.java b/src/main/java/org/tasks/locale/Locale.java index 34f7de311..861d4ba31 100644 --- a/src/main/java/org/tasks/locale/Locale.java +++ b/src/main/java/org/tasks/locale/Locale.java @@ -23,7 +23,7 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybeanMR1; public class Locale { - private static Locale DEFAULT = new Locale(java.util.Locale.getDefault(), null, -1); + private static final Locale DEFAULT = new Locale(java.util.Locale.getDefault(), null, -1); private static Locale INSTANCE; public static Locale getInstance(Context context) { diff --git a/src/main/java/org/tasks/preferences/AppearancePreferences.java b/src/main/java/org/tasks/preferences/AppearancePreferences.java index 77e389570..fdffeb874 100644 --- a/src/main/java/org/tasks/preferences/AppearancePreferences.java +++ b/src/main/java/org/tasks/preferences/AppearancePreferences.java @@ -22,8 +22,8 @@ public class AppearancePreferences extends InjectingPreferenceActivity { private static final int REQUEST_DEFAULT_LIST = 1005; private static final String EXTRA_BUNDLE = "extra_bundle"; - public static String EXTRA_RESTART = "extra_restart"; - public static String EXTRA_FILTERS_CHANGED = "extra_filters_changed"; + public static final String EXTRA_RESTART = "extra_restart"; + public static final String EXTRA_FILTERS_CHANGED = "extra_filters_changed"; @Inject Preferences preferences; @Inject DefaultFilterProvider defaultFilterProvider; diff --git a/src/main/java/org/tasks/preferences/Device.java b/src/main/java/org/tasks/preferences/Device.java index 3b0529640..484c600cd 100644 --- a/src/main/java/org/tasks/preferences/Device.java +++ b/src/main/java/org/tasks/preferences/Device.java @@ -19,7 +19,7 @@ import static java.util.Arrays.asList; public class Device { - private Context context; + private final Context context; @Inject public Device(@ForApplication Context context) { diff --git a/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java b/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java index 7d504ac35..d263f19e4 100644 --- a/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java +++ b/src/main/java/org/tasks/preferences/FragmentPermissionRequestor.java @@ -5,7 +5,7 @@ import android.support.v4.app.Fragment; import javax.inject.Inject; public class FragmentPermissionRequestor extends PermissionRequestor { - private Fragment fragment; + private final Fragment fragment; @Inject public FragmentPermissionRequestor(Fragment fragment, PermissionChecker permissionChecker) { diff --git a/src/main/java/org/tasks/receivers/ListNotificationReceiver.java b/src/main/java/org/tasks/receivers/ListNotificationReceiver.java index 9e931c21b..5e9934156 100644 --- a/src/main/java/org/tasks/receivers/ListNotificationReceiver.java +++ b/src/main/java/org/tasks/receivers/ListNotificationReceiver.java @@ -18,7 +18,7 @@ import timber.log.Timber; public class ListNotificationReceiver extends InjectingBroadcastReceiver { - private static ExecutorService executorService = Executors.newSingleThreadExecutor(); + private static final ExecutorService executorService = Executors.newSingleThreadExecutor(); private static final String EXTRA_FILTER_TITLE = "extra_filter_title"; private static final String EXTRA_FILTER_QUERY = "extra_filter_query"; diff --git a/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java b/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java index a698e4a66..8ae8e0f08 100644 --- a/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java +++ b/src/main/java/org/tasks/receivers/RepeatConfirmationReceiver.java @@ -33,7 +33,7 @@ public class RepeatConfirmationReceiver extends BroadcastReceiver { private final TaskService taskService; private final Activity activity; - private Tracker tracker; + private final Tracker tracker; @Inject public RepeatConfirmationReceiver(TaskService taskService, Activity activity, Tracker tracker) { diff --git a/src/main/java/org/tasks/receivers/TaskNotificationReceiver.java b/src/main/java/org/tasks/receivers/TaskNotificationReceiver.java index 0d391dfbf..7ad1e679b 100644 --- a/src/main/java/org/tasks/receivers/TaskNotificationReceiver.java +++ b/src/main/java/org/tasks/receivers/TaskNotificationReceiver.java @@ -14,7 +14,7 @@ import javax.inject.Inject; public class TaskNotificationReceiver extends InjectingBroadcastReceiver { - private static ExecutorService executorService = Executors.newSingleThreadExecutor(); + private static final ExecutorService executorService = Executors.newSingleThreadExecutor(); public static final String ID_KEY = "id"; //$NON-NLS-1$ public static final String EXTRAS_TYPE = "type"; //$NON-NLS-1$ diff --git a/src/main/java/org/tasks/reminders/SnoozeDialog.java b/src/main/java/org/tasks/reminders/SnoozeDialog.java index e6282f8f9..6af095035 100644 --- a/src/main/java/org/tasks/reminders/SnoozeDialog.java +++ b/src/main/java/org/tasks/reminders/SnoozeDialog.java @@ -29,7 +29,7 @@ public class SnoozeDialog extends InjectingDialogFragment { private SnoozeCallback snoozeCallback; private DialogInterface.OnCancelListener onCancelListener; - private List items = new ArrayList<>(); + private final List items = new ArrayList<>(); @NonNull @Override diff --git a/src/main/java/org/tasks/scheduling/BackgroundScheduler.java b/src/main/java/org/tasks/scheduling/BackgroundScheduler.java index 987a0c383..7d7cee9c1 100644 --- a/src/main/java/org/tasks/scheduling/BackgroundScheduler.java +++ b/src/main/java/org/tasks/scheduling/BackgroundScheduler.java @@ -8,7 +8,7 @@ import org.tasks.injection.ForApplication; import javax.inject.Inject; public class BackgroundScheduler { - private Context context; + private final Context context; @Inject public BackgroundScheduler(@ForApplication Context context) { diff --git a/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java b/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java index 266df4e15..160d1a690 100644 --- a/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java +++ b/src/main/java/org/tasks/sync/RecordSyncStatusCallback.java @@ -7,8 +7,8 @@ import org.tasks.Broadcaster; public class RecordSyncStatusCallback implements SyncResultCallback { - private GtasksPreferenceService gtasksPreferenceService; - private Broadcaster broadcaster; + private final GtasksPreferenceService gtasksPreferenceService; + private final Broadcaster broadcaster; public RecordSyncStatusCallback(GtasksPreferenceService gtasksPreferenceService, Broadcaster broadcaster) { this.gtasksPreferenceService = gtasksPreferenceService; diff --git a/src/main/java/org/tasks/time/FixedMillisProvider.java b/src/main/java/org/tasks/time/FixedMillisProvider.java index c553e5172..3f955181c 100644 --- a/src/main/java/org/tasks/time/FixedMillisProvider.java +++ b/src/main/java/org/tasks/time/FixedMillisProvider.java @@ -2,7 +2,7 @@ package org.tasks.time; public class FixedMillisProvider implements MillisProvider { - private long millis; + private final long millis; public FixedMillisProvider(long millis) { this.millis = millis; diff --git a/src/main/java/org/tasks/ui/CheckBoxes.java b/src/main/java/org/tasks/ui/CheckBoxes.java index 830ac16f7..f5a41dff0 100644 --- a/src/main/java/org/tasks/ui/CheckBoxes.java +++ b/src/main/java/org/tasks/ui/CheckBoxes.java @@ -22,11 +22,11 @@ public class CheckBoxes { private static final int MAX_IMPORTANCE_INDEX = 3; - private List checkboxes; - private List repeatingCheckboxes; - private List completedCheckboxes; - private List priorityColors; - private int[] priorityColorsArray; + private final List checkboxes; + private final List repeatingCheckboxes; + private final List completedCheckboxes; + private final List priorityColors; + private final int[] priorityColorsArray; private CheckBoxes(Context context) { checkboxes = wrapDrawable(context, R.drawable.ic_check_box_outline_blank_24dp); diff --git a/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java b/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java index 1b9a7aded..8714cc313 100644 --- a/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java +++ b/src/main/java/org/tasks/ui/HiddenTopArrayAdapter.java @@ -14,7 +14,7 @@ import java.util.List; public class HiddenTopArrayAdapter extends ArrayAdapter { - private List hints; + private final List hints; public HiddenTopArrayAdapter(Context context, int resources, List objects) { this(context, resources, objects, new ArrayList<>()); diff --git a/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java b/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java index 3ff76f03e..277b3cca9 100644 --- a/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java +++ b/src/main/java/org/tasks/ui/ProgressDialogAsyncTask.java @@ -13,8 +13,8 @@ import timber.log.Timber; public abstract class ProgressDialogAsyncTask extends AsyncTask { private ProgressDialog progressDialog; - private Activity activity; - private DialogBuilder dialogBuilder; + private final Activity activity; + private final DialogBuilder dialogBuilder; public ProgressDialogAsyncTask(Activity activity, DialogBuilder dialogBuilder) { this.activity = activity; diff --git a/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java b/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java index c1d3b47df..76a192864 100644 --- a/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java +++ b/src/main/java/org/tasks/ui/ScrimInsetsFrameLayout.java @@ -35,7 +35,7 @@ public class ScrimInsetsFrameLayout extends FrameLayout { private Drawable mInsetForeground; private Rect mInsets; - private Rect mTempRect = new Rect(); + private final Rect mTempRect = new Rect(); private OnInsetsCallback mOnInsetsCallback; public ScrimInsetsFrameLayout(Context context) { diff --git a/src/main/java/org/tasks/ui/TimePreference.java b/src/main/java/org/tasks/ui/TimePreference.java index bd0f8325a..b82b33269 100644 --- a/src/main/java/org/tasks/ui/TimePreference.java +++ b/src/main/java/org/tasks/ui/TimePreference.java @@ -15,7 +15,7 @@ import org.tasks.time.DateTime; public class TimePreference extends Preference { private int millisOfDay; - private String summary; + private final String summary; public TimePreference(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/src/main/java/org/tasks/ui/WidgetCheckBoxes.java b/src/main/java/org/tasks/ui/WidgetCheckBoxes.java index b8a100fae..7468d4fff 100644 --- a/src/main/java/org/tasks/ui/WidgetCheckBoxes.java +++ b/src/main/java/org/tasks/ui/WidgetCheckBoxes.java @@ -18,9 +18,9 @@ public class WidgetCheckBoxes { return new WidgetCheckBoxes(checkBoxes); } - private List checkboxes; - private List repeatingCheckboxes; - private List completedCheckboxes; + private final List checkboxes; + private final List repeatingCheckboxes; + private final List completedCheckboxes; private WidgetCheckBoxes(CheckBoxes checkBoxes) { Timber.d("Initializing widget checkboxes"); diff --git a/src/main/java/org/tasks/widget/TasksWidget.java b/src/main/java/org/tasks/widget/TasksWidget.java index 8c79d69b9..a6231c682 100644 --- a/src/main/java/org/tasks/widget/TasksWidget.java +++ b/src/main/java/org/tasks/widget/TasksWidget.java @@ -39,7 +39,7 @@ import static org.tasks.intents.TaskIntents.getEditTaskIntent; public class TasksWidget extends InjectingAppWidgetProvider { - private static int flags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP; + private static final int flags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP; @Inject Broadcaster broadcaster; @Inject Preferences preferences;