Addressing inspections

6 years ago · 351604f4a5
parent baa46d89a2
commit 351604f4a5
104 changed files with 247 additions and 309 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <list size="3">
+      <item index="0" class="java.lang.String" itemvalue="butterknife.*" />
+      <item index="1" class="java.lang.String" itemvalue="dagger.Provides" />
+      <item index="2" class="java.lang.String" itemvalue="javax.inject.Inject" />
+    </list>
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/app/build.gradle
+++ b/app/build.gradle
@ -107,7 +107,7 @@ configurations {

 final DAGGER_VERSION = '2.9'
 final BUTTERKNIFE_VERSION = '8.8.1'
-final GPS_VERSION = '12.0.0'
+final GPS_VERSION = '12.0.1'
 final SUPPORT_VERSION = '27.1.0'
 final ROOM_VERSION = '1.1.0-beta1'
 final STETHO_VERSION = '1.5.0'
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@ -26,8 +26,6 @@
            </intent-filter>
        </receiver>

-        <service android:name="com.google.android.gms.analytics.CampaignTrackingService" />
-
    </application>

 </manifest>
--- a/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java
+++ b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java
@ -88,7 +88,7 @@ public class TranslationTests {
   * translations in the default text
   */
  @Test
-  public void testFormatStringsMatch() throws Exception {
+  public void testFormatStringsMatch() {
    final Resources resources = getTargetContext().getResources();
    final int[] strings = getResourceIds(R.string.class);
    final FormatStringData[] formatStrings = new FormatStringData[strings.length];
@ -149,7 +149,7 @@ public class TranslationTests {
   * Test dollar sign resources
   */
  @Test
-  public void testSpecialStringsMatch() throws Exception {
+  public void testSpecialStringsMatch() {
    final StringBuilder failures = new StringBuilder();

    forEachLocale(r -> {
@ -211,12 +211,12 @@ public class TranslationTests {
    /**
     * format characters
     */
-    public final char[] characters;
+    final char[] characters;

    /**
     * the original string
     */
-    public final String string;
+    final String string;

    public FormatStringData(String string) {
      this.string = string;
@ -243,7 +243,7 @@ public class TranslationTests {
    /**
     * test that the characters match
     */
-    public boolean matches(FormatStringData other) {
+    boolean matches(FormatStringData other) {
      if (characters.length != other.characters.length) {
        return false;
      }
--- a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java
@ -52,7 +52,7 @@ public class TitleParserTest extends InjectingTestCase {
   * repeat, no lists
   */
  @Test
-  public void testNoRegexes() throws Exception {
+  public void testNoRegexes() {
    Task task = taskCreator.basicQuickAddTask("Jog");
    Task nothing = new Task();
    assertFalse(task.hasDueTime());
@ -230,7 +230,7 @@ public class TitleParserTest extends InjectingTestCase {
   * tests all words using priority 0
   */
  @Test
-  public void testPriority0() throws Exception {
+  public void testPriority0() {
    String[] acceptedStrings = {
        "priority 0",
        "least priority",
@ -250,7 +250,7 @@ public class TitleParserTest extends InjectingTestCase {
  }

  @Test
-  public void testPriority1() throws Exception {
+  public void testPriority1() {
    String[] acceptedStringsAtEnd = {
        "priority 1",
        "low priority",
@ -284,7 +284,7 @@ public class TitleParserTest extends InjectingTestCase {
  }

  @Test
-  public void testPriority2() throws Exception {
+  public void testPriority2() {
    String[] acceptedStringsAtEnd = {
        "priority 2",
        "high priority",
@ -316,7 +316,7 @@ public class TitleParserTest extends InjectingTestCase {
  }

  @Test
-  public void testPriority3() throws Exception {
+  public void testPriority3() {
    String[] acceptedStringsAtEnd = {
        "priority 3",
        "highest priority",
@ -358,7 +358,7 @@ public class TitleParserTest extends InjectingTestCase {
   * test daily repeat from due date, but with no due date set
   */
  @Test
-  public void testDailyWithNoDueDate() throws Exception {
+  public void testDailyWithNoDueDate() {
    String title = "Jog daily";
    Task task = taskCreator.createWithValues(null, title);
    RRule rrule = new RRule();
@ -389,7 +389,7 @@ public class TitleParserTest extends InjectingTestCase {
   * test weekly repeat from due date, with no due date & time set
   */
  @Test
-  public void testWeeklyWithNoDueDate() throws Exception {
+  public void testWeeklyWithNoDueDate() {
    String title = "Jog weekly";
    Task task = taskCreator.createWithValues(null, title);
    RRule rrule = new RRule();
@ -419,7 +419,7 @@ public class TitleParserTest extends InjectingTestCase {
   * test hourly repeat from due date, with no due date but no time
   */
  @Test
-  public void testMonthlyFromNoDueDate() throws Exception {
+  public void testMonthlyFromNoDueDate() {
    String title = "Jog monthly";
    Task task = taskCreator.createWithValues(null, title);
    RRule rrule = new RRule();
@ -446,7 +446,7 @@ public class TitleParserTest extends InjectingTestCase {
  }

  @Test
-  public void testDailyFromDueDate() throws Exception {
+  public void testDailyFromDueDate() {
    String title = "Jog daily starting from today";
    Task task = taskCreator.createWithValues(null, title);
    RRule rrule = new RRule();
@ -470,7 +470,7 @@ public class TitleParserTest extends InjectingTestCase {
  }

  @Test
-  public void testWeeklyFromDueDate() throws Exception {
+  public void testWeeklyFromDueDate() {
    String title = "Jog weekly starting from today";
    Task task = taskCreator.createWithValues(null, title);
    RRule rrule = new RRule();
@ -501,7 +501,7 @@ public class TitleParserTest extends InjectingTestCase {
   * tests all words using priority 0
   */
  @Test
-  public void testTagsPound() throws Exception {
+  public void testTagsPound() {
    String[] acceptedStrings = {
        "#tag",
        "#a",
@ -525,7 +525,7 @@ public class TitleParserTest extends InjectingTestCase {
   * tests all words using priority 0
   */
  @Test
-  public void testTagsAt() throws Exception {
+  public void testTagsAt() {
    String[] acceptedStrings = {
        "@tag",
        "@a",
--- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
@ -15,7 +15,7 @@ import org.tasks.injection.TestComponent;
 public class SubtasksHelperTest extends SubtasksTestCase {

  private static final String[] EXPECTED_ORDER = {"-1", "1", "2", "3", "4", "5", "6"};
-  private static String EXPECTED_REMOTE = "[\"-1\", [\"6\", \"4\", [\"3\", \"1\"]], \"2\", \"5\"]"
+  private static final String EXPECTED_REMOTE = "[\"-1\", [\"6\", \"4\", [\"3\", \"1\"]], \"2\", \"5\"]"
      .replaceAll("\\s", "");
  @Inject TaskDao taskDao;

--- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
@ -31,10 +31,10 @@ public class SubtasksTestCase extends InjectingTestCase {
   * E
   * F
   */
-  public static final String DEFAULT_SERIALIZED_TREE = "[-1, [1, 2, [3, 4]], 5, 6]"
+  static final String DEFAULT_SERIALIZED_TREE = "[-1, [1, 2, [3, 4]], 5, 6]"
      .replaceAll("\\s", "");
-  protected SubtasksFilterUpdater updater;
-  protected Filter filter;
+  SubtasksFilterUpdater updater;
+  Filter filter;
  @Inject TaskListMetadataDao taskListMetadataDao;
  @Inject TaskDao taskDao;
  @Inject Preferences preferences;
@ -52,7 +52,7 @@ public class SubtasksTestCase extends InjectingTestCase {
    component.inject(this);
  }

-  protected void expectParentAndPosition(Task task, Task parent, int positionInParent) {
+  void expectParentAndPosition(Task task, Task parent, int positionInParent) {
    String parentId = (parent == null ? "-1" : parent.getUuid());
    Node n = updater.findNodeForTask(task.getUuid());
    assertNotNull("No node found for task " + task.getTitle(), n);
--- a/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
@ -10,12 +10,12 @@ import org.tasks.injection.TestComponent;

 public class NewSyncTestCase extends InjectingTestCase {

-  public static final String SYNC_TASK_TITLE = "new title";
-  public static final int SYNC_TASK_IMPORTANCE = Task.IMPORTANCE_MUST_DO;
+  private static final String SYNC_TASK_TITLE = "new title";
+  private static final int SYNC_TASK_IMPORTANCE = Task.IMPORTANCE_MUST_DO;
  @Inject TaskDao taskDao;
  @Inject TagDataDao tagDataDao;

-  protected Task createTask(String title) {
+  private Task createTask(String title) {
    Task task = new Task();
    task.setTitle(title);
    task.setImportance(SYNC_TASK_IMPORTANCE);
@ -24,11 +24,11 @@ public class NewSyncTestCase extends InjectingTestCase {
    return task;
  }

-  protected Task createTask() {
+  Task createTask() {
    return createTask(SYNC_TASK_TITLE);
  }

-  protected TagData createTagData(String name) {
+  private TagData createTagData(String name) {
    TagData tag = new TagData();
    tag.setName(name);

@ -36,7 +36,7 @@ public class NewSyncTestCase extends InjectingTestCase {
    return tag;
  }

-  protected TagData createTagData() {
+  TagData createTagData() {
    return createTagData("new tag");
  }

--- a/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java
+++ b/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java
@ -7,7 +7,7 @@ import org.junit.Before;

 public abstract class InjectingTestCase {

-  protected TestComponent component;
+  private TestComponent component;

  @Before
  public void setUp() {
--- a/app/src/androidTest/java/org/tasks/injection/TestModule.java
+++ b/app/src/androidTest/java/org/tasks/injection/TestModule.java
@ -24,7 +24,7 @@ import org.tasks.preferences.PermissivePermissionChecker;
@Module
 public class TestModule {

-  private Context context;
+  private final Context context;

  public TestModule(Context context) {
    this.context = context;
--- a/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java
+++ b/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java
@ -37,7 +37,7 @@ public class BackupServiceTests extends InjectingTestCase {

  private static final long BACKUP_WAIT_TIME = 500L;

-  File temporaryDirectory = null;
+  private File temporaryDirectory = null;

  @Inject TasksJsonExporter xmlExporter;
  @Inject TaskDao taskDao;
--- a/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.java
+++ b/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.java
@ -11,11 +11,11 @@ import org.tasks.data.GoogleTaskList;
 public class GtaskListMaker {

  public static final Property<GoogleTaskList, Long> ID = newProperty();
-  public static final Property<GoogleTaskList, Integer> ORDER = newProperty();
+  private static final Property<GoogleTaskList, Integer> ORDER = newProperty();
  public static final Property<GoogleTaskList, String> REMOTE_ID = newProperty();
  public static final Property<GoogleTaskList, Long> LAST_SYNC = newProperty();
  public static final Property<GoogleTaskList, String> NAME = newProperty();
-  public static final Property<GoogleTaskList, Integer> COLOR = newProperty();
+  private static final Property<GoogleTaskList, Integer> COLOR = newProperty();
  private static final Instantiator<GoogleTaskList> instantiator = lookup -> new GoogleTaskList() {{
    setDeleted(0L);
    setId(lookup.valueOf(GtaskListMaker.ID, 0L));
--- a/app/src/androidTest/java/org/tasks/makers/Maker.java
+++ b/app/src/androidTest/java/org/tasks/makers/Maker.java
@ -5,7 +5,7 @@ import static com.natpryce.makeiteasy.MakeItEasy.a;
 import com.natpryce.makeiteasy.Instantiator;
 import com.natpryce.makeiteasy.PropertyValue;

-public class Maker {
+class Maker {

  @SuppressWarnings("unchecked")
  public static <T> T make(Instantiator<T> instantiator,
--- a/app/src/androidTest/java/org/tasks/makers/TaskMaker.java
+++ b/app/src/androidTest/java/org/tasks/makers/TaskMaker.java
@ -14,21 +14,21 @@ import org.tasks.time.DateTime;

 public class TaskMaker {

-  public static Property<Task, Long> ID = newProperty();
-  public static Property<Task, String> TITLE = newProperty();
-  public static Property<Task, DateTime> DUE_DATE = newProperty();
-  public static Property<Task, DateTime> DUE_TIME = newProperty();
-  public static Property<Task, Integer> PRIORITY = newProperty();
-  public static Property<Task, DateTime> REMINDER_LAST = newProperty();
-  public static Property<Task, Long> RANDOM_REMINDER_PERIOD = newProperty();
-  public static Property<Task, Integer> HIDE_TYPE = newProperty();
-  public static Property<Task, Integer> REMINDERS = newProperty();
-  public static Property<Task, DateTime> CREATION_TIME = newProperty();
-  public static Property<Task, DateTime> COMPLETION_TIME = newProperty();
-  public static Property<Task, DateTime> DELETION_TIME = newProperty();
-  public static Property<Task, DateTime> SNOOZE_TIME = newProperty();
-  public static Property<Task, RRule> RRULE = newProperty();
-  public static Property<Task, Boolean> AFTER_COMPLETE = newProperty();
+  public static final Property<Task, Long> ID = newProperty();
+  private static final Property<Task, String> TITLE = newProperty();
+  public static final Property<Task, DateTime> DUE_DATE = newProperty();
+  public static final Property<Task, DateTime> DUE_TIME = newProperty();
+  private static final Property<Task, Integer> PRIORITY = newProperty();
+  public static final Property<Task, DateTime> REMINDER_LAST = newProperty();
+  public static final Property<Task, Long> RANDOM_REMINDER_PERIOD = newProperty();
+  public static final Property<Task, Integer> HIDE_TYPE = newProperty();
+  public static final Property<Task, Integer> REMINDERS = newProperty();
+  public static final Property<Task, DateTime> CREATION_TIME = newProperty();
+  public static final Property<Task, DateTime> COMPLETION_TIME = newProperty();
+  public static final Property<Task, DateTime> DELETION_TIME = newProperty();
+  public static final Property<Task, DateTime> SNOOZE_TIME = newProperty();
+  public static final Property<Task, RRule> RRULE = newProperty();
+  public static final Property<Task, Boolean> AFTER_COMPLETE = newProperty();
  private static final Instantiator<Task> instantiator = lookup -> {
    Task task = new Task();

--- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java
+++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java
@ -120,8 +120,8 @@ public class GtasksListServiceTest extends InjectingTestCase {
    setLists(taskList);

    assertEquals(
-        asList(newGtaskList(with(ID, 1L), with(REMOTE_ID, "1"), with(LAST_SYNC, 0L))),
-        gtasksListService.getListsToUpdate(asList(taskList)));
+        singletonList(newGtaskList(with(ID, 1L), with(REMOTE_ID, "1"), with(LAST_SYNC, 0L))),
+        gtasksListService.getListsToUpdate(singletonList(taskList)));
  }

  private void setLists(TaskList... list) {
--- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
+++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
@ -156,7 +156,7 @@ public class GtasksTaskListUpdaterTest extends InjectingTestCase {
    createParentSiblingMaps();
  }

-  void createParentSiblingMaps() {
+  private void createParentSiblingMaps() {
    for (GoogleTaskList list : gtasksListService.getLists()) {
      gtasksTaskListUpdater.updateParentSiblingMapsFor(list);
    }
--- a/app/src/debug/java/org/tasks/BaseApplication.java
+++ b/app/src/debug/java/org/tasks/BaseApplication.java
@ -2,6 +2,6 @@ package org.tasks;

 import android.support.multidex.MultiDexApplication;

-public class BaseApplication extends MultiDexApplication {
+public abstract class BaseApplication extends MultiDexApplication {

 }
--- a/app/src/googleplay/AndroidManifest.xml
+++ b/app/src/googleplay/AndroidManifest.xml
@ -71,8 +71,6 @@
            </intent-filter>
        </receiver>

-        <service android:name="com.google.android.gms.analytics.CampaignTrackingService" />
-
        <!-- SyncService for Google Tasks -->

        <service
--- a/app/src/googleplay/java/org/tasks/billing/PurchaseHelper.java
+++ b/app/src/googleplay/java/org/tasks/billing/PurchaseHelper.java
@ -30,7 +30,7 @@ public class PurchaseHelper implements IabHelper.OnIabSetupFinishedListener {
  private final Tracker tracker;
  private final InventoryHelper inventory;
  private final Executor executor;
-  private LocalBroadcastManager localBroadcastManager;
+  private final LocalBroadcastManager localBroadcastManager;

  private PurchaseHelperCallback activityResultCallback;
  private IabHelper iabHelper;
--- a/app/src/main/java/com/todoroo/andlib/data/Property.java
+++ b/app/src/main/java/com/todoroo/andlib/data/Property.java
@ -26,7 +26,7 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
  /**
   * The database table name this property
   */
-  public final Table table;
+  private final Table table;

  /**
   * The database column name for this property
@ -84,15 +84,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
    }
  }

-  // --- children
-
-  public String getColumnName() {
-    if (hasAlias()) {
-      return alias;
-    }
-    return name;
-  }
-
  /**
   * Integer property type. See {@link Property}
   *
--- a/app/src/main/java/com/todoroo/andlib/data/Table.java
+++ b/app/src/main/java/com/todoroo/andlib/data/Table.java
@ -16,7 +16,7 @@ import com.todoroo.andlib.sql.SqlTable;
 */
 public final class Table extends SqlTable {

-  public final String name;
+  private final String name;

  public Table(String name) {
    this(name, null);
--- a/app/src/main/java/com/todoroo/andlib/sql/Query.java
+++ b/app/src/main/java/com/todoroo/andlib/sql/Query.java
@ -9,14 +9,11 @@ package com.todoroo.andlib.sql;
 import static com.todoroo.andlib.sql.SqlConstants.ALL;
 import static com.todoroo.andlib.sql.SqlConstants.COMMA;
 import static com.todoroo.andlib.sql.SqlConstants.FROM;
-import static com.todoroo.andlib.sql.SqlConstants.LIMIT;
-import static com.todoroo.andlib.sql.SqlConstants.ORDER_BY;
 import static com.todoroo.andlib.sql.SqlConstants.SELECT;
 import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import static com.todoroo.andlib.sql.SqlConstants.WHERE;
 import static java.util.Arrays.asList;

-import com.todoroo.astrid.data.Task;
 import java.util.ArrayList;

 public final class Query {
@ -24,19 +21,13 @@ public final class Query {
  private final ArrayList<Criterion> criterions = new ArrayList<>();
  private final ArrayList<Field> fields = new ArrayList<>();
  private final ArrayList<Join> joins = new ArrayList<>();
-  private final ArrayList<Order> orders = new ArrayList<>();
  private SqlTable table;
  private String queryTemplate = null;
-  private int limits = -1;

  private Query(Field... fields) {
    this.fields.addAll(asList(fields));
  }

-  public static Query select() {
-    return new Query(Task.PROPERTIES);
-  }
-
  public static Query select(Field... fields) {
    return new Query(fields);
  }
@ -56,16 +47,6 @@ public final class Query {
    return this;
  }

-  public Query orderBy(Order... order) {
-    orders.addAll(asList(order));
-    return this;
-  }
-
-  public Query limit(int limit) {
-    limits = limit;
-    return this;
-  }
-
  @Override
  public boolean equals(Object o) {
    return this == o || !(o == null || getClass() != o.getClass()) && this.toString()
@ -86,29 +67,13 @@ public final class Query {
    visitJoinClause(sql);
    if (queryTemplate == null) {
      visitWhereClause(sql);
-      visitOrderByClause(sql);
-      visitLimitClause(sql);
    } else {
-      if (orders.size() > 0) {
-        throw new IllegalStateException("Can't have extras AND query template"); //$NON-NLS-1$
-      }
      sql.append(queryTemplate);
    }

    return sql.toString();
  }

-  private void visitOrderByClause(StringBuilder sql) {
-    if (orders.isEmpty()) {
-      return;
-    }
-    sql.append(ORDER_BY);
-    for (Order order : orders) {
-      sql.append(SPACE).append(order).append(COMMA);
-    }
-    sql.deleteCharAt(sql.length() - 1).append(SPACE);
-  }
-
  private void visitWhereClause(StringBuilder sql) {
    if (criterions.isEmpty()) {
      return;
@ -144,12 +109,6 @@ public final class Query {
    sql.deleteCharAt(sql.length() - 1).append(SPACE);
  }

-  private void visitLimitClause(StringBuilder sql) {
-    if (limits > -1) {
-      sql.append(LIMIT).append(SPACE).append(limits).append(SPACE);
-    }
-  }
-
  /**
   * Add the SQL query template (comes after the "from")
   *
--- a/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java
+++ b/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java
@ -6,7 +6,7 @@

 package com.todoroo.andlib.sql;

-public final class SqlConstants {
+final class SqlConstants {

  public static final String SELECT = "SELECT";
  public static final String SPACE = " ";
--- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
@ -277,7 +277,7 @@ public class AndroidUtilities {
    return extension;
  }

-  public interface SerializedPut<T> {
+  interface SerializedPut<T> {

    void put(T object, String key, char type, String value) throws NumberFormatException;
  }
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@ -78,7 +78,7 @@ import org.tasks.ui.TaskListViewModel;
 public class TaskListFragment extends InjectingFragment implements
    SwipeRefreshLayout.OnRefreshListener, Toolbar.OnMenuItemClickListener {

-  public static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
+  private static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
  public static final String TAGS_METADATA_JOIN = "for_tags"; //$NON-NLS-1$
  public static final String FILE_METADATA_JOIN = "for_actions"; //$NON-NLS-1$
  private static final String EXTRA_FILTER = "extra_filter";
@ -429,7 +429,7 @@ public class TaskListFragment extends InjectingFragment implements
    taskAdapter.setHelper(recyclerAdapter.getHelper());
  }

-  public Property<?>[] taskProperties() {
+  protected Property<?>[] taskProperties() {
    return TaskAdapter.PROPERTIES;
  }

--- a/app/src/main/java/com/todoroo/astrid/adapter/CheckableRelativeLayout.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/CheckableRelativeLayout.java
@ -15,10 +15,12 @@ public class CheckableRelativeLayout extends RelativeLayout implements Checkable
    super(context, attrs);
  }

+  @Override
  public boolean isChecked() {
    return checked;
  }

+  @Override
  public void setChecked(boolean b) {
    if (b != checked) {
      checked = b;
@ -26,6 +28,7 @@ public class CheckableRelativeLayout extends RelativeLayout implements Checkable
    }
  }

+  @Override
  public void toggle() {
    setChecked(!checked);
  }
--- a/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@ -374,13 +374,13 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
   * ================================================================ views
   * ====================================================================== */

-  public static class ViewHolder {
+  static class ViewHolder {

-    public FilterListItem item;
-    public CheckedTextView name;
-    public ImageView icon;
-    public TextView size;
-    public View view;
+    FilterListItem item;
+    CheckedTextView name;
+    ImageView icon;
+    TextView size;
+    View view;
  }

  public class FilterListUpdateReceiver extends BroadcastReceiver {
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
@ -40,7 +40,7 @@ public class TaskAdapter {
          FILE_ID_PROPERTY // File id
      }, Property.class);
  private AsyncPagedListDiffer<Task> helper;
-  private Set<Long> selected = new HashSet<>();
+  private final Set<Long> selected = new HashSet<>();
  private OnCompletedTaskListener onCompletedTaskListener = null;

  public int getCount() {
--- a/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
@ -23,8 +23,6 @@ public class AstridApiConstants {
   */
  public static final String EXTRAS_TASK_ID = "task_id";

-  public static final String EXTRAS_TASK = "task";
-  public static final String EXTRAS_ORIGINAL = "original";
  /**
   * Extras name for old task due date
   */
--- a/app/src/main/java/com/todoroo/astrid/api/Filter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/Filter.java
@ -99,7 +99,7 @@ public class Filter extends FilterListItem {
   * @param listingTitle Title of this item as displayed on the lists page, e.g. Inbox
   * @param sqlQuery SQL query for this list (see {@link #sqlQuery} for examples).
   */
-  protected Filter(String listingTitle, String sqlQuery, Map<String, Object> valuesForNewTasks) {
+  Filter(String listingTitle, String sqlQuery, Map<String, Object> valuesForNewTasks) {
    this.listingTitle = listingTitle;
    this.sqlQuery = sqlQuery;
    this.filterOverride = null;
--- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java
@ -99,10 +99,6 @@ public class GtasksFilter extends Filter {
    list = source.readParcelable(getClass().getClassLoader());
  }

-  public GoogleTaskList getList() {
-    return list;
-  }
-
  public String getRemoteId() {
    return list.getRemoteId();
  }
--- a/app/src/main/java/com/todoroo/astrid/api/PermaSql.java
+++ b/app/src/main/java/com/todoroo/astrid/api/PermaSql.java
@ -25,7 +25,7 @@ public final class PermaSql {
  /**
   * value to be replaced with the current time as long
   */
-  public static final String VALUE_NOW = "NOW()"; //$NON-NLS-1$
+  private static final String VALUE_NOW = "NOW()"; //$NON-NLS-1$

  /**
   * value to be replaced by end of day as long
--- a/app/src/main/java/com/todoroo/astrid/api/TaskAction.java
+++ b/app/src/main/java/com/todoroo/astrid/api/TaskAction.java
@ -18,12 +18,12 @@ public class TaskAction {
  /**
   * Intent to call when invoking this operation
   */
-  public PendingIntent intent = null;
+  public PendingIntent intent;

  /**
   * Quick action icon
   */
-  public int icon = 0;
+  public int icon;

  /**
   * Create an EditOperation object
--- a/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java
+++ b/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java
@ -22,11 +22,6 @@ public class BackupConstants {
   */
  public static final String ASTRID_TAG = "astrid";

-  /**
-   * Attribute indicating application version
-   */
-  public static final String ASTRID_ATTR_VERSION = "version";
-
  /**
   * Attribute indicating backup file format
   */
--- a/app/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
+++ b/app/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
@ -188,7 +188,7 @@ public class PhoneStateChangedReceiver extends InjectingBroadcastReceiver {
    return -1;
  }

-  public void triggerMissedCallNotification(final String name, final String number,
+  private void triggerMissedCallNotification(final String name, final String number,
      long contactId) {
    final String title = context
        .getString(R.string.missed_call, TextUtils.isEmpty(name) ? number : name);
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@ -409,7 +409,9 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
    /**
     * statistics for filter count
     */
-    public int start, end, max;
+    int start;
+    public int end;
+    int max;

    public String getTitleFromCriterion() {
      if (criterion instanceof MultipleSelectCriterion) {
@ -428,7 +430,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity imple
      throw new UnsupportedOperationException("Unknown criterion type"); //$NON-NLS-1$
    }

-    public String getValueFromCriterion() {
+    String getValueFromCriterion() {
      if (type == TYPE_UNIVERSE) {
        return null;
      }
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
@ -191,10 +191,10 @@ class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {

  private class ViewHolder {

-    public CriterionInstance item;
-    public ImageView type;
-    public TextView name;
-    public TextView filterCount;
+    CriterionInstance item;
+    ImageView type;
+    TextView name;
+    TextView filterCount;
  }


--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
@ -22,7 +22,7 @@ import org.tasks.data.FilterDao;
 public final class CustomFilterExposer {

  private static final int filter = R.drawable.ic_filter_list_24dp;
-  private FilterDao filterDao;
+  private final FilterDao filterDao;

  @Inject
  public CustomFilterExposer(FilterDao filterDao) {
--- a/app/src/main/java/com/todoroo/astrid/dao/Database.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/Database.java
@ -145,6 +145,7 @@ public abstract class Database extends RoomDatabase {
  /**
   * Close the database if it has been opened previously
   */
+  @Override
  public synchronized final void close() {
    if (database != null) {
      try {
@ -159,7 +160,7 @@ public abstract class Database extends RoomDatabase {
  /**
   * @return sql database. opens database if not yet open
   */
-  public synchronized final SupportSQLiteDatabase getDatabase() {
+  private synchronized SupportSQLiteDatabase getDatabase() {
    if (database == null) {
      openForWriting();
    }
--- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@ -235,7 +235,7 @@ public class FilesControlSet extends TaskEditControlFragment {
    addAttachment(attachment);
  }

-  public interface PlaybackExceptionHandler {
+  interface PlaybackExceptionHandler {

    void playbackFailed();
  }
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@ -396,7 +396,7 @@ public class GtasksTaskListUpdater {

    public final long taskId;
    final ArrayList<Node> children = new ArrayList<>();
-    public Node parent;
+    Node parent;

    Node(long taskId, Node parent) {
      this.taskId = taskId;
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@ -60,12 +60,6 @@ public class GtasksInvoker {
        .setPageToken(pageToken));
  }

-  public TaskList getGtaskList(String id) throws IOException {
-    return execute(service
-        .tasklists()
-        .get(id));
-  }
-
  public com.google.api.services.tasks.model.Tasks getAllGtasksFromListId(String listId,
      boolean includeDeleted, boolean includeHidden, long lastSyncDate, String pageToken)
      throws IOException {
--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@ -150,7 +150,7 @@ public class GtasksSyncService {
    return sibling.get();
  }

-  public interface SyncOnSaveOperation {
+  interface SyncOnSaveOperation {

    void op(GtasksInvoker invoker) throws IOException;
  }
@ -159,7 +159,7 @@ public class GtasksSyncService {

    final GoogleTask googleTask;

-    public MoveOp(GoogleTask googleTask) {
+    MoveOp(GoogleTask googleTask) {
      this.googleTask = googleTask;
    }

@ -173,7 +173,7 @@ public class GtasksSyncService {

    private final String listId;

-    public ClearOp(String listId) {
+    ClearOp(String listId) {
      this.listId = listId;
    }

@ -187,7 +187,7 @@ public class GtasksSyncService {

    private final LinkedBlockingQueue<SyncOnSaveOperation> queue;

-    public OperationPushThread(LinkedBlockingQueue<SyncOnSaveOperation> queue) {
+    OperationPushThread(LinkedBlockingQueue<SyncOnSaveOperation> queue) {
      this.queue = queue;
    }

--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
@ -20,7 +20,7 @@ public class GtasksTaskContainer {
  public final Task task;
  public final ArrayList<GoogleTask> metadata;
  private final long updateTime;
-  public GoogleTask gtaskMetadata;
+  public final GoogleTask gtaskMetadata;

  public GtasksTaskContainer(
      com.google.api.services.tasks.model.Task remoteTask,
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@ -69,8 +69,8 @@ public class RepeatControlSet extends TaskEditControlFragment
    implements CustomRecurrenceDialog.CustomRecurrenceCallback {

  public static final int TAG = R.string.TEA_ctrl_repeat_pref;
-  public static final int TYPE_DUE_DATE = 1;
-  public static final int TYPE_COMPLETION_DATE = 2;
+  private static final int TYPE_DUE_DATE = 1;
+  private static final int TYPE_COMPLETION_DATE = 2;
  private static final String FRAG_TAG_CUSTOM_RECURRENCE = "frag_tag_custom_recurrence";
  private static final String EXTRA_RECURRENCE = "extra_recurrence";
  private static final String EXTRA_DUE_DATE = "extra_due_date";
--- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java
+++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.java
@ -467,7 +467,7 @@ public class SubtasksFilterUpdater {
    final ArrayList<Node> children = new ArrayList<>();
    public String uuid;
    public Node parent;
-    public int indent;
+    int indent;

    Node(String uuid, Node parent, int indent) {
      this.uuid = uuid;
--- a/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
@ -39,12 +39,7 @@ public class TagFilterExposer {
  }

  public List<Filter> getFilters() {
-    ArrayList<Filter> list = new ArrayList<>();
-
-    list.addAll(filterFromTags(tagService.getTagList()));
-
-    // transmit filter list
-    return list;
+    return filterFromTags(tagService.getTagList());
  }

  public Filter getFilterByUuid(String uuid) {
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java
@ -47,10 +47,6 @@ public class TimerPlugin {
    updateTimer(task, true);
  }

-  public void stopTimer(Long task) {
-    stopTimer(taskDao.fetch(task));
-  }
-
  public void stopTimer(Task task) {
    updateTimer(task, false);
  }
--- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@ -313,15 +313,15 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
   */
  private class HideUntilValue {

-    public final String label;
-    public final int setting;
-    public final long date;
+    final String label;
+    final int setting;
+    final long date;

-    public HideUntilValue(String label, int setting) {
+    HideUntilValue(String label, int setting) {
      this(label, setting, 0);
    }

-    public HideUntilValue(String label, int setting, long date) {
+    HideUntilValue(String label, int setting, long date) {
      this.label = label;
      this.setting = setting;
      this.date = date;
--- a/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
@ -24,14 +24,12 @@ import timber.log.Timber;

 public class TitleParser {

-  public static boolean parse(TagService tagService, Task task, ArrayList<String> tags) {
-    boolean markup;
-    markup = repeatHelper(task);
+  public static void parse(TagService tagService, Task task, ArrayList<String> tags) {
+    repeatHelper(task);
    listHelper(tagService, task,
        tags); // Don't need to know if tags affected things since we don't show alerts for them
-    markup = dayHelper(task) || markup;
-    markup = priorityHelper(task) || markup;
-    return markup;
+    dayHelper(task);
+    priorityHelper(task);
  }

  public static String trimParenthesis(String pattern) {
@ -100,7 +98,7 @@ public class TitleParser {
  }

  //priorityHelper parses the string and sets the Task's importance
-  private static boolean priorityHelper(Task task) {
+  private static void priorityHelper(Task task) {
    String inputText = task.getTitle();
    String[] importanceStrings = {
        "()((^|[^\\w!])!+|(^|[^\\w!])!\\d)($|[^\\w!])",
@ -109,13 +107,11 @@ public class TitleParser {
        "(?i)(\\sbang\\s?(\\d)$)",
        "(?i)()(\\shigh(est)?|\\slow(est)?|\\stop|\\sleast) ?priority$"
    };
-    boolean result = false;
    for (String importanceString : importanceStrings) {
      Pattern importancePattern = Pattern.compile(importanceString);
      while (true) {
        Matcher m = importancePattern.matcher(inputText);
        if (m.find()) {
-          result = true;
          task.setImportance(strToPriority(m.group(2).trim()));
          int start = m.start() == 0 ? 0 : m.start() + 1;
          inputText = inputText.substring(0, start) + inputText.substring(m.end());
@ -126,7 +122,6 @@ public class TitleParser {
      }
    }
    task.setTitle(inputText.trim());
-    return result;
  }

  //helper for dayHelper. Converts am/pm to an int 0/1.
@ -167,7 +162,7 @@ public class TitleParser {
  //Handles setting the task's date.
  //Day of week (e.g. Monday, Tuesday,..) is overridden by a set date (e.g. October 23 2013).
  //Vague times (e.g. breakfast, night) are overridden by a set time (9 am, at 10, 17:00)
-  private static boolean dayHelper(Task task) {
+  private static void dayHelper(Task task) {
    String inputText = task.getTitle();
    Calendar cal = null;
    Boolean containsSpecificTime = false;
@ -370,14 +365,12 @@ public class TitleParser {
      } else {
        task.setDueDate(Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, cal.getTime().getTime()));
      }
-      return true;
    }
-    return false;
  }
  //---------------------DATE--------------------------

  //Parses through the text and sets the frequency of the task.
-  private static boolean repeatHelper(Task task) {
+  private static void repeatHelper(Task task) {
    String inputText = task.getTitle();
    HashMap<String, Frequency> repeatTimes = new HashMap<>();
    repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b", Frequency.DAILY);
@ -409,7 +402,7 @@ public class TitleParser {
        rrule.setFreq(rtime);
        rrule.setInterval(findInterval(inputText));
        task.setRecurrence(rrule.toIcal());
-        return true;
+        return;
      }
    }

@ -423,10 +416,9 @@ public class TitleParser {
        rrule.setInterval(1);
        String thing = rrule.toIcal();
        task.setRecurrence(thing);
-        return true;
+        return;
      }
    }
-    return false;
  }

  //helper method for repeatHelper.
--- a/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java
+++ b/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java
@ -63,6 +63,7 @@ public class VoiceOutputAssistant implements OnInitListener {
    }
  }

+  @Override
  public void onInit(int status) {
    // status can be either TextToSpeech.SUCCESS or TextToSpeech.ERROR.
    if (status == TextToSpeech.SUCCESS && mTts != null) {
--- a/app/src/main/java/net/dinglisch/android/tasker/TaskerPlugin.java
+++ b/app/src/main/java/net/dinglisch/android/tasker/TaskerPlugin.java
@ -49,7 +49,7 @@ public class TaskerPlugin {
  /**
   * @see Setting#hostSupportsOnFireVariableReplacement(Bundle)
   */
-  public final static int EXTRA_HOST_CAPABILITY_SETTING_FIRE_VARIABLE_REPLACEMENT = 8;
+  private final static int EXTRA_HOST_CAPABILITY_SETTING_FIRE_VARIABLE_REPLACEMENT = 8;
  private final static String TAG = "TaskerPlugin";
  private final static String BASE_KEY = "net.dinglisch.android.tasker";
  private final static String EXTRAS_PREFIX = BASE_KEY + ".extras.";
@ -80,8 +80,6 @@ public class TaskerPlugin {
    return value;
  }

-  ;
-
  // ----------------------------- SETTING PLUGIN ONLY --------------------------------- //

  private static boolean hostSupports(Bundle extrasFromHost, int capabilityFlag) {
@ -95,7 +93,7 @@ public class TaskerPlugin {

  // ---------------------------------- HELPER FUNCTIONS -------------------------------- //

-  public static int getPackageVersionCode(PackageManager pm, String packageName) {
+  private static int getPackageVersionCode(PackageManager pm, String packageName) {

    int code = -1;

@ -167,7 +165,7 @@ public class TaskerPlugin {
     * @param extrasFromHost intent extras from the intent received by the edit activity
     * @see #setVariableReplaceKeys(Bundle, String[])
     */
-    public static boolean hostSupportsOnFireVariableReplacement(Bundle extrasFromHost) {
+    static boolean hostSupportsOnFireVariableReplacement(Bundle extrasFromHost) {
      return hostSupports(extrasFromHost, EXTRA_HOST_CAPABILITY_SETTING_FIRE_VARIABLE_REPLACEMENT);
    }

--- a/app/src/main/java/org/tasks/activities/RemoteListNativePicker.java
+++ b/app/src/main/java/org/tasks/activities/RemoteListNativePicker.java
@ -15,7 +15,7 @@ import org.tasks.injection.NativeDialogFragmentComponent;

 public class RemoteListNativePicker extends InjectingNativeDialogFragment {

-  public static final String EXTRA_SELECTED = "extra_selected";
+  private static final String EXTRA_SELECTED = "extra_selected";
  @Inject DialogBuilder dialogBuilder;
  @Inject FilterAdapter filterAdapter;
  private RemoteListSelectionHandler handler;
--- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
@ -46,7 +46,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem

  public static final String TOKEN_AUTOPOPULATE_NAME = "autopopulateName"; //$NON-NLS-1$
  public static final String EXTRA_TAG_DATA = "tagData"; //$NON-NLS-1$
-  public static final String EXTRA_TAG_UUID = "uuid"; //$NON-NLS-1$
+  private static final String EXTRA_TAG_UUID = "uuid"; //$NON-NLS-1$
  public static final String ACTION_RELOAD = "tagRenamed";
  public static final String ACTION_DELETED = "tagDeleted";
  private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
--- a/app/src/main/java/org/tasks/analytics/Tracking.java
+++ b/app/src/main/java/org/tasks/analytics/Tracking.java
@ -17,7 +17,6 @@ public class Tracking {
    GTASK_ENABLED(R.string.tracking_category_google_tasks, R.string.tracking_action_on),
    GTASK_DISABLED(R.string.tracking_category_google_tasks, R.string.tracking_action_off),
    GTASK_LOGOUT(R.string.tracking_category_google_tasks, R.string.tracking_action_clear),
-    GTASK_MOVE(R.string.tracking_category_google_tasks, R.string.tracking_action_move),
    GTASK_NEW_LIST(R.string.tracking_category_google_tasks, R.string.tracking_action_new_list),
    GTASK_RENAME_LIST(R.string.tracking_category_google_tasks,
        R.string.tracking_action_rename_list),
--- a/app/src/main/java/org/tasks/backup/BackupContainer.java
+++ b/app/src/main/java/org/tasks/backup/BackupContainer.java
@ -16,13 +16,13 @@ import org.tasks.data.TagData;
 import org.tasks.data.TaskAttachment;
 import org.tasks.data.UserActivity;

-public class BackupContainer {
+class BackupContainer {

-  List<TaskBackup> tasks;
-  List<TagData> tags;
-  List<Filter> filters;
-  List<GoogleTaskList> googleTaskLists;
-  List<CaldavAccount> caldavAccounts;
+  final List<TaskBackup> tasks;
+  final List<TagData> tags;
+  final List<Filter> filters;
+  final List<GoogleTaskList> googleTaskLists;
+  final List<CaldavAccount> caldavAccounts;

  BackupContainer(List<TaskBackup> tasks, List<TagData> tags, List<Filter> filters,
      List<GoogleTaskList> googleTaskLists, List<CaldavAccount> caldavAccounts) {
@ -35,14 +35,14 @@ public class BackupContainer {

  static class TaskBackup {

-    Task task;
-    List<Alarm> alarms;
-    List<Location> locations;
-    List<Tag> tags;
-    List<GoogleTask> google;
-    List<UserActivity> comments;
-    private List<TaskAttachment> attachments;
-    private List<CaldavTask> caldavTasks;
+    final Task task;
+    final List<Alarm> alarms;
+    final List<Location> locations;
+    final List<Tag> tags;
+    final List<GoogleTask> google;
+    final List<UserActivity> comments;
+    private final List<TaskAttachment> attachments;
+    private final List<CaldavTask> caldavTasks;

    TaskBackup(Task task, List<Alarm> alarms, List<Location> locations, List<Tag> tags,
        List<GoogleTask> google, List<UserActivity> comments, List<TaskAttachment> attachments,
--- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java
+++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java
@ -38,7 +38,6 @@ import org.tasks.data.TaskAttachmentDao;
 import org.tasks.data.UserActivity;
 import org.tasks.data.UserActivityDao;
 import org.tasks.dialogs.DialogBuilder;
-import org.xmlpull.v1.XmlPullParserException;
 import timber.log.Timber;

 public class TasksJsonImporter {
@ -62,7 +61,6 @@ public class TasksJsonImporter {
  private int taskCount;
  private int importCount = 0;
  private int skipCount = 0;
-  private int errorCount = 0;
  private ProgressDialog progressDialog;
  private String input;

@ -101,13 +99,13 @@ public class TasksJsonImporter {
    new Thread(() -> {
      try {
        performImport();
-      } catch (IOException | XmlPullParserException e) {
+      } catch (IOException e) {
        Timber.e(e, e.getMessage());
      }
    }).start();
  }

-  private void performImport() throws IOException, XmlPullParserException {
+  private void performImport() throws IOException {
    FileReader fileReader = new FileReader(input);
    String string = CharStreams.toString(fileReader);
    fileReader.close();
@ -199,7 +197,7 @@ public class TasksJsonImporter {
            r.getQuantityString(R.plurals.Ntasks, taskCount, taskCount),
            r.getQuantityString(R.plurals.Ntasks, importCount, importCount),
            r.getQuantityString(R.plurals.Ntasks, skipCount, skipCount),
-            r.getQuantityString(R.plurals.Ntasks, errorCount, errorCount)))
+            r.getQuantityString(R.plurals.Ntasks, 0, 0)))
        .setPositiveButton(android.R.string.ok, (dialog, id) -> dialog.dismiss())
        .show();
  }
--- a/app/src/main/java/org/tasks/caldav/Account.java
+++ b/app/src/main/java/org/tasks/caldav/Account.java
@ -9,8 +9,8 @@ public class Account {

  private static final String AUTHORITY = "org.tasks";

-  private AccountManager accountManager;
-  private android.accounts.Account account;
+  private final AccountManager accountManager;
+  private final android.accounts.Account account;

  public Account(AccountManager accountManager, android.accounts.Account account) {
    this.accountManager = accountManager;
--- a/app/src/main/java/org/tasks/caldav/CalDAVAccountAuthenticator.java
+++ b/app/src/main/java/org/tasks/caldav/CalDAVAccountAuthenticator.java
@ -4,12 +4,11 @@ import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
-import android.accounts.NetworkErrorException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;

-public class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {
+class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {

  private final Context context;

@ -25,8 +24,7 @@ public class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {

  @Override
  public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
-      String authTokenType, String[] requiredFeatures, Bundle options)
-      throws NetworkErrorException {
+      String authTokenType, String[] requiredFeatures, Bundle options) {
    Intent intent = new Intent(context, CalDAVSettingsActivity.class);
    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
    Bundle bundle = new Bundle();
@ -36,13 +34,13 @@ public class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {

  @Override
  public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
-      Bundle options) throws NetworkErrorException {
+      Bundle options) {
    return null;
  }

  @Override
  public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
-      String authTokenType, Bundle options) throws NetworkErrorException {
+      String authTokenType, Bundle options) {
    return null;
  }

@ -53,13 +51,13 @@ public class CalDAVAccountAuthenticator extends AbstractAccountAuthenticator {

  @Override
  public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
-      String authTokenType, Bundle options) throws NetworkErrorException {
+      String authTokenType, Bundle options) {
    return null;
  }

  @Override
  public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
-      String[] features) throws NetworkErrorException {
+      String[] features) {
    return null;
  }
 }
--- a/app/src/main/java/org/tasks/caldav/CalDAVFilterExposer.java
+++ b/app/src/main/java/org/tasks/caldav/CalDAVFilterExposer.java
@ -13,7 +13,7 @@ import org.tasks.sync.SyncAdapters;
 public class CalDAVFilterExposer {

  private final SyncAdapters syncAdapters;
-  private CaldavDao caldavDao;
+  private final CaldavDao caldavDao;

  @Inject
  public CalDAVFilterExposer(CaldavDao caldavDao, SyncAdapters syncAdapters) {
--- a/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CalDAVSettingsActivity.java
@ -52,7 +52,7 @@ public class CalDAVSettingsActivity extends ThemedInjectingAppCompatActivity
    implements Toolbar.OnMenuItemClickListener, DeleteAccountDialog.DeleteAccountDialogCallback {

  public static final String EXTRA_CALDAV_DATA = "caldavData"; //$NON-NLS-1$
-  public static final String EXTRA_CALDAV_UUID = "uuid"; //$NON-NLS-1$
+  private static final String EXTRA_CALDAV_UUID = "uuid"; //$NON-NLS-1$
  public static final String ACTION_RELOAD = "accountRenamed";
  public static final String ACTION_DELETED = "accountDeleted";
  private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
--- a/app/src/main/java/org/tasks/caldav/CalDAVSyncAdapter.java
+++ b/app/src/main/java/org/tasks/caldav/CalDAVSyncAdapter.java
@ -24,7 +24,6 @@ import at.bitfire.dav4android.property.CalendarData;
 import at.bitfire.dav4android.property.DisplayName;
 import at.bitfire.dav4android.property.GetCTag;
 import at.bitfire.dav4android.property.GetETag;
-import at.bitfire.ical4android.CalendarStorageException;
 import at.bitfire.ical4android.InvalidCalendarException;
 import at.bitfire.ical4android.iCalendar;
 import com.google.common.base.Strings;
@ -208,7 +207,7 @@ public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter {
      caldavAccount.setCtag(remoteCtag);
      Timber.d("UPDATE %s", caldavAccount);
      caldavDao.update(caldavAccount);
-    } catch (IOException | HttpException | DavException | CalendarStorageException e) {
+    } catch (IOException | HttpException | DavException e) {
      Timber.e(e, e.getMessage());
    } catch (Exception e) {
      Timber.e(e, e.getMessage());
@ -313,7 +312,7 @@ public class CalDAVSyncAdapter extends InjectingAbstractThreadedSyncAdapter {
  }

  private void processVTodo(String fileName, CaldavAccount caldavAccount, String eTag, String vtodo)
-      throws IOException, CalendarStorageException {
+      throws IOException {
    List<at.bitfire.ical4android.Task> tasks;
    try {
      tasks = at.bitfire.ical4android.Task.fromReader(new StringReader(vtodo));
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountManager.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountManager.java
@ -59,7 +59,7 @@ public class CaldavAccountManager {
    return null;
  }

-  public List<Account> getAccounts() {
+  private List<Account> getAccounts() {
    if (!permissionChecker.canAccessAccounts()) {
      return Collections.emptyList();
    }
--- a/app/src/main/java/org/tasks/caldav/CaldavClient.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavClient.java
@ -11,17 +11,12 @@ import java.util.concurrent.Callable;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import org.tasks.R;
-import org.tasks.data.CaldavAccount;
 import org.tasks.ui.DisplayableException;

-public class CaldavClient {
+class CaldavClient {

  private final DavCalendar davCalendar;

-  public CaldavClient(CaldavAccount caldavAccount, Account localAccount) {
-    this(caldavAccount.getUrl(), caldavAccount.getUsername(), localAccount.getPassword());
-  }
-
  public CaldavClient(String url, String username, String password) {
    BasicDigestAuthHandler basicDigestAuthHandler = new BasicDigestAuthHandler(null, username,
        password);
--- a/app/src/main/java/org/tasks/caldav/CaldavListFragment.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavListFragment.java
@ -19,7 +19,7 @@ public class CaldavListFragment extends TaskListFragment {

  private static final String EXTRA_CALDAV_ACCOUNT = "extra_caldav_account";
  private static final int REQUEST_ACCOUNT_SETTINGS = 10101;
-  protected CaldavAccount account;
+  private CaldavAccount account;

  public static TaskListFragment newCaldavListFragment(CaldavFilter filter, CaldavAccount account) {
    CaldavListFragment fragment = new CaldavListFragment();
--- a/app/src/main/java/org/tasks/caldav/MemoryCookieStore.java
+++ b/app/src/main/java/org/tasks/caldav/MemoryCookieStore.java
@ -22,14 +22,14 @@ import org.apache.commons.collections4.map.MultiKeyMap;
 * Primitive cookie store that stores cookies in a (volatile) hash map.
 * Will be sufficient for session cookies.
 */
-public class MemoryCookieStore implements CookieJar {
+class MemoryCookieStore implements CookieJar {

  /**
   * Stored cookies. The multi-key consists of three parts: name, domain, and path.
   * This ensures that cookies can be overwritten. [RFC 6265 5.3 Storage Model]
   * Not thread-safe!
   */
-  protected final MultiKeyMap<String, Cookie> storage = MultiKeyMap
+  private final MultiKeyMap<String, Cookie> storage = MultiKeyMap
      .multiKeyMap(new HashedMap<MultiKey<? extends String>, Cookie>());

  @Override
--- a/app/src/main/java/org/tasks/caldav/TaskConverter.java
+++ b/app/src/main/java/org/tasks/caldav/TaskConverter.java
@ -22,9 +22,9 @@ import net.fortuna.ical4j.model.property.RRule;
 import org.tasks.data.CaldavTask;
 import timber.log.Timber;

-public class TaskConverter {
+class TaskConverter {

-  private static DateFormat DUE_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd", Locale.US);
+  private static final DateFormat DUE_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd", Locale.US);

  public static void apply(Task local, at.bitfire.ical4android.Task remote) {
    if (remote.getCompletedAt() != null) {
@ -58,7 +58,7 @@ public class TaskConverter {
    }
  }

-  static int fromRemote(int remotePriority) {
+  private static int fromRemote(int remotePriority) {
    switch (remotePriority) {
      case 0:
        return Task.IMPORTANCE_NONE;
@ -71,7 +71,7 @@ public class TaskConverter {
    }
  }

-  static int toRemote(int remotePriority, int localPriority) {
+  private static int toRemote(int remotePriority, int localPriority) {
    switch (localPriority) {
      case Task.IMPORTANCE_DO_OR_DIE:
        return 1;
--- a/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
+++ b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
@ -59,18 +59,22 @@ public class CalendarEventProvider {
    }
  }

-  public boolean deleteEvent(Task task) {
+  public void deleteEvent(Task task) {
    String uri = task.getCalendarURI();
    task.setCalendarUri("");
-    return deleteEvent(uri);
+    deleteEvent(uri);
  }

-  private boolean deleteEvent(String eventUri) {
-    return !TextUtils.isEmpty(eventUri) && deleteEvent(Uri.parse(eventUri));
+  private void deleteEvent(String eventUri) {
+    if (!TextUtils.isEmpty(eventUri)) {
+      deleteEvent(Uri.parse(eventUri));
+    }
  }

-  private boolean deleteEvent(Uri eventUri) {
-    return getEvent(eventUri) != null && contentResolver.delete(eventUri, null, null) > 0;
+  private void deleteEvent(Uri eventUri) {
+    if (getEvent(eventUri) != null) {
+      contentResolver.delete(eventUri, null, null);
+    }
  }

  public List<AndroidCalendarEvent> getEventsBetween(long start, long end) {
--- a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
+++ b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
@ -24,7 +24,7 @@ public class LimitOffsetDataSource extends PositionalDataSource<Task> {
  }

  @WorkerThread
-  public int countItems() {
+  private int countItems() {
    Cursor cursor = mDb.query(mCountQuery, null);
    try {
      if (cursor.moveToFirst()) {
@ -47,7 +47,7 @@ public class LimitOffsetDataSource extends PositionalDataSource<Task> {

  @Nullable
  @WorkerThread
-  public List<Task> loadRange(int startPosition, int loadCount) {
+  private List<Task> loadRange(int startPosition, int loadCount) {
    Cursor cursor = mDb.query(mLimitOffsetQuery, new Object[]{loadCount, startPosition});
    //noinspection TryFinallyCanBeTryWithResources
    try {
--- a/app/src/main/java/org/tasks/data/Location.java
+++ b/app/src/main/java/org/tasks/data/Location.java
@ -163,10 +163,12 @@ public class Location implements Serializable, Parcelable {
        '}';
  }

+  @Override
  public int describeContents() {
    return 0;
  }

+  @Override
  public void writeToParcel(Parcel out, int flags) {
    out.writeLong(id);
    out.writeLong(task);
--- a/app/src/main/java/org/tasks/data/TaskListMetadataDao.java
+++ b/app/src/main/java/org/tasks/data/TaskListMetadataDao.java
@ -12,7 +12,7 @@ public abstract class TaskListMetadataDao {
  public abstract TaskListMetadata fetchByTagOrFilter(String tagUuid);

  @Update
-  public abstract int update(TaskListMetadata taskListMetadata);
+  public abstract void update(TaskListMetadata taskListMetadata);

  @Insert
  abstract long insert(TaskListMetadata taskListMetadata);
--- a/app/src/main/java/org/tasks/db/Migrations.java
+++ b/app/src/main/java/org/tasks/db/Migrations.java
@ -185,7 +185,7 @@ public class Migrations {
      database.execSQL("ALTER TABLE `caldav_tasks` ADD COLUMN `vtodo` TEXT");
    }
  };
-  public static Migration[] MIGRATIONS = new Migration[]{
+  public static final Migration[] MIGRATIONS = new Migration[]{
      MIGRATION_35_36,
      MIGRATION_36_37,
      MIGRATION_37_38,
--- a/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java
@ -43,9 +43,7 @@ public class AddAttachmentDialog extends InjectingDialogFragment {
    entries.add(getString(R.string.pick_from_storage));
    actions.add(() -> callback.pickFromStorage());
    return dialogBuilder.newDialog()
-        .setItems(entries, (dialog, which) -> {
-          actions.get(which).run();
-        })
+        .setItems(entries, (dialog, which) -> actions.get(which).run())
        .show();
  }

--- a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
+++ b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
@ -19,7 +19,7 @@ public class AlertDialogBuilder {
  private final Theme theme;
  private final Locale locale;

-  public AlertDialogBuilder(Context context, Theme theme, Locale locale) {
+  AlertDialogBuilder(Context context, Theme theme, Locale locale) {
    this.context = context;
    this.theme = theme;
    this.locale = locale;
@ -80,12 +80,6 @@ public class AlertDialogBuilder {
    return this;
  }

-  public AlertDialogBuilder setAdapter(ListAdapter adapter,
-      DialogInterface.OnClickListener listener) {
-    builder.setAdapter(adapter, listener);
-    return this;
-  }
-
  public AlertDialogBuilder setSingleChoiceItems(List<String> strings, int selectedIndex,
      DialogInterface.OnClickListener onClickListener) {
    builder.setSingleChoiceItems(addDirectionality(strings.toArray(new String[strings.size()])),
--- a/app/src/main/java/org/tasks/dialogs/ExportTasksDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/ExportTasksDialog.java
@ -16,7 +16,6 @@ public class ExportTasksDialog extends InjectingNativeDialogFragment {
  @Inject DialogBuilder dialogBuilder;
  @Inject TasksJsonExporter tasksJsonExporter;
  @Inject Tracker tracker;
-  private ProgressDialog progressDialog;

  public static ExportTasksDialog newExportTasksDialog() {
    return new ExportTasksDialog();
@ -25,7 +24,7 @@ public class ExportTasksDialog extends InjectingNativeDialogFragment {
  @NonNull
  @Override
  public Dialog onCreateDialog(Bundle savedInstanceState) {
-    progressDialog = dialogBuilder.newProgressDialog();
+    ProgressDialog progressDialog = dialogBuilder.newProgressDialog();
    progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
    progressDialog.setProgress(0);
    progressDialog.setCancelable(false);
--- a/app/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/MyDatePickerDialog.java
@ -7,6 +7,7 @@ public class MyDatePickerDialog extends DatePickerDialog {

  private DialogInterface.OnCancelListener listener;

+  @Override
  public void setOnCancelListener(DialogInterface.OnCancelListener listener) {
    this.listener = listener;
  }
--- a/app/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/MyTimePickerDialog.java
@ -7,6 +7,7 @@ public class MyTimePickerDialog extends TimePickerDialog {

  private DialogInterface.OnDismissListener listener;

+  @Override
  public void setOnDismissListener(DialogInterface.OnDismissListener listener) {
    this.listener = listener;
  }
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
@ -272,7 +272,7 @@ public class CommentBarFragment extends TaskEditControlFragment {
    void addComment(String message, String picture);
  }

-  public interface ClearImageCallback {
+  interface ClearImageCallback {

    void clearImage();
  }
--- a/app/src/main/java/org/tasks/injection/ActivityScope.java
+++ b/app/src/main/java/org/tasks/injection/ActivityScope.java
@ -6,6 +6,6 @@ import javax.inject.Scope;

@Scope
@Retention(RetentionPolicy.RUNTIME)
-public @interface ActivityScope {
+@interface ActivityScope {

 }
--- a/app/src/main/java/org/tasks/injection/BroadcastComponent.java
+++ b/app/src/main/java/org/tasks/injection/BroadcastComponent.java
@ -3,7 +3,6 @@ package org.tasks.injection;
 import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
 import com.todoroo.astrid.gcal.CalendarAlarmReceiver;
 import dagger.Subcomponent;
-import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.notifications.NotificationClearedReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
@ -13,8 +12,6 @@ import org.tasks.widget.TasksWidget;
@Subcomponent(modules = BroadcastModule.class)
 public interface BroadcastComponent {

-  void inject(FireReceiver fireReceiver);
-
  void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);

  void inject(CalendarAlarmReceiver calendarAlarmReceiver);
--- a/app/src/main/java/org/tasks/injection/Dagger.java
+++ b/app/src/main/java/org/tasks/injection/Dagger.java
@ -9,7 +9,7 @@ class Dagger {
  private static final Object lock = new Object();

  private static Dagger instance;
-  private ApplicationComponent applicationComponent;
+  private final ApplicationComponent applicationComponent;

  private Dagger(Context context) {
    Context localeContext = context.getApplicationContext();
--- a/app/src/main/java/org/tasks/jobs/JobManager.java
+++ b/app/src/main/java/org/tasks/jobs/JobManager.java
@ -27,8 +27,8 @@ public class JobManager {
  static final int JOB_ID_NOTIFICATION = 3;
  static final int JOB_ID_MIDNIGHT_REFRESH = 6;
  static final int JOB_ID_BACKUP = 7;
-  private Context context;
-  private AlarmManager alarmManager;
+  private final Context context;
+  private final AlarmManager alarmManager;

  @Inject
  public JobManager(@ForApplication Context context, AlarmManager alarmManager) {
--- a/app/src/main/java/org/tasks/locale/bundle/TaskCreationBundle.java
+++ b/app/src/main/java/org/tasks/locale/bundle/TaskCreationBundle.java
@ -11,7 +11,7 @@ public class TaskCreationBundle {
  public static final String EXTRA_DUE_TIME = "org.tasks.locale.create.STRING_DUE_TIME";
  public static final String EXTRA_PRIORITY = "org.tasks.locale.create.STRING_PRIORITY";
  public static final String EXTRA_DESCRIPTION = "org.tasks.locale.create.STRING_DESCRIPTION";
-  public static final String EXTRA_VERSION_CODE = "org.tasks.locale.create.INT_VERSION_CODE";
+  private static final String EXTRA_VERSION_CODE = "org.tasks.locale.create.INT_VERSION_CODE";

  private final Bundle bundle;

--- a/app/src/main/java/org/tasks/location/GeofenceService.java
+++ b/app/src/main/java/org/tasks/location/GeofenceService.java
@ -95,7 +95,7 @@ public class GeofenceService {
    return locationDao.getActiveGeofences(taskId);
  }

-  public interface SynchronizeGeofenceCallback {
+  interface SynchronizeGeofenceCallback {

    void beforeDelete(Location location);
  }
--- a/app/src/main/java/org/tasks/notifications/NotificationManager.java
+++ b/app/src/main/java/org/tasks/notifications/NotificationManager.java
@ -55,7 +55,7 @@ public class NotificationManager {
  public static final String NOTIFICATION_CHANNEL_TASKER = "notifications_tasker";
  public static final String NOTIFICATION_CHANNEL_CALLS = "notifications_calls";
  public static final String NOTIFICATION_CHANNEL_TIMERS = "notifications_timers";
-  public static final String GROUP_KEY = "tasks";
+  private static final String GROUP_KEY = "tasks";
  static final String EXTRA_NOTIFICATION_ID = "extra_notification_id";
  private static final int SUMMARY_NOTIFICATION_ID = 0;
  private final NotificationManagerCompat notificationManagerCompat;
--- a/app/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java
+++ b/app/src/main/java/org/tasks/preferences/ActivityPermissionRequestor.java
@ -15,6 +15,7 @@ public class ActivityPermissionRequestor extends PermissionRequestor {
    this.activity = activity;
  }

+  @Override
  protected void requestPermissions(String[] permissions, int rc) {
    ActivityCompat.requestPermissions(activity, permissions, rc);
  }
--- a/app/src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/org/tasks/preferences/AppCompatPreferenceActivity.java
@ -106,6 +106,7 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
    getDelegate().onDestroy();
  }

+  @Override
  public void invalidateOptionsMenu() {
    getDelegate().invalidateOptionsMenu();
  }
--- a/app/src/main/java/org/tasks/preferences/AppearancePreferences.java
+++ b/app/src/main/java/org/tasks/preferences/AppearancePreferences.java
@ -22,7 +22,7 @@ public class AppearancePreferences extends InjectingPreferenceActivity implement
    SeekBarDialog.SeekBarCallback {

  public static final String EXTRA_RESTART = "extra_restart";
-  public static final String EXTRA_FILTERS_CHANGED = "extra_filters_changed";
+  private static final String EXTRA_FILTERS_CHANGED = "extra_filters_changed";
  private static final int REQUEST_CUSTOMIZE = 1004;
  private static final int REQUEST_DEFAULT_LIST = 1005;
  private static final int REQUEST_ROW_PADDING = 1006;
--- a/app/src/main/java/org/tasks/preferences/DateTimePreferences.java
+++ b/app/src/main/java/org/tasks/preferences/DateTimePreferences.java
@ -48,7 +48,7 @@ public class DateTimePreferences extends InjectingPreferenceActivity implements
    updateStartOfWeek(preferences.getStringValue(R.string.p_start_of_week));
  }

-  String[] getWeekdayEntries() {
+  private String[] getWeekdayEntries() {
    return new String[]{
        getString(R.string.use_locale_default),
        getWeekdayDisplayName(DayOfWeek.SUNDAY),
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@ -95,7 +95,7 @@ public class Preferences {
    return time;
  }

-  public boolean quietHoursEnabled() {
+  private boolean quietHoursEnabled() {
    return getBoolean(R.string.p_rmd_enable_quiet, false);
  }

@ -103,11 +103,11 @@ public class Preferences {
    return getInt(R.string.p_rmd_time, (int) TimeUnit.HOURS.toMillis(18));
  }

-  public int getQuietHoursStart() {
+  private int getQuietHoursStart() {
    return getMillisPerDayPref(R.string.p_rmd_quietStart, R.integer.default_quiet_hours_start);
  }

-  public int getQuietHoursEnd() {
+  private int getQuietHoursEnd() {
    return getMillisPerDayPref(R.string.p_rmd_quietEnd, R.integer.default_quiet_hours_end);
  }

@ -159,10 +159,6 @@ public class Preferences {
    return getStringValue(R.string.gcal_p_default);
  }

-  public String getDefaultRemoteList() {
-    return getStringValue(R.string.p_default_remote_list);
-  }
-
  public int getFirstDayOfWeek() {
    int firstDayOfWeek = getIntegerFromString(R.string.p_start_of_week, 0);
    return firstDayOfWeek < 1 || firstDayOfWeek > 7 ? 0 : firstDayOfWeek;
--- a/app/src/main/java/org/tasks/receivers/Badger.java
+++ b/app/src/main/java/org/tasks/receivers/Badger.java
@ -23,7 +23,7 @@ public class Badger {

  private boolean enabled;

-  private BroadcastReceiver receiver = new BroadcastReceiver() {
+  private final BroadcastReceiver receiver = new BroadcastReceiver() {
    @Override
    public void onReceive(Context context, Intent intent) {
      publishCount();
--- a/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
+++ b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
@ -29,7 +29,7 @@ public class SnoozeActivity extends InjectingAppCompatActivity implements Snooze
  @Inject TaskDao taskDao;
  @Inject ReminderService reminderService;

-  private List<Long> taskIds = new ArrayList<>();
+  private final List<Long> taskIds = new ArrayList<>();
  private boolean pickingDateTime;

  @Override
--- a/app/src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java
+++ b/app/src/main/java/org/tasks/scheduling/NotificationSchedulerIntentService.java
@ -15,7 +15,7 @@ import timber.log.Timber;

 public class NotificationSchedulerIntentService extends InjectingJobIntentService {

-  public static final String EXTRA_CANCEL_EXISTING_NOTIFICATIONS = "extra_cancel_existing_notifications";
+  private static final String EXTRA_CANCEL_EXISTING_NOTIFICATIONS = "extra_cancel_existing_notifications";
  @Inject AlarmService alarmService;
  @Inject ReminderService reminderService;
  @Inject JobQueue jobQueue;
--- a/app/src/main/java/org/tasks/tasklist/DiffCallback.java
+++ b/app/src/main/java/org/tasks/tasklist/DiffCallback.java
@ -5,7 +5,7 @@ import android.support.v7.util.DiffUtil.ItemCallback;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;

-public class DiffCallback extends ItemCallback<Task> {
+class DiffCallback extends ItemCallback<Task> {

  private final TaskAdapter adapter;

--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
@ -49,7 +49,7 @@ public class TaskListRecyclerAdapter extends RecyclerView.Adapter<ViewHolder>
  private ActionMode mode = null;
  private boolean dragging;
  private boolean animate;
-  private ActionMode.Callback actionModeCallback = new ActionMode.Callback() {
+  private final ActionMode.Callback actionModeCallback = new ActionMode.Callback() {
    @Override
    public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
      MenuInflater inflater = actionMode.getMenuInflater();
--- a/app/src/main/java/org/tasks/tasklist/ViewHolder.java
+++ b/app/src/main/java/org/tasks/tasklist/ViewHolder.java
@ -124,10 +124,6 @@ class ViewHolder extends RecyclerView.ViewHolder {
    }
  }

-  public boolean isSelected() {
-    return selected;
-  }
-
  public void setSelected(boolean selected) {
    this.selected = selected;
    updateBackground();
--- a/app/src/main/java/org/tasks/themes/ThemeColor.java
+++ b/app/src/main/java/org/tasks/themes/ThemeColor.java
@ -164,7 +164,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
    return actionBarTint;
  }

-  public int getColorPrimaryDark() {
+  private int getColorPrimaryDark() {
    return colorPrimaryDark;
  }

--- a/app/src/main/java/org/tasks/time/DateTimeUtils.java
+++ b/app/src/main/java/org/tasks/time/DateTimeUtils.java
@ -26,7 +26,7 @@ public class DateTimeUtils {
    return nextMidnight(currentTimeMillis());
  }

-  public static long nextMidnight(long timestamp) {
+  private static long nextMidnight(long timestamp) {
    return newDateTime(timestamp).startOfDay().plusDays(1).getMillis();
  }

--- a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
@ -55,7 +55,7 @@ public class DeadlineControlSet extends TaskEditControlFragment {
  @BindView(R.id.due_date) Spinner dueDateSpinner;
  @BindView(R.id.due_time) Spinner dueTimeSpinner;
  @BindView(R.id.clear) View clearButton;
-  DueDateChangeListener callback;
+  private DueDateChangeListener callback;
  private List<String> dueDateOptions = new ArrayList<>();
  private List<String> dueTimeOptions = new ArrayList<>();
  private List<String> dueTimeHint = new ArrayList<>();
--- a/app/src/main/java/org/tasks/widget/AppWidgetManager.java
+++ b/app/src/main/java/org/tasks/widget/AppWidgetManager.java
@ -9,7 +9,7 @@ import org.tasks.injection.ForApplication;
 public class AppWidgetManager {

  private final android.appwidget.AppWidgetManager appWidgetManager;
-  private Context context;
+  private final Context context;

  @Inject
  public AppWidgetManager(@ForApplication Context context) {
--- a/Show More
+++ b/Show More