Update to JDK 1.7

android-aac-enc/build.gradle

@@ -17,6 +17,11 @@ android {
     compileSdkVersion 19
     buildToolsVersion "19"
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 19

api/build.gradle

@@ -17,6 +17,11 @@ android {
     compileSdkVersion 19
     buildToolsVersion "19"
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 19

api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java

@@ -93,7 +93,7 @@ abstract public class AbstractDatabase {
         public void onDatabaseUpdated();
     }
 
-    private final ArrayList<DatabaseUpdateListener> listeners = new ArrayList<DatabaseUpdateListener>();
+    private final ArrayList<DatabaseUpdateListener> listeners = new ArrayList<>();
 
     public void addListener(DatabaseUpdateListener listener) {
         listeners.add(listener);

api/src/main/java/com/todoroo/andlib/data/AbstractModel.java

@@ -379,7 +379,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
 
     public synchronized void putTransitory(String key, Object value) {
         if(transitoryData == null) {
-            transitoryData = new HashMap<String, Object>();
+            transitoryData = new HashMap<>();
         }
         transitoryData.put(key, value);
     }
@@ -415,7 +415,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * Looks inside the given class and finds all declared properties
      */
     protected static Property<?>[] generateProperties(Class<? extends AbstractModel> cls) {
-        ArrayList<Property<?>> properties = new ArrayList<Property<?>>();
+        ArrayList<Property<?>> properties = new ArrayList<>();
         if(cls.getSuperclass() != AbstractModel.class) {
             properties.addAll(Arrays.asList(generateProperties(
                     (Class<? extends AbstractModel>) cls.getSuperclass())));
@@ -434,9 +434,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
                     continue;
                 }
                 properties.add((Property<?>) field.get(null));
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
+            } catch (IllegalArgumentException | IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
         }
@@ -524,9 +522,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
             TYPE model;
             try {
                 model = cls.newInstance();
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (InstantiationException e) {
+            } catch (IllegalAccessException | InstantiationException e) {
                 throw new RuntimeException(e);
             }
             model.setValues = source.readParcelable(ContentValues.class.getClassLoader());

api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java

@@ -70,7 +70,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
     }
 
     private final ArrayList<ModelUpdateListener<TYPE>> listeners =
-        new ArrayList<ModelUpdateListener<TYPE>>();
+        new ArrayList<>();
 
     public void addListener(ModelUpdateListener<TYPE> listener) {
         listeners.add(listener);
@@ -94,7 +94,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
             Log.i("SQL-" + modelClass.getSimpleName(), query.toString()); //$NON-NLS-1$
         }
         Cursor cursor = database.rawQuery(query.toString());
-        return new TodorooCursor<TYPE>(cursor, query.getFields());
+        return new TodorooCursor<>(cursor, query.getFields());
     }
 
     /**
@@ -105,7 +105,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         for(int i = 0; i < properties.length; i++) {
             fields[i] = properties[i].name;
         }
-        return new TodorooCursor<TYPE>(database.getDatabase().query(table.name,
+        return new TodorooCursor<>(database.getDatabase().query(table.name,
                 fields, selection, selectionArgs, null, null, null),
                 properties);
     }
@@ -130,17 +130,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
             }
             Constructor<TYPE> constructor = modelClass.getConstructor(TodorooCursor.class);
             return constructor.newInstance(cursor);
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
+        } catch (SecurityException | InvocationTargetException | IllegalAccessException | InstantiationException | IllegalArgumentException | NoSuchMethodException e) {
             throw new RuntimeException(e);
         } finally {
             cursor.close();
@@ -280,7 +270,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         TodorooCursor<TYPE> cursor = query(
                 Query.select(properties).where(AbstractModel.ID_PROPERTY.eq(id)));
         cursor.moveToFirst();
-        return new TodorooCursor<TYPE>(cursor, properties);
+        return new TodorooCursor<>(cursor, properties);
     }
 
     public int count(Query query) {

api/src/main/java/com/todoroo/andlib/data/Table.java

@@ -36,13 +36,7 @@ public final class Table extends SqlTable {
     public Property<?>[] getProperties() {
         try {
             return (Property<?>[])modelClass.getField("PROPERTIES").get(null);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchFieldException e) {
+        } catch (IllegalArgumentException | NoSuchFieldException | IllegalAccessException | SecurityException e) {
             throw new RuntimeException(e);
         }
     }

api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java

@@ -43,7 +43,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
         super(cursor);
 
         this.properties = properties;
-        columnIndexCache = new WeakHashMap<String, Integer>();
+        columnIndexCache = new WeakHashMap<>();
     }
 
     /**

api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java

@@ -42,13 +42,13 @@ abstract public class AbstractDependencyInjector {
     /**
      * Dependencies this class knows how to handle
      */
-    protected final HashMap<String, Object> injectables = new HashMap<String, Object>();
+    protected final HashMap<String, Object> injectables = new HashMap<>();
 
     /**
      * Cache of classes that were instantiated by the injector
      */
     protected final HashMap<Class<?>, WeakReference<Object>> createdObjects =
-        new HashMap<Class<?>, WeakReference<Object>>();
+        new HashMap<>();
 
     /**
      * Gets the injected object for this field. If implementing class does not
@@ -71,14 +71,11 @@ abstract public class AbstractDependencyInjector {
                     Class<?> cls = (Class<?>)injection;
                     try {
                         injection = cls.newInstance();
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    } catch (InstantiationException e) {
+                    } catch (IllegalAccessException | InstantiationException e) {
                         throw new RuntimeException(e);
                     }
 
-                    createdObjects.put(cls,
-                            new WeakReference<Object>(injection));
+                    createdObjects.put(cls, new WeakReference<>(injection));
                 }
             }
 

api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java

@@ -30,7 +30,7 @@ public class DependencyInjectionService {
     /**
      * Dependency injectors. Use getters and setters to modify this list
      */
-    private final LinkedList<AbstractDependencyInjector> injectors = new LinkedList<AbstractDependencyInjector>();
+    private final LinkedList<AbstractDependencyInjector> injectors = new LinkedList<>();
 
     /**
      * Perform dependency injection in the caller object
@@ -55,13 +55,7 @@ public class DependencyInjectionService {
                     field.setAccessible(true);
                     try {
                         handleField(caller, field);
-                    } catch (IllegalStateException e) {
-                        throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'",
-                                field.getName(), field.getType()), e);
-                    } catch (IllegalArgumentException e) {
-                        throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'",
-                                        field.getName(), field.getType()), e);
-                    } catch (IllegalAccessException e) {
+                    } catch (IllegalStateException | IllegalAccessException | IllegalArgumentException e) {
                         throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'",
                                 field.getName(), field.getType()), e);
                     }

api/src/main/java/com/todoroo/andlib/sql/Order.java

@@ -22,7 +22,7 @@ public class Order {
     private Order(Object expression, OrderType orderType) {
         this.expression = expression;
         this.orderType = orderType;
-        this.secondaryExpressions = new ArrayList<Order>();
+        this.secondaryExpressions = new ArrayList<>();
     }
 
     public static Order asc(Object expression) {

api/src/main/java/com/todoroo/andlib/sql/Query.java

@@ -27,11 +27,11 @@ public final class Query {
 
     private SqlTable table;
     private String queryTemplate = null;
-    private final ArrayList<Criterion> criterions = new ArrayList<Criterion>();
-    private final ArrayList<Field> fields = new ArrayList<Field>();
-    private final ArrayList<Join> joins = new ArrayList<Join>();
-    private final ArrayList<Field> groupBies = new ArrayList<Field>();
-    private final ArrayList<Order> orders = new ArrayList<Order>();
+    private final ArrayList<Criterion> criterions = new ArrayList<>();
+    private final ArrayList<Field> fields = new ArrayList<>();
+    private final ArrayList<Join> joins = new ArrayList<>();
+    private final ArrayList<Field> groupBies = new ArrayList<>();
+    private final ArrayList<Order> orders = new ArrayList<>();
     private int limits = -1;
     private boolean distinct = false;
 

api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java

@@ -24,10 +24,10 @@ import static java.util.Arrays.asList;
  */
 public final class QueryTemplate {
 
-    private final ArrayList<Criterion> criterions = new ArrayList<Criterion>();
-    private final ArrayList<Join> joins = new ArrayList<Join>();
-    private final ArrayList<Field> groupBies = new ArrayList<Field>();
-    private final ArrayList<Order> orders = new ArrayList<Order>();
+    private final ArrayList<Criterion> criterions = new ArrayList<>();
+    private final ArrayList<Join> joins = new ArrayList<>();
+    private final ArrayList<Field> groupBies = new ArrayList<>();
+    private final ArrayList<Order> orders = new ArrayList<>();
     private Integer limit = null;
 
     public QueryTemplate join(Join... join) {

api/src/main/java/com/todoroo/astrid/data/Metadata.java

@@ -121,5 +121,5 @@ public class Metadata extends AbstractModel {
 
     // --- parcelable helpers
 
-    private static final Creator<Metadata> CREATOR = new ModelCreator<Metadata>(Metadata.class);
+    private static final Creator<Metadata> CREATOR = new ModelCreator<>(Metadata.class);
 }

api/src/main/java/com/todoroo/astrid/data/RemoteModel.java

@@ -19,7 +19,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Date;
@@ -133,8 +132,6 @@ abstract public class RemoteModel extends AbstractModel {
                         fos.flush();
                         fos.close();
                         jsonObject.put("path", file.getAbsolutePath());
-                    } catch (FileNotFoundException e) {
-                        //
                     } catch (IOException e) {
                         //
                     }

api/src/main/java/com/todoroo/astrid/data/StoreObject.java

@@ -95,5 +95,5 @@ public class StoreObject extends AbstractModel {
 
     // --- parcelable helpers
 
-    private static final Creator<StoreObject> CREATOR = new ModelCreator<StoreObject>(StoreObject.class);
+    private static final Creator<StoreObject> CREATOR = new ModelCreator<>(StoreObject.class);
 }

api/src/main/java/com/todoroo/astrid/data/TagData.java

@@ -197,7 +197,7 @@ public final class TagData extends RemoteModel {
 
     // --- parcelable helpers
 
-    public static final Creator<TagData> CREATOR = new ModelCreator<TagData>(TagData.class);
+    public static final Creator<TagData> CREATOR = new ModelCreator<>(TagData.class);
 
     // --- data access methods
 

api/src/main/java/com/todoroo/astrid/data/TagMetadata.java

@@ -75,5 +75,5 @@ public class TagMetadata extends AbstractModel {
 
     // --- parcelable helpers
 
-    private static final Creator<TagMetadata> CREATOR = new ModelCreator<TagMetadata>(TagMetadata.class);
+    private static final Creator<TagMetadata> CREATOR = new ModelCreator<>(TagMetadata.class);
 }

api/src/main/java/com/todoroo/astrid/data/Task.java

@@ -301,7 +301,7 @@ public final class Task extends RemoteModel {
 
     // --- parcelable helpers
 
-    public static final Creator<Task> CREATOR = new ModelCreator<Task>(Task.class);
+    public static final Creator<Task> CREATOR = new ModelCreator<>(Task.class);
 
     // --- data access methods
 

api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java

@@ -167,5 +167,5 @@ public final class TaskAttachment extends RemoteModel {
 
     // --- parcelable helpers
 
-    public static final Creator<TaskAttachment> CREATOR = new ModelCreator<TaskAttachment>(TaskAttachment.class);
+    public static final Creator<TaskAttachment> CREATOR = new ModelCreator<>(TaskAttachment.class);
 }

api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java

@@ -118,5 +118,5 @@ public final class TaskListMetadata extends RemoteModel {
 
     // --- parcelable helpers
 
-    public static final Creator<TaskListMetadata> CREATOR = new ModelCreator<TaskListMetadata>(TaskListMetadata.class);
+    public static final Creator<TaskListMetadata> CREATOR = new ModelCreator<>(TaskListMetadata.class);
 }

api/src/main/java/com/todoroo/astrid/data/Update.java

@@ -139,5 +139,5 @@ public class Update extends RemoteModel {
 
     // --- parcelable helpers
 
-    private static final Creator<Update> CREATOR = new ModelCreator<Update>(Update.class);
+    private static final Creator<Update> CREATOR = new ModelCreator<>(Update.class);
 }

api/src/main/java/com/todoroo/astrid/data/UserActivity.java

@@ -106,5 +106,5 @@ public class UserActivity extends RemoteModel {
         return getIdHelper(ID);
     }
 
-    private static final Creator<UserActivity> CREATOR = new ModelCreator<UserActivity>(UserActivity.class);
+    private static final Creator<UserActivity> CREATOR = new ModelCreator<>(UserActivity.class);
 }

api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -247,7 +247,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
 
     private static HashMap<String, Integer> getExceptionMap() {
         if (exceptionsToDisplayMessages == null) {
-            exceptionsToDisplayMessages = new HashMap<String, Integer>();
+            exceptionsToDisplayMessages = new HashMap<>();
             exceptionsToDisplayMessages.put("java.net.ConnectionException", R.string.sync_error_offline);
             exceptionsToDisplayMessages.put("java.net.UnknownHostException", R.string.sync_error_offline);
         }

astrid/build.gradle

@@ -34,6 +34,11 @@ android {
         release
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     buildTypes {
         release {
             runProguard true

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java

@@ -96,7 +96,7 @@ public class GtasksDetailExposerTest extends DatabaseTestCase {
 
     private void givenTwoListSetup() {
         TaskLists lists = new TaskLists();
-        List<TaskList> newLists = new ArrayList<TaskList>();
+        List<TaskList> newLists = new ArrayList<>();
         TaskList list = new TaskList();
         list.setId("listone-id");
         list.setTitle("List One"); //new GoogleTaskListInfo("listone-id", "List One");

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java

@@ -137,7 +137,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
         super.setUp();
 
         TaskLists lists = new TaskLists();
-        List<TaskList> items = new ArrayList<TaskList>();
+        List<TaskList> items = new ArrayList<>();
         TaskList list = new TaskList();
         list.setId("list");
         list.setTitle("Test Tasks");

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java

@@ -124,7 +124,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
         super.setUp();
 
         TaskLists lists = new TaskLists();
-        List<TaskList> items = new ArrayList<TaskList>();
+        List<TaskList> items = new ArrayList<>();
         TaskList list = new TaskList();
         list.setId("1");
         list.setTitle("Tim's Tasks");

astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java

@@ -241,7 +241,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
         super.setUp();
 
         TaskLists lists = new TaskLists();
-        List<TaskList> items = new ArrayList<TaskList>();
+        List<TaskList> items = new ArrayList<>();
         TaskList taskList = new TaskList();
         taskList.setId("1");
         taskList.setTitle("Tim's Tasks");

astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java

@@ -28,13 +28,13 @@ public class TaskTests extends DatabaseTestCase {
         assertTrue(Task.IMPORTANCE_MUST_DO < Task.IMPORTANCE_SHOULD_DO);
         assertTrue(Task.IMPORTANCE_SHOULD_DO < Task.IMPORTANCE_NONE);
 
-        ArrayList<Integer> reminderFlags = new ArrayList<Integer>();
+        ArrayList<Integer> reminderFlags = new ArrayList<>();
         reminderFlags.add(Task.NOTIFY_AFTER_DEADLINE);
         reminderFlags.add(Task.NOTIFY_AT_DEADLINE);
         reminderFlags.add(Task.NOTIFY_MODE_NONSTOP);
 
         // assert no duplicates
-        assertEquals(new TreeSet<Integer>(reminderFlags).size(),
+        assertEquals(new TreeSet<>(reminderFlags).size(),
                 reminderFlags.size());
     }
 

astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java

@@ -170,7 +170,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
             result += DateUtilities.ONE_WEEK * rrule.getInterval();
             return result;
         }
-        HashSet<Weekday> weekdays = new HashSet<Weekday>();
+        HashSet<Weekday> weekdays = new HashSet<>();
         for (WeekdayNum curr : weekdayNums) {
             weekdays.add(curr.wday);
         }
@@ -361,7 +361,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
         int interval = 1;
         rrule.setInterval(interval);
-        List<WeekdayNum> weekdays = new ArrayList<WeekdayNum>();
+        List<WeekdayNum> weekdays = new ArrayList<>();
         weekdays.add(new WeekdayNum(0, Weekday.MO));
         weekdays.add(new WeekdayNum(0, Weekday.WE));
         rrule.setByDay(weekdays);
@@ -374,7 +374,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
         int interval = 1;
         rrule.setInterval(interval);
-        List<WeekdayNum> weekdays = new ArrayList<WeekdayNum>();
+        List<WeekdayNum> weekdays = new ArrayList<>();
         weekdays.add(new WeekdayNum(0, Weekday.MO));
         weekdays.add(new WeekdayNum(0, Weekday.WE));
         rrule.setByDay(weekdays);

astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java

@@ -70,7 +70,7 @@ public class QuickAddMarkupTest extends DatabaseTestCase {
     // --- helpers
 
     private Task task;
-    private final ArrayList<String> tags = new ArrayList<String>();
+    private final ArrayList<String> tags = new ArrayList<>();
 
     private void assertTagsAre(String... expectedTags) {
         List<String> expected = Arrays.asList(expectedTags);

astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java

@@ -548,7 +548,7 @@ public class TitleParserTest extends DatabaseTestCase {
         for (String acceptedString : acceptedStrings) {
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance.
-            ArrayList<String> tags = new ArrayList<String>();
+            ArrayList<String> tags = new ArrayList<>();
             TitleParser.listHelper(task, tags);
             String tag = TitleParser.trimParenthesis(acceptedString);
             assertTrue("test pound at failed for string: " + acceptedString + " for tags: " + tags.toString(), tags.contains(tag));
@@ -567,7 +567,7 @@ public class TitleParserTest extends DatabaseTestCase {
         for (String acceptedString : acceptedStrings) {
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance.
-            ArrayList<String> tags = new ArrayList<String>();
+            ArrayList<String> tags = new ArrayList<>();
             TitleParser.listHelper(task, tags);
             String tag = TitleParser.trimParenthesis(acceptedString);
             assertTrue("testTagsAt failed for string: " + acceptedString+ " for tags: " + tags.toString(), tags.contains(tag));

astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java

@@ -91,7 +91,7 @@ public class AstridChronic {
     tokens = Separator.scan(tokens, options);
     tokens = TimeZone.scan(tokens, options);
 
-    List<Token> taggedTokens = new LinkedList<Token>();
+    List<Token> taggedTokens = new LinkedList<>();
     for (Token token : tokens) {
       if (token.isTagged()) {
         taggedTokens.add(token);
@@ -156,7 +156,7 @@ public class AstridChronic {
    */
   protected static List<Token> baseTokenize(String text) {
     String[] words = text.split(" ");
-    List<Token> tokens = new LinkedList<Token>();
+    List<Token> tokens = new LinkedList<>();
     for (String word : words) {
       tokens.add(new Token(word));
     }

astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java

@@ -39,7 +39,7 @@ public class ActFmCameraModule {
     }
 
     public static void showPictureLauncher(final Fragment fragment, final ClearImageCallback clearImageOption) {
-        ArrayList<String> options = new ArrayList<String>();
+        ArrayList<String> options = new ArrayList<>();
 
         final Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         PackageManager pm = fragment.getActivity().getPackageManager();
@@ -54,7 +54,7 @@ public class ActFmCameraModule {
             options.add(fragment.getString(R.string.actfm_picture_clear));
         }
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(fragment.getActivity(),
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(fragment.getActivity(),
                 android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()]));
 
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {

astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java

@@ -72,13 +72,13 @@ public class ActFmGoogleAuthActivity extends ListActivity {
 
         accountManager = new GoogleAccountManager(this);
         Account[] accounts = accountManager.getAccounts();
-        ArrayList<String> accountNames = new ArrayList<String>();
+        ArrayList<String> accountNames = new ArrayList<>();
         for (Account a : accounts) {
             accountNames.add(a.name);
         }
 
         nameArray = accountNames.toArray(new String[accountNames.size()]);
-        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, nameArray));
+        setListAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, nameArray));
         findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java

@@ -52,10 +52,10 @@ public class NameMaps {
 
     static {
         // Hardcoded local columns mapped to corresponding server names
-        TASK_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
-        TASK_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
-        TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
-        TASK_PROPERTIES_EXCLUDED = new HashSet<String>();
+        TASK_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>();
+        TASK_PROPERTIES_EXCLUDED = new HashSet<>();
 
         putTaskPropertyToServerName(Task.TITLE,           "title",          true);
         putTaskPropertyToServerName(Task.IMPORTANCE,      "importance",     true);
@@ -90,10 +90,10 @@ public class NameMaps {
     }
     static {
         // Hardcoded local columns mapped to corresponding server names
-        TAG_DATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
-        TAG_DATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
-        TAG_DATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
-        TAG_PROPERTIES_EXCLUDED = new HashSet<String>();
+        TAG_DATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>();
+        TAG_DATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
+        TAG_DATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>();
+        TAG_PROPERTIES_EXCLUDED = new HashSet<>();
 
         putTagPropertyToServerName(TagData.USER_ID,         "user_id",      true);
         putTagPropertyToServerName(TagData.NAME,            "name",         true);
@@ -120,10 +120,10 @@ public class NameMaps {
     }
 
     static {
-        USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
-        USER_ACTIVITY_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
-        USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
-        USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet<String>();
+        USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>();
+        USER_ACTIVITY_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>();
+        USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
+        USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet<>();
 
         putUserActivityPropertyToServerName(UserActivity.UUID,        "uuid",        false);
         putUserActivityPropertyToServerName(UserActivity.USER_UUID,   "user_id",     false);
@@ -150,10 +150,10 @@ public class NameMaps {
     }
 
     static {
-        TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
-        TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
-        TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
-        TASK_ATTACHMENT_PROPERTIES_EXCLUDED = new HashSet<String>();
+        TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>();
+        TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_ATTACHMENT_PROPERTIES_EXCLUDED = new HashSet<>();
 
         putTaskAttachmentPropertyToServerName(TaskAttachment.UUID,         "uuid",         false);
         putTaskAttachmentPropertyToServerName(TaskAttachment.USER_UUID,    "user_id",      false);
@@ -180,10 +180,10 @@ public class NameMaps {
     }
 
     static {
-        TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
-        TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
-        TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
-        TASK_LIST_METADATA_PROPERTIES_EXCLUDED = new HashSet<String>();
+        TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>();
+        TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<>();
+        TASK_LIST_METADATA_PROPERTIES_EXCLUDED = new HashSet<>();
 
         putTaskListMetadataPropertyToServerName(TaskListMetadata.UUID,          "uuid",          false);
         putTaskListMetadataPropertyToServerName(TaskListMetadata.TAG_UUID,      "tag_id",        true);

astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java

@@ -100,7 +100,7 @@ public class BeastModePreferences extends ListActivity {
         setContentView(R.layout.beast_mode_pref_activity);
         setTitle(R.string.EPr_beastMode_desc);
 
-        prefsToDescriptions = new HashMap<String, String>();
+        prefsToDescriptions = new HashMap<>();
         buildDescriptionMap(getResources());
 
         TouchListView touchList = (TouchListView) getListView();
@@ -171,7 +171,7 @@ public class BeastModePreferences extends ListActivity {
 
     public static ArrayList<String> constructOrderedControlList(Context context) {
         String order = Preferences.getStringValue(BEAST_MODE_ORDER_PREF);
-        ArrayList<String> list = new ArrayList<String>();
+        ArrayList<String> list = new ArrayList<>();
         String[] itemsArray;
         if (order == null) {
             itemsArray = context.getResources().getStringArray(R.array.TEA_control_sets_prefs);

astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java

@@ -185,7 +185,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         startActivity(intent);
     }
 
-    private static final HashMap<Class<?>, Integer> PREFERENCE_REQUEST_CODES = new HashMap<Class<?>, Integer>();
+    private static final HashMap<Class<?>, Integer> PREFERENCE_REQUEST_CODES = new HashMap<>();
     static {
         PREFERENCE_REQUEST_CODES.put(SyncProviderPreferences.class, REQUEST_CODE_SYNC);
     }
@@ -196,7 +196,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         List<ResolveInfo> resolveInfoList = pm.queryIntentActivities(queryIntent,
                 PackageManager.GET_META_DATA);
         LinkedHashMap<String, ArrayList<Preference>> categoryPreferences =
-            new LinkedHashMap<String, ArrayList<Preference>>();
+            new LinkedHashMap<>();
 
         // Loop through a list of all packages (including plugins, addons)
         // that have a settings action

astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java

@@ -189,7 +189,7 @@ public class FilterListFragment extends ListFragment {
                     final Filter filter = adapter.getItem(position);
                     final String[] labels = filter.contextMenuLabels;
                     final Intent[] intents = filter.contextMenuIntents;
-                    ArrayAdapter<String> intentAdapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1);
+                    ArrayAdapter<String> intentAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1);
                     intentAdapter.add(getString(R.string.FLA_context_shortcut));
                     for (String l : labels) {
                         intentAdapter.add(l);

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -184,7 +184,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     private EditText title;
     private EditNoteActivity editNotes;
     private ViewPager mPager;
-    private HashMap<String, TaskEditControlSet> controlSetMap = new HashMap<String, TaskEditControlSet>();
+    private HashMap<String, TaskEditControlSet> controlSetMap = new HashMap<>();
 
     private final List<TaskEditControlSet> controls = Collections.synchronizedList(new ArrayList<TaskEditControlSet>());
 
@@ -353,7 +353,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         constructWhenDialog(whenDialogView);
 
-        controlSetMap = new HashMap<String, TaskEditControlSet>();
+        controlSetMap = new HashMap<>();
 
         // populate control set
         EditTitleControlSet editTitle = new EditTitleControlSet(getActivity(),
@@ -829,11 +829,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     }
 
     private void startAttachFile() {
-        ArrayList<String> options = new ArrayList<String>();
+        ArrayList<String> options = new ArrayList<>();
         options.add(getString(R.string.file_add_picture));
         options.add(getString(R.string.file_add_sdcard));
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
                 android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()]));
 
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
@@ -893,7 +893,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     private void attachImage(Bitmap bitmap) {
 
-        AtomicReference<String> nameRef = new AtomicReference<String>();
+        AtomicReference<String> nameRef = new AtomicReference<>();
         String path = FileUtilities.getNewImageAttachmentPath(getActivity(), nameRef);
 
         try {

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java

@@ -23,7 +23,7 @@ public class TaskEditViewPager extends PagerAdapter {
     public static final int TAB_SHOW_ACTIVITY = 1;
 
     public TaskEditViewPager(Context context, int tabStyleMask) {
-        ArrayList<String> titleList = new ArrayList<String>();
+        ArrayList<String> titleList = new ArrayList<>();
         if ((tabStyleMask & TAB_SHOW_ACTIVITY) > 0) {
             titleList.add(context.getString(R.string.TEA_tab_activity));
         }

astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java

@@ -159,7 +159,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList
     protected TaskAdapter taskAdapter = null;
     protected DetailReceiver detailReceiver = new DetailReceiver();
     protected RefreshReceiver refreshReceiver = new RefreshReceiver();
-    protected final AtomicReference<String> sqlQueryTemplate = new AtomicReference<String>();
+    protected final AtomicReference<String> sqlQueryTemplate = new AtomicReference<>();
     protected SyncActionHelper syncActionHelper;
     protected Filter filter;
     protected int sortFlags;

astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -122,7 +122,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         this.layout = rowLayout;
         this.skipIntentFilters = skipIntentFilters;
         this.selectable = selectable;
-        this.filterCounts = new HashMap<Filter, Integer>();
+        this.filterCounts = new HashMap<>();
 
         inflater = (LayoutInflater) activity.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);

astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -189,7 +189,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     protected final Context context;
     protected final TaskListFragment fragment;
     protected final Resources resources;
-    protected final HashMap<Object, Boolean> completedItems = new HashMap<Object, Boolean>(0);
+    protected final HashMap<Object, Boolean> completedItems = new HashMap<>(0);
     protected OnCompletedTaskListener onCompletedTaskListener = null;
     protected final int resource;
     protected final LayoutInflater inflater;
@@ -563,7 +563,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     protected TaskRowListener listener = new TaskRowListener();
 
-    private Pair<Float, Float> lastTouchYRawY = new Pair<Float, Float>(0f, 0f);
+    private Pair<Float, Float> lastTouchYRawY = new Pair<>(0f, 0f);
 
     /**
      * Set listeners for this view. This is called once per view when it is
@@ -576,7 +576,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         OnTouchListener otl = new OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                lastTouchYRawY = new Pair<Float, Float>(event.getY(), event.getRawY());
+                lastTouchYRawY = new Pair<>(event.getY(), event.getRawY());
                 return false;
             }
         };
@@ -655,7 +655,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * ============================================================== details
      * ====================================================================== */
 
-    private final HashMap<String, Spanned> htmlCache = new HashMap<String, Spanned>(8);
+    private final HashMap<String, Spanned> htmlCache = new HashMap<>(8);
 
     private Spanned convertToHtml(String string, ImageGetter imageGetter) {
         if(!htmlCache.containsKey(string)) {
@@ -671,7 +671,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         return htmlCache.get(string);
     }
 
-    private final HashMap<Long, String> dateCache = new HashMap<Long, String>(8);
+    private final HashMap<Long, String> dateCache = new HashMap<>(8);
 
     private String formatDate(long date) {
         if(dateCache.containsKey(date)) {
@@ -812,18 +812,23 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     private final ImageGetter detailImageGetter = new ImageGetter() {
         private final HashMap<Integer, Drawable> cache =
-            new HashMap<Integer, Drawable>(3);
+            new HashMap<>(3);
         @Override
         public Drawable getDrawable(String source) {
             int drawable = 0;
-            if(source.equals("silk_clock")) {
-                drawable = R.drawable.details_alarm;
-            } else if(source.equals("silk_tag_pink")) {
-                drawable = R.drawable.details_tag;
-            } else if(source.equals("silk_date")) {
-                drawable = R.drawable.details_repeat;
-            } else if(source.equals("silk_note")) {
-                drawable = R.drawable.details_note;
+            switch (source) {
+                case "silk_clock":
+                    drawable = R.drawable.details_alarm;
+                    break;
+                case "silk_tag_pink":
+                    drawable = R.drawable.details_tag;
+                    break;
+                case "silk_date":
+                    drawable = R.drawable.details_repeat;
+                    break;
+                case "silk_note":
+                    drawable = R.drawable.details_note;
+                    break;
             }
 
             if (drawable == 0) {

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java

@@ -81,7 +81,7 @@ public final class AlarmControlSet extends TaskEditControlSet {
 
     @Override
     protected void writeToModelAfterInitialized(Task task) {
-        LinkedHashSet<Long> alarms = new LinkedHashSet<Long>();
+        LinkedHashSet<Long> alarms = new LinkedHashSet<>();
         for(int i = 0; i < alertsContainer.getChildCount(); i++) {
             Long dateValue = (Long) alertsContainer.getChildAt(i).getTag();
             if(dateValue == null) {

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java

@@ -72,7 +72,7 @@ public class AlarmService {
     public boolean synchronizeAlarms(final long taskId, LinkedHashSet<Long> alarms) {
         MetadataService service = PluginServices.getMetadataService();
 
-        ArrayList<Metadata> metadata = new ArrayList<Metadata>();
+        ArrayList<Metadata> metadata = new ArrayList<>();
         for(Long alarm : alarms) {
             Metadata item = new Metadata();
             item.setValue(Metadata.KEY, AlarmFields.METADATA_KEY);

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java

@@ -43,7 +43,7 @@ public class AlarmTaskRepeatListener extends BroadcastReceiver {
             }
 
             Metadata metadata = new Metadata();
-            LinkedHashSet<Long> alarms = new LinkedHashSet<Long>(cursor.getCount());
+            LinkedHashSet<Long> alarms = new LinkedHashSet<>(cursor.getCount());
             for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 metadata.readFromCursor(cursor);
                 alarms.add(metadata.getValue(AlarmFields.TIME) + (newDueDate - oldDueDate));

astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java

@@ -285,11 +285,7 @@ public class TasksXmlExporter {
                 xml.attribute(null, property.name, valueString);
             } catch (UnsupportedOperationException e) {
                 // didn't read this value, do nothing
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalStateException e) {
-                throw new RuntimeException(e);
-            } catch (IOException e) {
+            } catch (IllegalArgumentException | IOException | IllegalStateException e) {
                 throw new RuntimeException(e);
             }
             return null;
@@ -303,11 +299,7 @@ public class TasksXmlExporter {
                 xml.attribute(null, property.name, valueString);
             } catch (UnsupportedOperationException e) {
                 // didn't read this value, do nothing
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalStateException e) {
-                throw new RuntimeException(e);
-            } catch (IOException e) {
+            } catch (IllegalArgumentException | IOException | IllegalStateException e) {
                 throw new RuntimeException(e);
             }
             return null;
@@ -323,11 +315,7 @@ public class TasksXmlExporter {
                 xml.attribute(null, property.name, value);
             } catch (UnsupportedOperationException e) {
                 // didn't read this value, do nothing
-            } catch (IllegalArgumentException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalStateException e) {
-                throw new RuntimeException(e);
-            } catch (IOException e) {
+            } catch (IllegalArgumentException | IOException | IllegalStateException e) {
                 throw new RuntimeException(e);
             }
             return null;

astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java

@@ -121,10 +121,7 @@ public class TasksXmlImporter {
             public void run() {
                 try {
                     performImport();
-                } catch (IOException e) {
-                    exceptionService.displayAndReportError(context,
-                            context.getString(R.string.backup_TXI_error), e);
-                } catch (XmlPullParserException e) {
+                } catch (IOException | XmlPullParserException e) {
                     exceptionService.displayAndReportError(context,
                             context.getString(R.string.backup_TXI_error), e);
                 }
@@ -391,12 +388,16 @@ public class TasksXmlImporter {
                 }
 
                 try {
-                    if (tag.equals(BackupConstants.TASK_TAG)) {
-                        parseTask();
-                    } else if (tag.equals(BackupConstants.METADATA_TAG)) {
-                        parseMetadata(3);
-                    } else if (tag.equals(BackupConstants.TAGDATA_TAG)) {
-                        parseTagdata();
+                    switch (tag) {
+                        case BackupConstants.TASK_TAG:
+                            parseTask();
+                            break;
+                        case BackupConstants.METADATA_TAG:
+                            parseMetadata(3);
+                            break;
+                        case BackupConstants.TAGDATA_TAG:
+                            parseTagdata();
+                            break;
                     }
                 } catch (Exception e) {
                     errorCount++;
@@ -424,7 +425,7 @@ public class TasksXmlImporter {
         private String upgradeNotes = null;
         private boolean syncOnComplete = false;
 
-        private final LinkedHashSet<String> tags = new LinkedHashSet<String>();
+        private final LinkedHashSet<String> tags = new LinkedHashSet<>();
 
         public Format1TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException {
             this.xpp = xpp;
@@ -551,101 +552,102 @@ public class TasksXmlImporter {
 
         /** helper method to set field on a task */
         private boolean setTaskField(Task task, String field, String value) {
-            if(field.equals(LegacyTaskModel.ID)) {
-                // ignore
-            }
-            else if(field.equals(LegacyTaskModel.NAME)) {
-                task.setValue(Task.TITLE, value);
-            }
-            else if(field.equals(LegacyTaskModel.NOTES)) {
-                task.setValue(Task.NOTES, value);
-            }
-            else if(field.equals(LegacyTaskModel.PROGRESS_PERCENTAGE)) {
-                // ignore
-            }
-            else if(field.equals(LegacyTaskModel.IMPORTANCE)) {
-                task.setValue(Task.IMPORTANCE, LegacyImportance.valueOf(value).ordinal());
-            }
-            else if(field.equals(LegacyTaskModel.ESTIMATED_SECONDS)) {
-                task.setValue(Task.ESTIMATED_SECONDS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.ELAPSED_SECONDS)) {
-                task.setValue(Task.ELAPSED_SECONDS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.TIMER_START)) {
-                task.setValue(Task.TIMER_START,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.DEFINITE_DUE_DATE)) {
-                String preferred = xpp.getAttributeValue(null, LegacyTaskModel.PREFERRED_DUE_DATE);
-                if(preferred != null) {
-                    Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value);
-                    upgradeNotes = "Project Deadline: " +
-                            DateUtilities.getDateString(preferredDate);
-                }
-                task.setValue(Task.DUE_DATE,
-                        BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.PREFERRED_DUE_DATE)) {
-                String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE);
-                if(definite != null) {
-                    // handled above
-                } else {
+            switch (field) {
+                case LegacyTaskModel.ID:
+                    // ignore
+                    break;
+                case LegacyTaskModel.NAME:
+                    task.setValue(Task.TITLE, value);
+                    break;
+                case LegacyTaskModel.NOTES:
+                    task.setValue(Task.NOTES, value);
+                    break;
+                case LegacyTaskModel.PROGRESS_PERCENTAGE:
+                    // ignore
+                    break;
+                case LegacyTaskModel.IMPORTANCE:
+                    task.setValue(Task.IMPORTANCE, LegacyImportance.valueOf(value).ordinal());
+                    break;
+                case LegacyTaskModel.ESTIMATED_SECONDS:
+                    task.setValue(Task.ESTIMATED_SECONDS, Integer.parseInt(value));
+                    break;
+                case LegacyTaskModel.ELAPSED_SECONDS:
+                    task.setValue(Task.ELAPSED_SECONDS, Integer.parseInt(value));
+                    break;
+                case LegacyTaskModel.TIMER_START:
+                    task.setValue(Task.TIMER_START,
+                            BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                    break;
+                case LegacyTaskModel.DEFINITE_DUE_DATE:
+                    String preferred = xpp.getAttributeValue(null, LegacyTaskModel.PREFERRED_DUE_DATE);
+                    if (preferred != null) {
+                        Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value);
+                        upgradeNotes = "Project Deadline: " +
+                                DateUtilities.getDateString(preferredDate);
+                    }
                     task.setValue(Task.DUE_DATE,
                             BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime());
-                }
-            }
-            else if(field.equals(LegacyTaskModel.HIDDEN_UNTIL)) {
-                task.setValue(Task.HIDE_UNTIL,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.BLOCKING_ON)) {
-                // ignore
-            }
-            else if(field.equals(LegacyTaskModel.POSTPONE_COUNT)) {
-                task.setValue(Task.POSTPONE_COUNT, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.NOTIFICATIONS)) {
-                task.setValue(Task.REMINDER_PERIOD, Integer.parseInt(value) * 1000L);
-            }
-            else if(field.equals(LegacyTaskModel.CREATION_DATE)) {
-                task.setValue(Task.CREATION_DATE,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.COMPLETION_DATE)) {
-                String completion = xpp.getAttributeValue(null, LegacyTaskModel.PROGRESS_PERCENTAGE);
-                if("100".equals(completion)) {
-                    task.setValue(Task.COMPLETION_DATE,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
-                }
-            }
-            else if(field.equals(LegacyTaskModel.NOTIFICATION_FLAGS)) {
-                task.setValue(Task.REMINDER_FLAGS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.LAST_NOTIFIED)) {
-                task.setValue(Task.REMINDER_LAST,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals("repeat_interval")) {
-                // handled below
-            }
-            else if(field.equals("repeat_value")) {
-                int repeatValue = Integer.parseInt(value);
-                String repeatInterval = xpp.getAttributeValue(null, "repeat_interval");
-                if(repeatValue > 0 && repeatInterval != null) {
-                    LegacyRepeatInterval interval = LegacyRepeatInterval.valueOf(repeatInterval);
-                    LegacyRepeatInfo repeatInfo = new LegacyRepeatInfo(interval, repeatValue);
-                    RRule rrule = repeatInfo.toRRule();
-                    task.setValue(Task.RECURRENCE, rrule.toIcal());
-                }
-            }
-            else if(field.equals(LegacyTaskModel.FLAGS)) {
-                if(Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE) {
-                    syncOnComplete = true;
-                }
-            }
-            else {
-                return false;
+                    break;
+                case LegacyTaskModel.PREFERRED_DUE_DATE:
+                    String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE);
+                    if (definite != null) {
+                        // handled above
+                    } else {
+                        task.setValue(Task.DUE_DATE,
+                                BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime());
+                    }
+                    break;
+                case LegacyTaskModel.HIDDEN_UNTIL:
+                    task.setValue(Task.HIDE_UNTIL,
+                            BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                    break;
+                case LegacyTaskModel.BLOCKING_ON:
+                    // ignore
+                    break;
+                case LegacyTaskModel.POSTPONE_COUNT:
+                    task.setValue(Task.POSTPONE_COUNT, Integer.parseInt(value));
+                    break;
+                case LegacyTaskModel.NOTIFICATIONS:
+                    task.setValue(Task.REMINDER_PERIOD, Integer.parseInt(value) * 1000L);
+                    break;
+                case LegacyTaskModel.CREATION_DATE:
+                    task.setValue(Task.CREATION_DATE,
+                            BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                    break;
+                case LegacyTaskModel.COMPLETION_DATE:
+                    String completion = xpp.getAttributeValue(null, LegacyTaskModel.PROGRESS_PERCENTAGE);
+                    if ("100".equals(completion)) {
+                        task.setValue(Task.COMPLETION_DATE,
+                                BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                    }
+                    break;
+                case LegacyTaskModel.NOTIFICATION_FLAGS:
+                    task.setValue(Task.REMINDER_FLAGS, Integer.parseInt(value));
+                    break;
+                case LegacyTaskModel.LAST_NOTIFIED:
+                    task.setValue(Task.REMINDER_LAST,
+                            BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                    break;
+                case "repeat_interval":
+                    // handled below
+                    break;
+                case "repeat_value":
+                    int repeatValue = Integer.parseInt(value);
+                    String repeatInterval = xpp.getAttributeValue(null, "repeat_interval");
+                    if (repeatValue > 0 && repeatInterval != null) {
+                        LegacyRepeatInterval interval = LegacyRepeatInterval.valueOf(repeatInterval);
+                        LegacyRepeatInfo repeatInfo = new LegacyRepeatInfo(interval, repeatValue);
+                        RRule rrule = repeatInfo.toRRule();
+                        task.setValue(Task.RECURRENCE, rrule.toIcal());
+                    }
+                    break;
+                case LegacyTaskModel.FLAGS:
+                    if (Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE) {
+                        syncOnComplete = true;
+                    }
+                    break;
+                default:
+                    return false;
             }
 
             return true;

astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java

@@ -57,7 +57,7 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
 
     private FilterListItem[] prepareFilters(Resources r) {
         // core filters
-        List<FilterListItem> filters = new ArrayList<FilterListItem>(3);
+        List<FilterListItem> filters = new ArrayList<>(3);
 
         filters.add(buildInboxFilter(r));
         if (Preferences.getBoolean(R.string.p_show_today_filter, true)) {

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -168,7 +168,7 @@ public class CustomFilterActivity extends ActionBarActivity {
         populateCriteria();
 
         filterName = (TextView)findViewById(R.id.filterName);
-        List<CriterionInstance> startingCriteria = new ArrayList<CriterionInstance>();
+        List<CriterionInstance> startingCriteria = new ArrayList<>();
         startingCriteria.add(getStartingUniverse());
         adapter = new CustomFilterAdapter(this, startingCriteria);
         listView.setAdapter(adapter);

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java

@@ -113,7 +113,7 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
         if(item.criterion instanceof MultipleSelectCriterion) {
             MultipleSelectCriterion multiSelectCriterion = (MultipleSelectCriterion) item.criterion;
             final String[] titles = multiSelectCriterion.entryTitles;
-            ArrayAdapter<String> adapter = new ArrayAdapter<String>(activity,
+            ArrayAdapter<String> adapter = new ArrayAdapter<>(activity,
                     android.R.layout.simple_spinner_dropdown_item, titles);
             DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
                 @Override

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java

@@ -74,7 +74,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                     StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
         }
         try {
-            ArrayList<Filter> list = new ArrayList<Filter>();
+            ArrayList<Filter> list = new ArrayList<>();
 
             // stock filters
             if (Preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) {

astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java

@@ -114,7 +114,7 @@ public class LinkActionExposer {
         return new TaskAction(PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon);
     }
 
-    private static final HashMap<Integer, BitmapDrawable> IMAGE_CACHE = new HashMap<Integer, BitmapDrawable>();
+    private static final HashMap<Integer, BitmapDrawable> IMAGE_CACHE = new HashMap<>();
 
     private static BitmapDrawable getBitmapDrawable(int resId, Resources resources) {
         if (IMAGE_CACHE.containsKey(resId)) {

astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java

@@ -79,7 +79,7 @@ public class MetadataDao extends DatabaseDao<Metadata> {
      */
     public void synchronizeMetadata(long taskId, ArrayList<Metadata> metadata,
             Criterion metadataCriteria) {
-        HashSet<ContentValues> newMetadataValues = new HashSet<ContentValues>();
+        HashSet<ContentValues> newMetadataValues = new HashSet<>();
         for(Metadata metadatum : metadata) {
             metadatum.setValue(Metadata.TASK, taskId);
             metadatum.clearValue(Metadata.ID);
@@ -142,7 +142,7 @@ public class MetadataDao extends DatabaseDao<Metadata> {
         Query sql = Query.select(properties).from(Metadata.TABLE).join(Join.left(Task.TABLE,
                 Metadata.TASK.eq(Task.ID))).where(Task.TITLE.isNull());
         Cursor cursor = database.rawQuery(sql.toString());
-        return new TodorooCursor<Metadata>(cursor, properties);
+        return new TodorooCursor<>(cursor, properties);
     }
 }
 

astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java

@@ -49,7 +49,7 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
         TodorooCursor<RTYPE> cursor = query(
                 Query.select(properties).where(RemoteModel.UUID_PROPERTY.eq(uuid)));
         cursor.moveToFirst();
-        return new TodorooCursor<RTYPE>(cursor, properties);
+        return new TodorooCursor<>(cursor, properties);
     }
 
     public String uuidFromLocalId(long localId) {

astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java

@@ -89,10 +89,10 @@ public class TagMetadataDao extends DatabaseDao<TagMetadata> {
 
     public void synchronizeMembers(TagData tagData, String legacyMembersString, String tagUuid, JSONArray members) {
         long tagId = tagData.getId();
-        Set<String> emails = new HashSet<String>();
-        Set<String> ids = new HashSet<String>();
+        Set<String> emails = new HashSet<>();
+        Set<String> ids = new HashSet<>();
 
-        HashMap<String, String> idToEmail = new HashMap<String, String>();
+        HashMap<String, String> idToEmail = new HashMap<>();
 
         for (int i = 0; i < members.length(); i++) {
             JSONObject person = members.optJSONObject(i);

astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java

@@ -87,7 +87,7 @@ public class AACRecordingActivity extends Activity implements AACRecorderCallbac
     public void encodingFinished() {
         try {
 
-            AtomicReference<String> nameRef = new AtomicReference<String>();
+            AtomicReference<String> nameRef = new AtomicReference<>();
             String outFile = FileUtilities.getNewAudioAttachmentPath(this, nameRef);
 
             new AACToM4A().convert(this, tempFile, outFile);

astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java

@@ -37,7 +37,7 @@ import java.util.ArrayList;
 public class FileExplore extends Activity {
 
 	// Stores names of traversed directories
-	ArrayList<String> str = new ArrayList<String>();
+	ArrayList<String> str = new ArrayList<>();
 
 	// Check if the first level of the directory structure is the one showing
 	private Boolean firstLvl = true;

astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java

@@ -57,7 +57,7 @@ public class FilesControlSet extends PopupControlSet {
     @Autowired
     private TaskAttachmentDao taskAttachmentDao;
 
-    private final ArrayList<TaskAttachment> files = new ArrayList<TaskAttachment>();
+    private final ArrayList<TaskAttachment> files = new ArrayList<>();
     private final LinearLayout fileDisplayList;
     private final LayoutInflater inflater;
     private final ImageView image;

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java

@@ -113,11 +113,11 @@ public class CalendarAlarmReceiver extends BroadcastReceiver {
                         int emailIndex = attendees.getColumnIndexOrThrow(Calendars.ATTENDEES_EMAIL_COL);
                         int nameIndex = attendees.getColumnIndexOrThrow(Calendars.ATTENDEES_NAME_COL);
 
-                        ArrayList<String> names = new ArrayList<String>();
-                        ArrayList<String> emails = new ArrayList<String>();
+                        ArrayList<String> names = new ArrayList<>();
+                        ArrayList<String> emails = new ArrayList<>();
 
                         Account[] accountArray = AccountManager.get(context).getAccounts();
-                        Set<String> phoneAccounts = new HashSet<String>();
+                        Set<String> phoneAccounts = new HashSet<>();
                         for (Account a : accountArray) {
                             phoneAccounts.add(a.name);
                         }

astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java

@@ -71,12 +71,13 @@ public class Calendars {
 	}
 
 	private static Uri getIcsUri(String table) {
-	    if (CALENDAR_CONTENT_CALENDARS.equals(table)) {
-            return CalendarContract.Calendars.CONTENT_URI;
-        } else if (CALENDAR_CONTENT_EVENTS.equals(table)) {
-            return CalendarContract.Events.CONTENT_URI;
-        } else if (CALENDAR_CONTENT_ATTENDEES.equals(table)) {
-            return CalendarContract.Attendees.CONTENT_URI;
+        switch (table) {
+            case CALENDAR_CONTENT_CALENDARS:
+                return CalendarContract.Calendars.CONTENT_URI;
+            case CALENDAR_CONTENT_EVENTS:
+                return CalendarContract.Events.CONTENT_URI;
+            case CALENDAR_CONTENT_ATTENDEES:
+                return CalendarContract.Attendees.CONTENT_URI;
         }
 	    return null;
 	}
@@ -179,11 +180,11 @@ public class Calendars {
 
         int currentSettingIndex = -1;
 
-        ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
+        ArrayList<CharSequence> entries = new ArrayList<>();
         entries.addAll(Arrays.asList(r.getStringArray(R.array.EPr_default_addtocalendar)));
         entries.addAll(Arrays.asList(calendars.calendars));
 
-        ArrayList<CharSequence> entryValues = new ArrayList<CharSequence>();
+        ArrayList<CharSequence> entryValues = new ArrayList<>();
         entryValues.addAll(Arrays.asList(r.getStringArray(R.array.EPr_default_addtocalendar_values)));
         entryValues.addAll(Arrays.asList(calendars.calendarIds));
 

astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -73,11 +73,11 @@ public class GCalControlSet extends PopupControlSet {
         ((LinearLayout) getDisplayView()).addView(getView()); //hack for spinner
 
         this.calendarSelector = (Spinner) getView().findViewById(R.id.calendars);
-        ArrayList<String> items = new ArrayList<String>();
+        ArrayList<String> items = new ArrayList<>();
         Collections.addAll(items, calendars.calendars);
         items.add(0, activity.getString(R.string.gcal_TEA_nocal));
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(activity,
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(activity,
                 android.R.layout.simple_spinner_item, items.toArray(new String[items.size()]));
 
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java

@@ -55,7 +55,7 @@ public class GtasksListFragment extends SubtasksListFragment {
 
     @Override
     protected OrderedListFragmentHelperInterface<?> createFragmentHelper() {
-        return new OrderedMetadataListFragmentHelper<StoreObject>(this, gtasksTaskListUpdater);
+        return new OrderedMetadataListFragmentHelper<>(this, gtasksTaskListUpdater);
     }
 
     @Override

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java

@@ -76,7 +76,7 @@ public class GtasksListService {
     public synchronized void updateLists(TaskLists remoteLists) {
         readLists();
 
-        HashSet<Long> previousLists = new HashSet<Long>(lists.length);
+        HashSet<Long> previousLists = new HashSet<>(lists.length);
         for(StoreObject list : lists) {
             previousLists.add(list.getId());
         }

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java

@@ -107,7 +107,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
     @Override
     protected TodorooCursor<Task> filterLocallyUpdated(TodorooCursor<Task> tasks, long lastSyncDate) {
-        HashSet<Long> taskIds = new HashSet<Long>();
+        HashSet<Long> taskIds = new HashSet<>();
         for(tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) {
             taskIds.add(tasks.get(Task.ID));
         }
@@ -182,7 +182,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
     public String getRemoteSiblingId(String listId, Metadata gtasksMetadata) {
         final AtomicInteger indentToMatch = new AtomicInteger(gtasksMetadata.getValue(GtasksMetadata.INDENT));
         final AtomicLong parentToMatch = new AtomicLong(gtasksMetadata.getValue(GtasksMetadata.PARENT_TASK));
-        final AtomicReference<String> sibling = new AtomicReference<String>();
+        final AtomicReference<String> sibling = new AtomicReference<>();
         OrderedListIterator iterator = new OrderedListIterator() {
             @Override
             public void processTask(long taskId, Metadata metadata) {

astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java

@@ -32,13 +32,13 @@ import java.util.concurrent.atomic.AtomicLong;
 public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObject> {
 
     /** map of task -> parent task */
-    final HashMap<Long, Long> parents = new HashMap<Long, Long>();
+    final HashMap<Long, Long> parents = new HashMap<>();
 
     /** map of task -> prior sibling */
-    final HashMap<Long, Long> siblings = new HashMap<Long, Long>();
+    final HashMap<Long, Long> siblings = new HashMap<>();
 
     final HashMap<Long, String> localToRemoteIdMap =
-        new HashMap<Long, String>();
+        new HashMap<>();
 
     @Autowired private GtasksListService gtasksListService;
     @Autowired private GtasksMetadataService gtasksMetadataService;

astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java

@@ -82,14 +82,14 @@ public class GtasksLoginActivity extends ListActivity {
 
         accountManager = new GoogleAccountManager(this);
         Account[] accounts = accountManager.getAccounts();
-        ArrayList<String> accountNames = new ArrayList<String>();
+        ArrayList<String> accountNames = new ArrayList<>();
         for (Account a : accounts) {
             accountNames.add(a.name);
         }
 
         nameArray = accountNames.toArray(new String[accountNames.size()]);
 
-        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, nameArray));
+        setListAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, nameArray));
         findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java

@@ -48,7 +48,7 @@ public final class GtasksSyncService {
         DependencyInjectionService.getInstance().inject(this);
     }
 
-    private final LinkedBlockingQueue<SyncOnSaveOperation> operationQueue = new LinkedBlockingQueue<SyncOnSaveOperation>();
+    private final LinkedBlockingQueue<SyncOnSaveOperation> operationQueue = new LinkedBlockingQueue<>();
 
     private abstract class SyncOnSaveOperation {
         abstract public void op(GtasksInvoker invoker) throws IOException;

astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java

@@ -242,7 +242,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
             List<com.google.api.services.tasks.model.Task> tasks = taskList.getItems();
             if (tasks != null) {
                 callback.incrementMax(tasks.size() * 10);
-                HashSet<Long> localIds = new HashSet<Long>(tasks.size());
+                HashSet<Long> localIds = new HashSet<>(tasks.size());
                 for (com.google.api.services.tasks.model.Task t : tasks) {
                     GtasksTaskContainer container = parseRemoteTask(t, listId);
                     gtasksMetadataService.findLocalMatch(container);
@@ -287,7 +287,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     private GtasksTaskContainer parseRemoteTask(com.google.api.services.tasks.model.Task remoteTask, String listId) {
         Task task = new Task();
 
-        ArrayList<Metadata> metadata = new ArrayList<Metadata>();
+        ArrayList<Metadata> metadata = new ArrayList<>();
 
         task.setValue(Task.TITLE, remoteTask.getTitle());
         task.setValue(Task.CREATION_DATE, DateUtilities.now());

astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java

@@ -54,7 +54,7 @@ public class SyncActionHelper {
 
     public static final String PREF_LAST_AUTO_SYNC = "taskListLastAutoSync"; //$NON-NLS-1$
 
-    private final LinkedHashSet<SyncAction> syncActions = new LinkedHashSet<SyncAction>();
+    private final LinkedHashSet<SyncAction> syncActions = new LinkedHashSet<>();
 
     public final SyncResultCallback syncResultCallback;
 
@@ -179,7 +179,7 @@ public class SyncActionHelper {
             PackageManager pm = activity.getPackageManager();
             List<ResolveInfo> resolveInfoList = pm.queryIntentActivities(
                     queryIntent, PackageManager.GET_META_DATA);
-            ArrayList<Intent> syncIntents = new ArrayList<Intent>();
+            ArrayList<Intent> syncIntents = new ArrayList<>();
 
             // Loop through a list of all packages (including plugins, addons)
             // that have a settings action: filter to sync actions
@@ -239,7 +239,7 @@ public class SyncActionHelper {
             return;
         }
 
-        ArrayAdapter<TYPE> adapter = new ArrayAdapter<TYPE>(activity,
+        ArrayAdapter<TYPE> adapter = new ArrayAdapter<>(activity,
                 android.R.layout.simple_spinner_dropdown_item, items);
 
         // show a menu of available options

astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -75,7 +75,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     @Autowired UserActivityDao userActivityDao;
     @Autowired TaskService taskService;
 
-    private final ArrayList<NoteOrUpdate> items = new ArrayList<NoteOrUpdate>();
+    private final ArrayList<NoteOrUpdate> items = new ArrayList<>();
     private EditText commentField;
     private final View commentsBar;
     private View timerView;
@@ -93,7 +93,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private static boolean respondToPicture = false;
 
-    private final List<UpdatesChangedListener> listeners = new LinkedList<UpdatesChangedListener>();
+    private final List<UpdatesChangedListener> listeners = new LinkedList<>();
 
     public interface UpdatesChangedListener {
         public void updatesChanged();

astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java

@@ -179,25 +179,25 @@ public class Astrid3ContentProvider extends ContentProvider {
 
     private UriHelper<?> generateHelper(Uri uri, boolean populateModel) {
         if(uri.toString().startsWith(Task.CONTENT_URI.toString())) {
-            UriHelper<Task> helper = new UriHelper<Task>();
+            UriHelper<Task> helper = new UriHelper<>();
             helper.model = populateModel ? new Task() : null;
             helper.dao = taskDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
         } else if(uri.toString().startsWith(Metadata.CONTENT_URI.toString())) {
-            UriHelper<Metadata> helper = new UriHelper<Metadata>();
+            UriHelper<Metadata> helper = new UriHelper<>();
             helper.model = populateModel ? new Metadata() : null;
             helper.dao = metadataDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
         } else if(uri.toString().startsWith(StoreObject.CONTENT_URI.toString())) {
-            UriHelper<StoreObject> helper = new UriHelper<StoreObject>();
+            UriHelper<StoreObject> helper = new UriHelper<>();
             helper.model = populateModel ? new StoreObject() : null;
             helper.dao = storeObjectDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
         } else if(uri.toString().startsWith(UserActivity.CONTENT_URI.toString())) {
-            UriHelper<UserActivity> helper = new UriHelper<UserActivity>();
+            UriHelper<UserActivity> helper = new UriHelper<>();
             helper.model = populateModel ? new UserActivity() : null;
             helper.dao = userActivityDao;
             helper.dao.setDatabase(getDatabase());
@@ -358,7 +358,7 @@ public class Astrid3ContentProvider extends ContentProvider {
         ContentValues setValues = model.getSetValues();
         if (setValues != null) {
             Set<Entry<String, Object>> entries = setValues.valueSet();
-            Set<String> keysToRemove = new HashSet<String>();
+            Set<String> keysToRemove = new HashSet<>();
             for (Entry<String, Object> entry: entries) {
                 String key = entry.getKey();
                 if (key.startsWith(AbstractModel.RETAIN_TRANSITORY_PREFIX)) {

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -83,7 +83,7 @@ public class RepeatControlSet extends PopupControlSet {
     private long repeatUntilValue;
 
 
-    private final List<RepeatChangedListener> listeners = new LinkedList<RepeatChangedListener>();
+    private final List<RepeatChangedListener> listeners = new LinkedList<>();
 
     public interface RepeatChangedListener {
         public void repeatChanged(boolean repeat);
@@ -333,7 +333,7 @@ public class RepeatControlSet extends PopupControlSet {
             case INTERVAL_WEEKS: {
                 rrule.setFreq(Frequency.WEEKLY);
 
-                ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>();
+                ArrayList<WeekdayNum> days = new ArrayList<>();
                 for (CompoundButton dayOfWeek : daysOfWeek) {
                     if (dayOfWeek.isChecked()) {
                         days.add(new WeekdayNum(0, (Weekday) dayOfWeek.getTag()));

astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java

@@ -102,7 +102,7 @@ public class MetadataService {
     public boolean synchronizeMetadata(long taskId, ArrayList<Metadata> metadata,
             Criterion metadataCriterion, SynchronizeMetadataCallback callback) {
         boolean dirty = false;
-        HashSet<ContentValues> newMetadataValues = new HashSet<ContentValues>();
+        HashSet<ContentValues> newMetadataValues = new HashSet<>();
         for(Metadata metadatum : metadata) {
             metadatum.setValue(Metadata.TASK, taskId);
             metadatum.clearValue(Metadata.CREATION_DATE);

astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java

@@ -36,7 +36,7 @@ public class SyncV2Service {
      * Returns active sync providers
      */
     public List<SyncV2Provider> activeProviders() {
-        ArrayList<SyncV2Provider> actives = new ArrayList<SyncV2Provider>();
+        ArrayList<SyncV2Provider> actives = new ArrayList<>();
         for(SyncV2Provider provider : providers) {
             if(provider.isActive()) {
                 actives.add(provider);

astrid/src/main/java/com/todoroo/astrid/service/TaskService.java

@@ -383,7 +383,7 @@ public class TaskService {
             task.setValue(Task.TITLE, title);
         }
 
-        ArrayList<String> tags = new ArrayList<String>();
+        ArrayList<String> tags = new ArrayList<>();
         boolean quickAddMarkup = false;
         try {
             quickAddMarkup = parseQuickAddMarkup(task, tags);

astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java

@@ -48,10 +48,7 @@ public class UpdateScreenFlow extends Activity {
             Class<?> activityClass = Class.forName(className);
             Intent intent = new Intent(this, activityClass);
             startActivityForResult(intent, REQUEST_CODE_SCREEN_FLOW);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            finish();
-        } catch (ActivityNotFoundException e) {
+        } catch (ClassNotFoundException | ActivityNotFoundException e) {
             e.printStackTrace();
             finish();
         }

astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java

@@ -261,7 +261,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
             return;
         }
 
-        final ArrayList<String> chained = new ArrayList<String>();
+        final ArrayList<String> chained = new ArrayList<>();
         updater.applyToDescendants(itemId, new AstridOrderedListUpdater.OrderedListNodeVisitor() {
             @Override
             public void visitNode(AstridOrderedListUpdater.Node node) {

astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java

@@ -26,7 +26,7 @@ public abstract class AstridOrderedListUpdater<LIST> {
 
     public AstridOrderedListUpdater() {
         DependencyInjectionService.getInstance().inject(this);
-        idToNode = new HashMap<String, Node>();
+        idToNode = new HashMap<>();
     }
 
     public interface OrderedListNodeVisitor {
@@ -37,7 +37,7 @@ public abstract class AstridOrderedListUpdater<LIST> {
         public String uuid;
         public Node parent;
         public int indent;
-        public final ArrayList<Node> children = new ArrayList<Node>();
+        public final ArrayList<Node> children = new ArrayList<>();
 
         public Node(String uuid, Node parent, int indent) {
             this.uuid = uuid;
@@ -80,11 +80,11 @@ public abstract class AstridOrderedListUpdater<LIST> {
     private void verifyTreeModel(LIST list, Filter filter) {
         boolean changedThings = false;
         Set<String> keySet = idToNode.keySet();
-        Set<String> currentIds = new HashSet<String>();
+        Set<String> currentIds = new HashSet<>();
         for (String id : keySet) {
             currentIds.add(id);
         }
-        Set<String> idsInQuery = new HashSet<String>();
+        Set<String> idsInQuery = new HashSet<>();
         String sql = filter.getSqlQuery().replaceAll("ORDER BY .*", "");  //$NON-NLS-1$//$NON-NLS-2$
         sql = sql + String.format(" ORDER BY %s", Task.CREATION_DATE); //$NON-NLS-1$
         TodorooCursor<Task> tasks = taskService.fetchFiltered(sql, null, Task.UUID);
@@ -138,7 +138,7 @@ public abstract class AstridOrderedListUpdater<LIST> {
     }
 
     private String[] getOrderedIds() {
-        ArrayList<String> ids = new ArrayList<String>();
+        ArrayList<String> ids = new ArrayList<>();
         orderedIdHelper(treeRoot, ids);
         return ids.toArray(new String[ids.size()]);
     }

astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java

@@ -123,7 +123,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             baseProperties = TaskAdapter.BASIC_PROPERTIES;
         }
 
-        ArrayList<Property<?>> properties = new ArrayList<Property<?>>(Arrays.asList(baseProperties));
+        ArrayList<Property<?>> properties = new ArrayList<>(Arrays.asList(baseProperties));
         properties.add(updater.indentProperty());
         properties.add(updater.orderProperty());
         return properties.toArray(new Property<?>[properties.size()]);
@@ -272,7 +272,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             return;
         }
 
-        final ArrayList<Long> chained = new ArrayList<Long>();
+        final ArrayList<Long> chained = new ArrayList<>();
         final int parentIndent = item.getValue(updater.indentProperty());
         updater.applyToChildren(list, itemId, new OrderedListNodeVisitor() {
             @Override

astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java

@@ -202,7 +202,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     protected static class Node {
         public final long taskId;
         public Node parent;
-        public final ArrayList<Node> children = new ArrayList<Node>();
+        public final ArrayList<Node> children = new ArrayList<>();
 
         public Node(long taskId, Node parent) {
             this.taskId = taskId;
@@ -251,7 +251,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     protected Node buildTreeModel(LIST list) {
         final Node root = new Node(Task.NO_ID, null);
         final AtomicInteger previoustIndent = new AtomicInteger(-1);
-        final AtomicReference<Node> currentNode = new AtomicReference<Node>(root);
+        final AtomicReference<Node> currentNode = new AtomicReference<>(root);
 
         iterateThroughList(list, new OrderedListIterator() {
             @Override

astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java

@@ -103,7 +103,7 @@ public class SubtasksHelper {
 
     @Deprecated
     private static Long[] getIdArray(String serializedTree) {
-        ArrayList<Long> ids = new ArrayList<Long>();
+        ArrayList<Long> ids = new ArrayList<>();
         String[] digitsOnly = serializedTree.split("[\\[\\],\\s]"); // Split on [ ] , or whitespace chars
         for (String idString : digitsOnly) {
             try {
@@ -118,7 +118,7 @@ public class SubtasksHelper {
     }
 
     public static String[] getStringIdArray(String serializedTree) {
-        ArrayList<String> ids = new ArrayList<String>();
+        ArrayList<String> ids = new ArrayList<>();
         String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars
         for (String idString : values) {
             if (!TextUtils.isEmpty(idString)) {
@@ -176,7 +176,7 @@ public class SubtasksHelper {
     }
 
     private static <A, B> HashMap<A, B> getIdMap(A[] keys, Property<A> keyProperty, Property<B> valueProperty) {
-        HashMap<A, B> map = new HashMap<A, B>();
+        HashMap<A, B> map = new HashMap<>();
         TodorooCursor<Task> tasks = PluginServices.getTaskService().query(Query.select(keyProperty, valueProperty).where(keyProperty.in(keys)));
         try {
             for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) {

astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java

@@ -36,7 +36,7 @@ public class SubtasksListFragment extends TaskListFragment {
     }
 
     protected OrderedListFragmentHelperInterface<?> createFragmentHelper() {
-        return new AstridOrderedListFragmentHelper<TaskListMetadata>(this, new SubtasksFilterUpdater());
+        return new AstridOrderedListFragmentHelper<>(this, new SubtasksFilterUpdater());
     }
 
     @Override

astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java

@@ -24,7 +24,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
 
     public SubtasksTagListFragment() {
         super();
-        helper = new AstridOrderedListFragmentHelper<TaskListMetadata>(this, new SubtasksTagUpdater(isBeingFiltered));
+        helper = new AstridOrderedListFragmentHelper<>(this, new SubtasksTagUpdater(isBeingFiltered));
     }
 
     @Override

astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java

@@ -127,7 +127,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
     protected FilterListItem[] prepareFilters(Context context) {
         ContextManager.setContext(context);
 
-        ArrayList<FilterListItem> list = new ArrayList<FilterListItem>();
+        ArrayList<FilterListItem> list = new ArrayList<>();
 
         addTags(list);
 
@@ -149,7 +149,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         boolean shouldAddUntagged = addUntaggedFilter &&
                 Preferences.getBoolean(R.string.p_show_not_in_list_filter, true);
 
-        ArrayList<Filter> filters = new ArrayList<Filter>(tags.length);
+        ArrayList<Filter> filters = new ArrayList<>(tags.length);
 
         Context context = ContextManager.getContext();
         Resources r = context.getResources();

astrid/src/main/java/com/todoroo/astrid/tags/TagService.java

@@ -171,7 +171,7 @@ public final class TagService {
             orderBy(order).groupBy(TaskToTagMetadata.TAG_NAME);
         TodorooCursor<Metadata> cursor = metadataDao.query(query);
         try {
-            ArrayList<Tag> array = new ArrayList<Tag>();
+            ArrayList<Tag> array = new ArrayList<>();
             for (int i = 0; i < cursor.getCount(); i++) {
                 cursor.moveToNext();
                 Tag tag = Tag.tagFromUUID(cursor.get(TaskToTagMetadata.TAG_UUID));
@@ -293,7 +293,7 @@ public final class TagService {
      * Return all tags (including metadata tags and TagData tags) in an array list
      */
     public ArrayList<Tag> getTagList() {
-        ArrayList<Tag> tagList = new ArrayList<Tag>();
+        ArrayList<Tag> tagList = new ArrayList<>();
         TodorooCursor<TagData> cursor = tagDataService.query(Query.select(TagData.PROPERTIES).where(Criterion.and(TagData.DELETION_DATE.eq(0), Criterion.or(TagData.IS_FOLDER.isNull(),
                 TagData.IS_FOLDER.neq(1)), TagData.NAME.isNotNull())).orderBy(Order.asc(Functions.upper(TagData.NAME))));
         try {
@@ -316,7 +316,7 @@ public final class TagService {
      * Save the given array of tags into the database
      */
     public void synchronizeTags(long taskId, String taskUuid, Set<String> tags) {
-        HashSet<String> existingLinks = new HashSet<String>();
+        HashSet<String> existingLinks = new HashSet<>();
         TodorooCursor<Metadata> links = metadataDao.query(Query.select(Metadata.PROPERTIES)
                 .where(Criterion.and(TaskToTagMetadata.TASK_UUID.eq(taskUuid), Metadata.DELETION_DATE.eq(0))));
         try {

astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java

@@ -77,7 +77,7 @@ public final class TagsControlSet extends PopupControlSet {
     }
 
     private HashMap<String, Integer> buildTagIndices(ArrayList<String> tagNames) {
-        HashMap<String, Integer> indices = new HashMap<String, Integer>();
+        HashMap<String, Integer> indices = new HashMap<>();
         for (int i = 0; i < tagNames.size(); i++) {
             indices.put(tagNames.get(i), i);
         }
@@ -85,7 +85,7 @@ public final class TagsControlSet extends PopupControlSet {
     }
 
     private ArrayList<String> getTagNames(Tag[] tags) {
-        ArrayList<String> names = new ArrayList<String>();
+        ArrayList<String> names = new ArrayList<>();
         for (Tag tag : tags) {
             names.add(tag.toString());
         }
@@ -119,7 +119,7 @@ public final class TagsControlSet extends PopupControlSet {
     }
 
     private LinkedHashSet<String> getTagSet() {
-        LinkedHashSet<String> tags = new LinkedHashSet<String>();
+        LinkedHashSet<String> tags = new LinkedHashSet<>();
         if (initialized) {
             for(int i = 0; i < selectedTags.getAdapter().getCount(); i++) {
                 if (selectedTags.isItemChecked(i)) {
@@ -236,7 +236,7 @@ public final class TagsControlSet extends PopupControlSet {
         super.readFromTask(task);
         if(model.getId() != AbstractModel.NO_ID) {
             TodorooCursor<Metadata> cursor = tagService.getTags(model.getId());
-            LinkedHashSet<String> tags = new LinkedHashSet<String>(cursor.getCount());
+            LinkedHashSet<String> tags = new LinkedHashSet<>(cursor.getCount());
             try {
                 for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                     String tag = cursor.get(TaskToTagMetadata.TAG_NAME);
@@ -287,7 +287,7 @@ public final class TagsControlSet extends PopupControlSet {
         tagIndices = buildTagIndices(allTagNames);
 
         selectedTags = (ListView) getView().findViewById(R.id.existingTags);
-        selectedTags.setAdapter(new ArrayAdapter<String>(activity,
+        selectedTags.setAdapter(new ArrayAdapter<>(activity,
                 R.layout.simple_list_item_multiple_choice_themed, allTagNames));
         selectedTags.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
 

astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java

@@ -29,7 +29,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
     private final ImageView timerButton;
     private final Chronometer chronometer;
     private boolean timerActive;
-    private final List<TimerActionListener> listeners = new LinkedList<TimerActionListener>();
+    private final List<TimerActionListener> listeners = new LinkedList<>();
 
     public TimerActionControlSet(final Activity activity, View parent) {
         super(activity, -1);

astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java

@@ -150,7 +150,7 @@ public class DateAndTimePicker extends LinearLayout {
         }
 
         String[] labels = context.getResources().getStringArray(arrayResource);
-        ArrayList<UrgencyValue> urgencyValues = new ArrayList<UrgencyValue>();
+        ArrayList<UrgencyValue> urgencyValues = new ArrayList<>();
         todayUrgency = new UrgencyValue(labels[2],
                 Task.URGENCY_TODAY);
         if (useShortcuts) {

astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -162,7 +162,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     private void customDateFinished() {
         HideUntilValue[] list = createHideUntilList(customDate.getTime());
-        adapter = new ArrayAdapter<HideUntilValue>(
+        adapter = new ArrayAdapter<>(
                 activity, android.R.layout.simple_spinner_item,
                 list);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -246,7 +246,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
         }
 
         HideUntilValue[] list = createHideUntilList(date);
-        adapter = new ArrayAdapter<HideUntilValue>(
+        adapter = new ArrayAdapter<>(
                 activity, android.R.layout.simple_spinner_item, list);
 
         super.readFromTask(task);

astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java

@@ -29,9 +29,9 @@ import java.util.List;
  *
  */
 public class ImportanceControlSet extends TaskEditControlSet {
-    private final List<CompoundButton> buttons = new LinkedList<CompoundButton>();
+    private final List<CompoundButton> buttons = new LinkedList<>();
     private final int[] colors;
-    private final List<ImportanceChangedListener> listeners = new LinkedList<ImportanceChangedListener>();
+    private final List<ImportanceChangedListener> listeners = new LinkedList<>();
 
     private static final int TEXT_SIZE = 18;
 

astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java

@@ -28,7 +28,7 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
         void onNumbersPicked(int[] number);
     }
 
-    private final List<NumberPicker>      pickers = new LinkedList<NumberPicker>();
+    private final List<NumberPicker>      pickers = new LinkedList<>();
     private final OnNNumberPickedListener mCallback;
 
     /** Instantiate the dialog box.

astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java

@@ -233,7 +233,7 @@ public class QuickAddBar extends LinearLayout {
         Task empty = new Task();
         TagData tagData = fragment.getActiveTagData();
         if (tagData != null) {
-            HashSet<String> tagsTransitory = new HashSet<String>();
+            HashSet<String> tagsTransitory = new HashSet<>();
             tagsTransitory.add(tagData.getValue(TagData.NAME));
             empty.putTransitory(TaskService.TRANS_TAGS, tagsTransitory);
         }
@@ -298,7 +298,7 @@ public class QuickAddBar extends LinearLayout {
 
             if (currentVoiceFile != null) {
 
-                AtomicReference<String> nameRef = new AtomicReference<String>();
+                AtomicReference<String> nameRef = new AtomicReference<>();
                 String path = FileUtilities.getNewAudioAttachmentPath(activity, nameRef);
 
                 voiceRecognizer.convert(path);

astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java

@@ -54,7 +54,7 @@ public class RandomReminderControlSet extends TaskEditControlSet {
         });
 
         // create adapter
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(
                 activity, android.R.layout.simple_spinner_item,
                 activity.getResources().getStringArray(R.array.TEA_reminder_random));
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java

@@ -46,7 +46,7 @@ public class ReminderControlSet extends PopupControlSet {
 
     public ReminderControlSet(Activity activity, int viewLayout, int displayViewLayout) {
         super(activity, viewLayout, displayViewLayout, R.string.TEA_reminders_group_label);
-        extraViews = new ArrayList<View>();
+        extraViews = new ArrayList<>();
         label = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
 
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
@@ -123,7 +123,7 @@ public class ReminderControlSet extends PopupControlSet {
                 activity.getString(R.string.TEA_reminder_mode_five),
                 activity.getString(R.string.TEA_reminder_mode_nonstop),
         };
-        final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+        final ArrayAdapter<String> adapter = new ArrayAdapter<>(
                 activity, android.R.layout.simple_spinner_item, list);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         mode.setOnItemSelectedListener(new OnItemSelectedListener() {

astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java

@@ -108,7 +108,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
         try {
             TodorooCursor<Metadata> metadata = getRemoteTaskMetadata();
             try {
-                ArrayList<Long> matchingRows = new ArrayList<Long>();
+                ArrayList<Long> matchingRows = new ArrayList<>();
                 joinRows(tasks, metadata, matchingRows, both);
 
                 return

astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java

@@ -47,7 +47,7 @@ public class TitleParser {
         Pattern tagPattern = Pattern.compile("(\\s|^)#(\\(.*\\)|[^\\s]+)");
         Pattern contextPattern = Pattern.compile("(\\s|^)@(\\(.*\\)|[^\\s]+)");
 
-        Set<String> addedTags = new HashSet<String>();
+        Set<String> addedTags = new HashSet<>();
         TagService tagService = TagService.getInstance();
 
         while(true) {
@@ -262,7 +262,7 @@ public class TitleParser {
             inputText = removeIfParenthetical(match, inputText);
         }
 
-        HashMap<String, Integer> dayTimes = new HashMap<String, Integer>();
+        HashMap<String, Integer> dayTimes = new HashMap<>();
         dayTimes.put("(?i)\\bbreakfast\\b", 8);
         dayTimes.put("(?i)\\blunch\\b", 12);
         dayTimes.put("(?i)\\bsupper\\b", 18);
@@ -375,7 +375,7 @@ public class TitleParser {
             return false;
         }
         String inputText = task.getValue(Task.TITLE);
-        HashMap<String, Frequency> repeatTimes = new HashMap<String, Frequency>();
+        HashMap<String, Frequency> repeatTimes = new HashMap<>();
         repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b" , Frequency.DAILY);
         repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?nights?\\b" , Frequency.DAILY);
         repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?mornings?\\b" , Frequency.DAILY);
@@ -386,7 +386,7 @@ public class TitleParser {
         repeatTimes.put("(?i)\\bevery \\w{0,6} ?months?\\b", Frequency.MONTHLY);
         repeatTimes.put("(?i)\\bevery \\w{0,6} ?years?\\b", Frequency.YEARLY);
 
-        HashMap<String, Frequency> repeatTimesIntervalOne = new HashMap<String, Frequency>();
+        HashMap<String, Frequency> repeatTimesIntervalOne = new HashMap<>();
         //pre-determined intervals of 1
         repeatTimesIntervalOne.put( "(?i)\\bdaily\\b" , Frequency.DAILY);
         repeatTimesIntervalOne.put( "(?i)\\beveryday\\b" , Frequency.DAILY);
@@ -426,7 +426,7 @@ public class TitleParser {
 
     //helper method for repeatHelper.
     private static int findInterval(String inputText) {
-        HashMap<String,Integer> wordsToNum = new HashMap<String, Integer>();
+        HashMap<String,Integer> wordsToNum = new HashMap<>();
         String[] words = new String[] {
                 "one", "two", "three", "four", "five", "six",
                 "seven", "eight", "nine", "ten", "eleven", "twelve"

astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java

@@ -30,7 +30,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
     private boolean isTTSInitialized;
     private boolean retryLastSpeak;
     private String lastTextToSpeak;
-    private static final HashMap<String, String> ttsParams = new HashMap<String, String>();
+    private static final HashMap<String, String> ttsParams = new HashMap<>();
 
     static {
         ttsParams.put(TextToSpeech.Engine.KEY_PARAM_STREAM,