From 283408b922d308684dc9aa9067b230812e5dd97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 21 Aug 2015 17:35:03 -0700 Subject: [PATCH] Remove type duplicates in constructors (Java 1.7) --- .../java/com/moez/QKSMS/common/DialogHelper.java | 2 +- .../common/google/BackgroundLoaderManager.java | 2 +- .../com/moez/QKSMS/common/google/DraftCache.java | 7 +++---- .../moez/QKSMS/common/utils/MessageUtils.java | 6 +++--- .../QKSMS/common/vcard/AndroidCustomField.java | 2 +- .../QKSMS/common/vcard/ContactOperations.java | 6 +++--- .../moez/QKSMS/common/vcard/DataMappings.java | 16 ++++++++-------- .../main/java/com/moez/QKSMS/data/Contact.java | 9 ++++----- .../java/com/moez/QKSMS/data/ContactList.java | 2 +- .../java/com/moez/QKSMS/data/Conversation.java | 4 ++-- .../com/moez/QKSMS/data/RecipientIdCache.java | 2 +- .../main/java/com/moez/QKSMS/exif/ExifData.java | 8 ++++---- .../java/com/moez/QKSMS/exif/ExifInterface.java | 6 +++--- .../java/com/moez/QKSMS/exif/ExifModifier.java | 2 +- .../com/moez/QKSMS/exif/ExifOutputStream.java | 2 +- .../java/com/moez/QKSMS/exif/ExifParser.java | 2 +- .../main/java/com/moez/QKSMS/exif/IfdData.java | 2 +- .../com/moez/QKSMS/external/iab/IabHelper.java | 6 +++--- .../com/moez/QKSMS/external/iab/Inventory.java | 6 +++--- .../java/com/moez/QKSMS/mmssms/Transaction.java | 10 +++++----- .../main/java/com/moez/QKSMS/mmssms/Utils.java | 2 +- .../java/com/moez/QKSMS/model/ImageModel.java | 4 ++-- .../java/com/moez/QKSMS/model/LayoutModel.java | 2 +- .../com/moez/QKSMS/model/MediaModelFactory.java | 2 +- .../java/com/moez/QKSMS/model/SlideModel.java | 2 +- .../com/moez/QKSMS/model/SlideshowModel.java | 8 ++++---- .../java/com/moez/QKSMS/model/SmilHelper.java | 2 +- .../com/moez/QKSMS/receiver/MmsReceiver.java | 4 ++-- .../com/moez/QKSMS/transaction/SmsHelper.java | 8 ++++---- .../QKSMS/ui/delivery/DeliveryReportHelper.java | 7 +++---- .../java/com/moez/QKSMS/ui/mms/SlideView.java | 2 +- .../com/moez/QKSMS/ui/search/SearchFragment.java | 2 +- .../moez/QKSMS/ui/settings/SettingsFragment.java | 4 ++-- .../ui/view/slidingmenu/CustomViewAbove.java | 2 +- .../ui/welcome/DemoConversationCursorLoader.java | 4 ++-- 35 files changed, 77 insertions(+), 80 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index f7db2b48..48319045 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -18,7 +18,7 @@ public class DialogHelper { private static final String TAG = "DialogHelper"; public static void showDeleteConversationDialog(MainActivity context, long threadId) { - List threadIds = new ArrayList(); + List threadIds = new ArrayList<>(); threadIds.add(threadId); showDeleteConversationDialog(context, threadIds); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/BackgroundLoaderManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/BackgroundLoaderManager.java index d0c85419..2ea6a0df 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/BackgroundLoaderManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/BackgroundLoaderManager.java @@ -67,7 +67,7 @@ abstract class BackgroundLoaderManager { BackgroundLoaderManager(Context context) { mPendingTaskUris = new HashSet(); mCallbacks = new HashMap>(); - final LinkedBlockingQueue queue = new LinkedBlockingQueue(); + final LinkedBlockingQueue queue = new LinkedBlockingQueue<>(); final int poolSize = MAX_THREADS; mExecutor = new ThreadPoolExecutor( poolSize, poolSize, 5, TimeUnit.SECONDS, queue, diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java index 43a6c28e..250b6029 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java @@ -43,10 +43,9 @@ public class DraftCache { // before deleting any empty threads from the db. private final Object mSavingDraftLock = new Object(); - private HashSet mDraftSet = new HashSet(4); + private HashSet mDraftSet = new HashSet<>(4); private final Object mDraftSetLock = new Object(); - private final HashSet mChangeListeners - = new HashSet(1); + private final HashSet mChangeListeners = new HashSet<>(1); private final Object mChangeListenersLock = new Object(); public interface OnDraftChangedListener { @@ -95,7 +94,7 @@ public class DraftCache { log("rebuildCache"); } - HashSet newDraftSet = new HashSet(); + HashSet newDraftSet = new HashSet<>(); Cursor cursor = SqliteWrapper.query( mContext, diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java index 50105d42..543e3017 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java @@ -103,7 +103,7 @@ public class MessageUtils { // anything ever delete from the mmssms.db canonical_addresses // table? Nothing that I could find. private static final Map sRecipientAddress = - new ConcurrentHashMap(20 /* initial capacity */); + new ConcurrentHashMap<>(20 /* initial capacity */); // When we pass a video record duration to the video recorder, use one of these values. private static final int[] sVideoDuration = @@ -795,7 +795,7 @@ public class MessageUtils { return; } - final Map map = new HashMap(); + final Map map = new HashMap<>(); try { if (c.getCount() == 0) { if (callback != null) { @@ -889,7 +889,7 @@ public class MessageUtils { public static ArrayList extractUris(URLSpan[] spans) { int size = spans.length; - ArrayList accumulator = new ArrayList(); + ArrayList accumulator = new ArrayList<>(); for (int i = 0; i < size; i++) { accumulator.add(spans[i].getURL()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java index ccbbc9df..28b97d8b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java @@ -41,7 +41,7 @@ import java.util.List; public class AndroidCustomField extends VCardProperty { private String type; private boolean dir; - private List values = new ArrayList(); + private List values = new ArrayList<>(); /** * Creates an "item" field. diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java index be8017bd..88ada6b9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java @@ -89,7 +89,7 @@ public class ContactOperations { public void insertContact(VCard vcard) throws RemoteException, OperationApplicationException { // TODO handle Raw properties - Raw properties include various extension which start with "X-" like X-ASSISTANT, X-AIM, X-SPOUSE - List contentValues = new ArrayList(); + List contentValues = new ArrayList<>(); contentValues.add(account); convertName(contentValues, vcard); @@ -113,7 +113,7 @@ public class ContactOperations { convertPhotos(contentValues, vcard); convertOrganization(contentValues, vcard); - ArrayList operations = new ArrayList(contentValues.size()); + ArrayList operations = new ArrayList<>(contentValues.size()); for (NonEmptyContentValues values : contentValues) { ContentValues cv = values.getContentValues(); if (cv.size() == 0) { @@ -488,7 +488,7 @@ public class ContactOperations { * value is the list of properties that belong to that group */ private Map> orderPropertiesByGroup(List properties) { - Map> groupedProperties = new HashMap>(); + Map> groupedProperties = new HashMap<>(); for (T property : properties) { String group = property.getGroup(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java index 1262294c..3937766f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java @@ -49,7 +49,7 @@ import java.util.Map; public class DataMappings { private static final Map phoneTypeMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put(TelephoneType.BBS, ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM); m.put(TelephoneType.CAR, ContactsContract.CommonDataKinds.Phone.TYPE_CAR); m.put(TelephoneType.CELL, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE); @@ -70,7 +70,7 @@ public class DataMappings { private static final Map websiteTypeMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("home", ContactsContract.CommonDataKinds.Website.TYPE_HOME); m.put("work", ContactsContract.CommonDataKinds.Website.TYPE_WORK); m.put("homepage", ContactsContract.CommonDataKinds.Website.TYPE_HOMEPAGE); @@ -80,7 +80,7 @@ public class DataMappings { private static final Map emailTypeMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put(EmailType.HOME, ContactsContract.CommonDataKinds.Email.TYPE_HOME); m.put(EmailType.WORK, ContactsContract.CommonDataKinds.Email.TYPE_WORK); emailTypeMappings = Collections.unmodifiableMap(m); @@ -88,7 +88,7 @@ public class DataMappings { private static final Map addressTypeMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put(AddressType.HOME, ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME); m.put(AddressType.get("business"), ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK); m.put(AddressType.WORK, ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK); @@ -98,7 +98,7 @@ public class DataMappings { private static final Map abRelatedNamesMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("father", ContactsContract.CommonDataKinds.Relation.TYPE_FATHER); m.put("spouse", ContactsContract.CommonDataKinds.Relation.TYPE_SPOUSE); m.put("mother", ContactsContract.CommonDataKinds.Relation.TYPE_MOTHER); @@ -114,7 +114,7 @@ public class DataMappings { private static final Map abDateMappings; static { - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("anniversary", ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY); m.put("other", ContactsContract.CommonDataKinds.Event.TYPE_OTHER); abDateMappings = Collections.unmodifiableMap(m); @@ -122,7 +122,7 @@ public class DataMappings { private static final Map imPropertyNameMappings; static{ - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("X-AIM", ContactsContract.CommonDataKinds.Im.PROTOCOL_AIM); m.put("X-ICQ", ContactsContract.CommonDataKinds.Im.PROTOCOL_ICQ); m.put("X-QQ", ContactsContract.CommonDataKinds.Im.PROTOCOL_ICQ); @@ -139,7 +139,7 @@ public class DataMappings { private static final Map imProtocolMappings; static{ - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("aim", ContactsContract.CommonDataKinds.Im.PROTOCOL_AIM); m.put("icq", ContactsContract.CommonDataKinds.Im.PROTOCOL_ICQ); m.put("msn", ContactsContract.CommonDataKinds.Im.PROTOCOL_MSN); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java index 395b8c5b..53454894 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java @@ -68,7 +68,7 @@ public class Contact { } }; - private final static HashSet mListeners = new HashSet(); + private final static HashSet mListeners = new HashSet<>(); private long mContactMethodId; // Id in phone or email Uri returned by provider of current // Contact, -1 is invalid. e.g. contact method id is 20 when @@ -468,8 +468,7 @@ public class Contact { private final Context mContext; - private final HashMap> mContactsHash = - new HashMap>(); + private final HashMap> mContactsHash = new HashMap<>(); private ContactsCache(Context context) { mContext = context; @@ -640,14 +639,14 @@ public class Contact { return null; } - List entries = new ArrayList(); + List entries = new ArrayList<>(); try { while (cursor.moveToNext()) { Contact entry = new Contact(cursor.getString(PHONE_NUMBER_COLUMN), cursor.getString(CONTACT_NAME_COLUMN)); fillPhoneTypeContact(entry, cursor); - ArrayList value = new ArrayList(); + ArrayList value = new ArrayList<>(); value.add(entry); // Put the result in the cache. mContactsHash.put(key(entry.mNumber, sStaticKeyBuffer), value); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java index 5b034b7a..8460496e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java @@ -125,7 +125,7 @@ public class ContactList extends ArrayList { } public String[] getNumbers(boolean scrubForMmsAddress) { - List numbers = new ArrayList(); + List numbers = new ArrayList<>(); String number; for (Contact c : this) { number = c.getNumber(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java index 953c016d..5183b4a9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java @@ -607,7 +607,7 @@ public class Conversation { } private static long getOrCreateThreadId(Context context, ContactList list) { - HashSet recipients = new HashSet(); + HashSet recipients = new HashSet<>(); Contact cacheContact = null; for (Contact c : list) { cacheContact = Contact.get(c.getNumber(), false); @@ -1224,7 +1224,7 @@ public class Conversation { // Keep track of what threads are now on disk so we // can discard anything removed from the cache. - HashSet threadsOnDisk = new HashSet(); + HashSet threadsOnDisk = new HashSet<>(); // Query for all conversations. Cursor c = context.getContentResolver().query(sAllThreadsUri, diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java index 239b14fe..55072071 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java @@ -96,7 +96,7 @@ public class RecipientIdCache { public static List getAddresses(String spaceSepIds) { synchronized (sInstance) { - List numbers = new ArrayList(); + List numbers = new ArrayList<>(); String[] ids = spaceSepIds.split(" "); for (String id : ids) { long longId; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java index 2ef874f0..6a8eb851 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java @@ -45,7 +45,7 @@ class ExifData { private final IfdData[] mIfdDatas = new IfdData[IfdId.TYPE_IFD_COUNT]; private byte[] mThumbnail; - private final ArrayList mStripBytes = new ArrayList(); + private final ArrayList mStripBytes = new ArrayList<>(); private final ByteOrder mByteOrder; ExifData(ByteOrder order) { @@ -253,7 +253,7 @@ class ExifData { * are none. */ protected List getAllTags() { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); for (IfdData d : mIfdDatas) { if (d != null) { ExifTag[] tags = d.getAllTags(); @@ -283,7 +283,7 @@ class ExifData { if (tags == null) { return null; } - ArrayList ret = new ArrayList(tags.length); + ArrayList ret = new ArrayList<>(tags.length); for (ExifTag t : tags) { ret.add(t); } @@ -298,7 +298,7 @@ class ExifData { * are none. */ protected List getAllTagsForTagId(short tag) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); for (IfdData d : mIfdDatas) { if (d != null) { ExifTag t = d.getTag(tag); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java index d10b6ab8..1536a471 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java @@ -322,7 +322,7 @@ public class ExifInterface { * Tags that contain offset markers. These are included in the banned * defines. */ - private static HashSet sOffsetTags = new HashSet(); + private static HashSet sOffsetTags = new HashSet<>(); static { sOffsetTags.add(getTrueTagKey(TAG_GPS_IFD)); sOffsetTags.add(getTrueTagKey(TAG_EXIF_IFD)); @@ -334,7 +334,7 @@ public class ExifInterface { /** * Tags with definitions that cannot be overridden (banned defines). */ - protected static HashSet sBannedDefines = new HashSet(sOffsetTags); + protected static HashSet sBannedDefines = new HashSet<>(sOffsetTags); static { sBannedDefines.add(getTrueTagKey(TAG_NULL)); sBannedDefines.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH)); @@ -2341,7 +2341,7 @@ public class ExifInterface { protected static int[] getAllowedIfdsFromInfo(int info) { int ifdFlags = getAllowedIfdFlagsFromInfo(info); int[] ifds = IfdData.getIfds(); - ArrayList l = new ArrayList(); + ArrayList l = new ArrayList<>(); for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) { int flag = (ifdFlags >> i) & 1; if (flag == 1) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifModifier.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifModifier.java index d2bc1541..84a14e5d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifModifier.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifModifier.java @@ -30,7 +30,7 @@ class ExifModifier { public static final boolean DEBUG = false; private final ByteBuffer mByteBuffer; private final ExifData mTagToModified; - private final List mTagOffsets = new ArrayList(); + private final List mTagOffsets = new ArrayList<>(); private final ExifInterface mInterface; private int mOffsetBase; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifOutputStream.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifOutputStream.java index 354ab193..07207d31 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifOutputStream.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifOutputStream.java @@ -241,7 +241,7 @@ class ExifOutputStream extends FilterOutputStream { } private ArrayList stripNullValueTags(ExifData data) { - ArrayList nullTags = new ArrayList(); + ArrayList nullTags = new ArrayList<>(); for(ExifTag t : data.getAllTags()) { if (t.getValue() == null && !ExifInterface.isOffsetTag(t.getTagId())) { data.removeTag(t.getTagId(), t.getIfd()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java index cc7d606f..6a0e99bb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifParser.java @@ -176,7 +176,7 @@ public class ExifParser { private static final short TAG_STRIP_BYTE_COUNTS = ExifInterface .getTrueTagKey(ExifInterface.TAG_STRIP_BYTE_COUNTS); - private final TreeMap mCorrespondingEvent = new TreeMap(); + private final TreeMap mCorrespondingEvent = new TreeMap<>(); private boolean isIfdRequested(int ifdType) { switch (ifdType) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/IfdData.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/IfdData.java index fac05ac6..bb94ecec 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/IfdData.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/IfdData.java @@ -28,7 +28,7 @@ import java.util.Map; class IfdData { private final int mIfdId; - private final Map mExifTags = new HashMap(); + private final Map mExifTags = new HashMap<>(); private int mOffsetToNextIfd = 0; private static final int[] sIfds = { IfdId.TYPE_IFD_0, IfdId.TYPE_IFD_1, IfdId.TYPE_IFD_EXIF, diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java index 788c2093..41df69fb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java @@ -739,7 +739,7 @@ public class IabHelper { public void consumeAsync(Purchase purchase, OnConsumeFinishedListener listener) { checkNotDisposed(); checkSetupDone("consume"); - List purchases = new ArrayList(); + List purchases = new ArrayList<>(); purchases.add(purchase); consumeAsyncInternal(purchases, listener, null); } @@ -911,7 +911,7 @@ public class IabHelper { int querySkuDetails(String itemType, Inventory inv, List moreSkus) throws RemoteException, JSONException { logDebug("Querying SKU details."); - ArrayList skuList = new ArrayList(); + ArrayList skuList = new ArrayList<>(); skuList.addAll(inv.getAllOwnedSkus(itemType)); if (moreSkus != null) { for (String sku : moreSkus) { @@ -963,7 +963,7 @@ public class IabHelper { (new Thread(new Runnable() { @Override public void run() { - final List results = new ArrayList(); + final List results = new ArrayList<>(); for (Purchase purchase : purchases) { try { consume(purchase); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Inventory.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Inventory.java index 51f2f1a7..2a8062ac 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Inventory.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Inventory.java @@ -25,8 +25,8 @@ import java.util.Map; * An Inventory is returned by such methods as {@link IabHelper#queryInventory}. */ public class Inventory { - Map mSkuMap = new HashMap(); - Map mPurchaseMap = new HashMap(); + Map mSkuMap = new HashMap<>(); + Map mPurchaseMap = new HashMap<>(); Inventory() { } @@ -69,7 +69,7 @@ public class Inventory { /** Returns a list of all owned product IDs of a given type */ List getAllOwnedSkus(String itemType) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (Purchase p : mPurchaseMap.values()) { if (p.getItemType().equals(itemType)) result.add(p.getSku()); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java index e14117b9..f4c3d7fa 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java @@ -214,8 +214,8 @@ public class Transaction { PendingIntent deliveredPI = PendingIntent.getBroadcast(context, messageId, new Intent(SMS_DELIVERED) .putExtra("message_uri", messageUri == null ? "" : messageUri.toString()), PendingIntent.FLAG_UPDATE_CURRENT); - ArrayList sPI = new ArrayList(); - ArrayList dPI = new ArrayList(); + ArrayList sPI = new ArrayList<>(); + ArrayList dPI = new ArrayList<>(); String body = text; @@ -336,7 +336,7 @@ public class Transaction { address = address.trim(); // create the parts to send - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); for (int i = 0; i < image.length; i++) { // turn bitmap into byte array to be stored @@ -762,7 +762,7 @@ public class Transaction { @Override public void run() { - List apns = new ArrayList(); + List apns = new ArrayList<>(); try { APN apn = new APN(settings.getMmsc(), settings.getPort(), settings.getProxy()); @@ -1072,7 +1072,7 @@ public class Transaction { try { Uri destUri = Uri.parse("content://mms"); - Set recipients = new HashSet(); + Set recipients = new HashSet<>(); recipients.addAll(Arrays.asList(to)); long thread_id = Utils.getOrCreateThreadId(context, recipients); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java index e34d6a21..f52105fc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Utils.java @@ -281,7 +281,7 @@ public class Utils { * @return the thread_id to use in the database */ public static long getOrCreateThreadId(Context context, String recipient) { - Set recipients = new HashSet(); + Set recipients = new HashSet<>(); recipients.add(recipient); return getOrCreateThreadId(context, recipients); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/ImageModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/ImageModel.java index 859f12e8..6505431a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/ImageModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/ImageModel.java @@ -60,13 +60,13 @@ public class ImageModel extends RegionMediaModel { * into one of these content types before being sent over MMS. */ private static final Set SUPPORTED_MMS_IMAGE_CONTENT_TYPES = - new HashSet(Arrays.asList(new String[] { + new HashSet<>(Arrays.asList(new String[] { "image/jpeg", })); private int mWidth; private int mHeight; - private SoftReference mFullSizeBitmapCache = new SoftReference(null); + private SoftReference mFullSizeBitmapCache = new SoftReference<>(null); private ItemLoadedFuture mItemLoadedFuture; public ImageModel(Context context, Uri uri, RegionModel region) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/LayoutModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/LayoutModel.java index 94abc547..f8940323 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/LayoutModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/LayoutModel.java @@ -141,7 +141,7 @@ public class LayoutModel extends Model { * Get all regions except root-layout. The result is READ-ONLY. */ public ArrayList getRegions() { - ArrayList regions = new ArrayList(); + ArrayList regions = new ArrayList<>(); if (mImageRegion != null) { regions.add(mImageRegion); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModelFactory.java b/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModelFactory.java index d1033d44..df22932c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModelFactory.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModelFactory.java @@ -132,7 +132,7 @@ public class MediaModelFactory { if (allContentIDs) { // Now, build a list of long IDs, sort them, and remove the duplicates. - ArrayList cids = new ArrayList(); + ArrayList cids = new ArrayList<>(); for (String _src : srcs) { cids.add(getContentId(_src)); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java index c07c4b68..7b580132 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java @@ -40,7 +40,7 @@ public class SlideModel extends Model implements List, EventListener private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV; private static final int DEFAULT_SLIDE_DURATION = 5000; - private final ArrayList mMedia = new ArrayList(); + private final ArrayList mMedia = new ArrayList<>(); private MediaModel mText; private MediaModel mImage; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java index 5335aafe..88cb3512 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java @@ -127,7 +127,7 @@ public class SlideshowModel extends Model null, 0, 0, w, h); // Create region models. - ArrayList regions = new ArrayList(); + ArrayList regions = new ArrayList<>(); NodeList nlRegions = sle.getRegions(); int regionsNum = nlRegions.getLength(); @@ -144,7 +144,7 @@ public class SlideshowModel extends Model SMILElement docBody = document.getBody(); NodeList slideNodes = docBody.getChildNodes(); int slidesNum = slideNodes.getLength(); - ArrayList slides = new ArrayList(slidesNum); + ArrayList slides = new ArrayList<>(slidesNum); int totalMessageSize = 0; for (int i = 0; i < slidesNum; i++) { @@ -155,9 +155,9 @@ public class SlideshowModel extends Model // Create media models for each slide. NodeList mediaNodes = par.getChildNodes(); int mediaNum = mediaNodes.getLength(); - ArrayList mediaSet = new ArrayList(mediaNum); + ArrayList mediaSet = new ArrayList<>(mediaNum); - ArrayList srcs = new ArrayList(mediaNum); + ArrayList srcs = new ArrayList<>(mediaNum); for (int j = 0; j < mediaNum; j++) { SMILMediaElement sme = (SMILMediaElement) mediaNodes.item(j); srcs.add(sme.getSrc()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SmilHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SmilHelper.java index b1838b7c..122bb1bf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SmilHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SmilHelper.java @@ -282,7 +282,7 @@ public class SmilHelper { // Create REGIONs and append them to LAYOUT ArrayList regions = layouts.getRegions(); - ArrayList smilRegions = new ArrayList(); + ArrayList smilRegions = new ArrayList<>(); for (RegionModel r : regions) { SMILRegionElement smilRegion = (SMILRegionElement) document.createElement("region"); smilRegion.setId(r.getRegionId()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.java b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.java index 62fd6254..ed2122a6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.java @@ -93,7 +93,7 @@ public class MmsReceiver extends BroadcastReceiver { private HashSet getRecipients(GenericPdu pdu) { PduHeaders header = pdu.getPduHeaders(); - HashMap addressMap = new HashMap(ADDRESS_FIELDS.length); + HashMap addressMap = new HashMap<>(ADDRESS_FIELDS.length); for (int addrType : ADDRESS_FIELDS) { EncodedStringValue[] array = null; if (addrType == PduHeaders.FROM) { @@ -107,7 +107,7 @@ public class MmsReceiver extends BroadcastReceiver { } addressMap.put(addrType, array); } - HashSet recipients = new HashSet(); + HashSet recipients = new HashSet<>(); loadRecipients(PduHeaders.FROM, recipients, addressMap, false); loadRecipients(PduHeaders.TO, recipients, addressMap, true); return recipients; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java index 98e1b894..81f07b58 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java @@ -461,7 +461,7 @@ public class SmsHelper { public static List getUnseenMessageNames(Context context) { List messages = getUnseenMessages(context); - List names = new ArrayList(); + List names = new ArrayList<>(); for (int i = 0; i < messages.size(); i++) { if (!names.contains(messages.get(i).getName())) @@ -485,7 +485,7 @@ public class SmsHelper { public static List getUnseenMessages(Context context) { - List messages = new ArrayList(); + List messages = new ArrayList<>(); try { cursor = context.getContentResolver().query(RECEIVED_MESSAGE_CONTENT_PROVIDER, new String[]{COLUMN_ID}, UNSEEN_SELECTION + " AND " + UNREAD_SELECTION, null, sortDateDesc); @@ -524,7 +524,7 @@ public class SmsHelper { public static List getFailedMessages(Context context) { - List messages = new ArrayList(); + List messages = new ArrayList<>(); try { cursor = context.getContentResolver().query(SMS_CONTENT_PROVIDER, new String[]{COLUMN_ID}, FAILED_SELECTION, null, sortDateDesc); @@ -546,7 +546,7 @@ public class SmsHelper { Log.d(TAG, "Deleting failed messages"); - List messages = new ArrayList(); + List messages = new ArrayList<>(); try { cursor = context.getContentResolver().query(SMS_CONTENT_PROVIDER, new String[]{COLUMN_ID}, FAILED_SELECTION, null, sortDateDesc); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java index ff1b2f9d..8a47955c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java @@ -123,7 +123,7 @@ public class DeliveryReportHelper { return null; } - List items = new ArrayList(); + List items = new ArrayList<>(); while (c.moveToNext()) { // For sent messages with delivery reports, we stick the delivery time in the // date_sent column (see MessageStatusReceiver). @@ -236,8 +236,7 @@ public class DeliveryReportHelper { } try { - Map statusMap = - new HashMap(); + Map statusMap = new HashMap<>(); while (c.moveToNext()) { String recipient = c.getString(COLUMN_RECIPIENT); @@ -270,7 +269,7 @@ public class DeliveryReportHelper { return null; } - List reqList = new ArrayList(); + List reqList = new ArrayList<>(); while (c.moveToNext()) { reqList.add(new MmsReportRequest( c.getString(COLUMN_RECIPIENT), diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/mms/SlideView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/mms/SlideView.java index 3879955d..423572cf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/mms/SlideView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/mms/SlideView.java @@ -502,7 +502,7 @@ public class SlideView extends AbsoluteLayout implements } // Layout views to fit the LinearLayout from left to right, then top to // bottom. - TreeMap viewsByPosition = new TreeMap(new Comparator() { + TreeMap viewsByPosition = new TreeMap<>(new Comparator() { public int compare(Position p1, Position p2) { int l1 = p1.mLeft; int t1 = p1.mTop; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java index b20824c0..9aa5350c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/search/SearchFragment.java @@ -32,7 +32,7 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA // Track which TextView's show which Contact objects so that we can update // appropriately when the Contact gets fully loaded. - private HashMap mContactMap = new HashMap(); + private HashMap mContactMap = new HashMap<>(); private Context mContext; private SharedPreferences mPrefs; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index c105fad7..ba524e81 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -219,7 +219,7 @@ public class SettingsFragment extends PreferenceFragment implements // If this is a preference category, make sure to go through all the subpreferences as // well. if (pref instanceof PreferenceCategory) { - Stack stack = new Stack(); + Stack stack = new Stack<>(); stack.push((PreferenceCategory) pref); do { @@ -598,7 +598,7 @@ public class SettingsFragment extends PreferenceFragment implements Set defaultResponses = new HashSet<>(Arrays.asList(mContext.getResources().getStringArray(R.array.qk_responses))); Set responseSet = mPrefs.getStringSet(SettingsFragment.QK_RESPONSES, defaultResponses); - ArrayList responses = new ArrayList(); + ArrayList responses = new ArrayList<>(); responses.addAll(responseSet); Collections.sort(responses); for (int i = responses.size(); i < 12; i++) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java index 30e825f8..82b2a882 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/slidingmenu/CustomViewAbove.java @@ -93,7 +93,7 @@ public class CustomViewAbove extends ViewGroup { private SlidingMenu.OnClosedListener mClosedListener; private SlidingMenu.OnOpenedListener mOpenedListener; - private List mIgnoredViews = new ArrayList(); + private List mIgnoredViews = new ArrayList<>(); // private int mScrollState = SCROLL_STATE_IDLE; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java index 57849a3f..30e9ce2d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/DemoConversationCursorLoader.java @@ -50,7 +50,7 @@ public class DemoConversationCursorLoader extends Loader { // First, build a list of all results. Then, filter the results using mSelection and return // that list. - ArrayList candidates = new ArrayList(); + ArrayList candidates = new ArrayList<>(); if (THREAD_ID_WELCOME_SCREEN == mThreadId) { candidates = new ArrayList(); @@ -70,7 +70,7 @@ public class DemoConversationCursorLoader extends Loader { } // Build the actual list based on the selection. - ArrayList data = new ArrayList(); + ArrayList data = new ArrayList<>(); for (MessageData m : candidates) { if (!SmsHelper.UNREAD_SELECTION.equals(mSelection) || m.read == 0) { data.add(m);