Merge pull request #3590 from k9mail/remove_explicit_type_arguments (3af2e6c0) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/K9.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ public class K9 {
		private static boolean hideHostnameWhenConnecting = false;

		private static SortType sortType;
		private static Map<SortType, Boolean> sortAscending = new HashMap<SortType, Boolean>();
		private static Map<SortType, Boolean> sortAscending = new HashMap<>();

		private static boolean useBackgroundAsUnreadIndicator = true;
		private static boolean threadedViewEnabled = true;

app/core/src/main/java/com/fsck/k9/cache/EmailProviderCache.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ public class EmailProviderCache {

		private static Context sContext;
		private static Map<String, EmailProviderCache> sInstances =
		new HashMap<String, EmailProviderCache>();
		new HashMap<>();

		public static synchronized EmailProviderCache getCache(String accountUuid, Context context) {

		@@ -40,9 +40,9 @@ public class EmailProviderCache {


		private String mAccountUuid;
		private final Map<Long, Map<String, String>> mMessageCache = new HashMap<Long, Map<String, String>>();
		private final Map<Long, Map<String, String>> mThreadCache = new HashMap<Long, Map<String, String>>();
		private final Map<Long, Long> mHiddenMessageCache = new HashMap<Long, Long>();
		private final Map<Long, Map<String, String>> mMessageCache = new HashMap<>();
		private final Map<Long, Map<String, String>> mThreadCache = new HashMap<>();
		private final Map<Long, Long> mHiddenMessageCache = new HashMap<>();


		private EmailProviderCache(String accountUuid) {
		@@ -68,7 +68,7 @@ public class EmailProviderCache {
		for (Long messageId : messageIds) {
		Map<String, String> map = mMessageCache.get(messageId);
		if (map == null) {
		map = new HashMap<String, String>();
		map = new HashMap<>();
		mMessageCache.put(messageId, map);
		}
		map.put(columnName, value);
		@@ -83,7 +83,7 @@ public class EmailProviderCache {
		for (Long threadRootId : threadRootIds) {
		Map<String, String> map = mThreadCache.get(threadRootId);
		if (map == null) {
		map = new HashMap<String, String>();
		map = new HashMap<>();
		mThreadCache.put(threadRootId, map);
		}
		map.put(columnName, value);

app/core/src/main/java/com/fsck/k9/cache/EmailProviderCacheCursor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ import android.database.CursorWrapper;
		*/
		public class EmailProviderCacheCursor extends CursorWrapper {
		private EmailProviderCache mCache;
		private List<Integer> mHiddenRows = new ArrayList<Integer>();
		private List<Integer> mHiddenRows = new ArrayList<>();
		private int mMessageIdColumn;
		private int mFolderIdColumn;
		private int mThreadRootColumn;

app/core/src/main/java/com/fsck/k9/helper/MailTo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public final class MailTo {
		}

		public List<String> getQueryParameters(String key) {
		List<String> params = new ArrayList<String>();
		List<String> params = new ArrayList<>();
		for (String paramName : uri.getQueryParameterNames()) {
		if (paramName.equalsIgnoreCase(key)) {
		params.addAll(uri.getQueryParameters(paramName));

app/core/src/main/java/com/fsck/k9/helper/Utility.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ public class Utility {
		">");

		public static List<String> extractMessageIds(final String text) {
		List<String> messageIds = new ArrayList<String>();
		List<String> messageIds = new ArrayList<>();
		Matcher matcher = MESSAGE_ID.matcher(text);

		int start = 0;