From 0069df879af440ebf415490746d4eedaddb438e2 Mon Sep 17 00:00:00 2001 From: Michael W Date: Mon, 16 Dec 2024 17:16:03 +0100 Subject: [PATCH] Messaging: Replace explicit types Change-Id: I2165b3dec73973a2a82d8b3c7c364b5f011e597d --- .../support/v7/mms/DownloadRequest.java | 3 +-- src/android/support/v7/mms/SendRequest.java | 3 +-- .../support/v7/mms/pdu/CharacterSets.java | 4 ++-- .../support/v7/mms/pdu/ContentType.java | 8 +++---- .../v7/mms/pdu/EncodedStringValue.java | 2 +- src/android/support/v7/mms/pdu/PduBody.java | 10 ++++---- .../support/v7/mms/pdu/PduHeaders.java | 6 ++--- src/android/support/v7/mms/pdu/PduParser.java | 5 ++-- src/android/support/v7/mms/pdu/PduPart.java | 2 +- src/com/android/messaging/FactoryImpl.java | 2 +- .../messaging/datamodel/BitmapPool.java | 3 ++- .../datamodel/BugleDatabaseOperations.java | 20 +++++++--------- .../datamodel/BugleNotifications.java | 6 ++--- .../messaging/datamodel/DatabaseWrapper.java | 4 ++-- .../FrequentContactsCursorBuilder.java | 6 ++--- .../datamodel/MediaScratchFileProvider.java | 3 +-- .../datamodel/MemoryCacheManager.java | 3 ++- .../datamodel/MessageNotificationState.java | 15 ++++++------ .../datamodel/NotificationState.java | 2 +- .../datamodel/ParticipantRefresh.java | 10 ++++---- .../messaging/datamodel/SyncManager.java | 6 ++--- .../messaging/datamodel/action/Action.java | 2 +- .../datamodel/action/ActionMonitor.java | 3 +-- .../action/DeleteConversationAction.java | 2 +- .../datamodel/action/DeleteMessageAction.java | 2 +- .../datamodel/action/DownloadMmsAction.java | 3 +-- .../FixupMessageStatusOnStartupAction.java | 2 +- .../action/GetOrCreateConversationAction.java | 2 +- .../action/InsertNewMessageAction.java | 2 +- .../datamodel/action/MarkAsReadAction.java | 3 +-- .../datamodel/action/MarkAsSeenAction.java | 3 +-- .../action/ProcessDeliveryReportAction.java | 2 +- .../action/ProcessDownloadedMmsAction.java | 2 +- .../action/ProcessPendingMessagesAction.java | 2 +- .../action/ProcessSentMessageAction.java | 2 +- .../datamodel/action/ReadDraftDataAction.java | 2 +- .../action/ReceiveMmsMessageAction.java | 2 +- .../action/ReceiveSmsMessageAction.java | 2 +- .../datamodel/action/RedownloadMmsAction.java | 2 +- .../datamodel/action/ResendMessageAction.java | 2 +- .../datamodel/action/SendMessageAction.java | 3 +-- .../datamodel/action/SyncMessageBatch.java | 2 +- .../datamodel/action/SyncMessagesAction.java | 11 ++++----- ...UpdateConversationArchiveStatusAction.java | 2 +- .../UpdateDestinationBlockedAction.java | 2 +- .../UpdateMessageNotificationAction.java | 2 +- .../action/UpdateMessagePartSizeAction.java | 2 +- .../action/WriteDraftMessageAction.java | 2 +- .../datamodel/binding/BindingBase.java | 7 +++--- .../datamodel/data/ConversationData.java | 4 ++-- .../datamodel/data/ConversationListData.java | 2 +- .../data/ConversationListItemData.java | 2 +- .../data/ConversationMessageData.java | 4 ++-- .../data/ConversationParticipantsData.java | 6 ++--- .../datamodel/data/DraftMessageData.java | 6 ++--- .../messaging/datamodel/data/MessageData.java | 6 ++--- .../datamodel/data/MessagePartData.java | 2 +- .../datamodel/data/ParticipantData.java | 6 ++--- .../datamodel/data/PendingAttachmentData.java | 21 ++++++++-------- .../datamodel/data/SelfParticipantsData.java | 4 ++-- .../datamodel/data/SettingsData.java | 2 +- .../datamodel/data/SubscriptionListData.java | 3 ++- .../media/AsyncMediaRequestWrapper.java | 5 ++-- .../media/AvatarGroupRequestDescriptor.java | 5 ++-- .../media/CustomVCardEntryConstructor.java | 4 ++-- .../datamodel/media/MediaCacheManager.java | 5 ++-- .../datamodel/media/MediaResourceManager.java | 3 +-- .../datamodel/media/PoolableImageCache.java | 5 ++-- .../media/RefCountedMediaResource.java | 5 ++-- .../media/UriImageRequestDescriptor.java | 4 ++-- .../datamodel/media/VCardRequest.java | 2 +- .../datamodel/media/VCardResourceEntry.java | 4 ++-- .../messaging/mmslib/pdu/CharacterSets.java | 5 ++-- .../mmslib/pdu/EncodedStringValue.java | 2 +- .../android/messaging/mmslib/pdu/PduBody.java | 3 ++- .../messaging/mmslib/pdu/PduComposer.java | 3 ++- .../messaging/mmslib/pdu/PduHeaders.java | 7 +++--- .../messaging/mmslib/pdu/PduParser.java | 5 ++-- .../android/messaging/mmslib/pdu/PduPart.java | 3 ++- .../messaging/mmslib/pdu/PduPersister.java | 24 +++++++++---------- .../messaging/mmslib/util/AbstractCache.java | 5 ++-- .../messaging/mmslib/util/PduCache.java | 12 +++++----- .../messaging/sms/DatabaseMessages.java | 13 ++++------ .../android/messaging/sms/MmsSmsUtils.java | 2 +- src/com/android/messaging/sms/MmsUtils.java | 6 ++--- src/com/android/messaging/sms/SmsSender.java | 6 ++--- .../android/messaging/ui/AsyncImageView.java | 2 +- .../messaging/ui/ClassZeroActivity.java | 2 +- .../android/messaging/ui/LineWrapLayout.java | 3 ++- .../messaging/ui/MultiAttachmentLayout.java | 5 ++-- src/com/android/messaging/ui/SnackBar.java | 5 ++-- .../ui/appsettings/SettingsActivity.java | 2 +- .../attachmentchooser/AttachmentGridView.java | 5 ++-- .../ui/contact/ContactRecipientAdapter.java | 2 +- .../ContactRecipientAutoCompleteView.java | 5 ++-- .../contact/ContactRecipientPhotoManager.java | 2 +- .../ui/contact/ContactSectionIndexer.java | 7 +++--- .../ui/conversation/ComposeMessageView.java | 2 +- .../ConversationActivityUiState.java | 2 +- .../ui/conversation/ConversationFragment.java | 2 +- .../ui/conversation/SimSelectorView.java | 2 +- .../AbstractConversationListActivity.java | 2 +- .../ConversationListFragment.java | 2 +- .../conversationlist/ShareIntentActivity.java | 2 +- .../PeopleAndOptionsFragment.java | 4 ++-- .../ui/mediapicker/CameraManager.java | 6 ++--- .../ui/mediapicker/GalleryGridView.java | 24 ++++++++++--------- .../messaging/ui/mediapicker/MediaPicker.java | 6 ++--- .../camerafocus/FocusOverlayManager.java | 4 ++-- .../ui/mediapicker/camerafocus/PieItem.java | 2 +- .../mediapicker/camerafocus/PieRenderer.java | 2 +- .../camerafocus/RenderOverlay.java | 4 ++-- .../android/messaging/util/AvatarUriUtil.java | 3 ++- .../messaging/util/FallbackStrategies.java | 5 ++-- .../android/messaging/util/LongSparseSet.java | 3 ++- .../messaging/util/NotificationPlayer.java | 2 +- src/com/android/messaging/util/OsUtil.java | 4 ++-- src/com/android/messaging/util/UriUtil.java | 4 ++-- .../android/messaging/util/exif/ExifData.java | 8 +++---- .../messaging/util/exif/ExifInterface.java | 6 ++--- .../messaging/util/exif/ExifModifier.java | 3 ++- .../messaging/util/exif/ExifOutputStream.java | 2 +- .../messaging/util/exif/ExifParser.java | 2 +- .../android/messaging/util/exif/IfdData.java | 3 ++- 124 files changed, 278 insertions(+), 277 deletions(-) diff --git a/src/android/support/v7/mms/DownloadRequest.java b/src/android/support/v7/mms/DownloadRequest.java index 7c6ad86..128bc6f 100644 --- a/src/android/support/v7/mms/DownloadRequest.java +++ b/src/android/support/v7/mms/DownloadRequest.java @@ -114,8 +114,7 @@ class DownloadRequest extends MmsRequest { return false; } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { public DownloadRequest createFromParcel(Parcel in) { return new DownloadRequest(in); } diff --git a/src/android/support/v7/mms/SendRequest.java b/src/android/support/v7/mms/SendRequest.java index 3e498a3..2131dc0 100644 --- a/src/android/support/v7/mms/SendRequest.java +++ b/src/android/support/v7/mms/SendRequest.java @@ -145,8 +145,7 @@ class SendRequest extends MmsRequest { return null; } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { public SendRequest createFromParcel(Parcel in) { return new SendRequest(in); } diff --git a/src/android/support/v7/mms/pdu/CharacterSets.java b/src/android/support/v7/mms/pdu/CharacterSets.java index 0bfe646..414cddf 100644 --- a/src/android/support/v7/mms/pdu/CharacterSets.java +++ b/src/android/support/v7/mms/pdu/CharacterSets.java @@ -122,8 +122,8 @@ public class CharacterSets { static { // Create the HashMaps. - MIBENUM_TO_NAME_MAP = new HashMap(); - NAME_TO_MIBENUM_MAP = new HashMap(); + MIBENUM_TO_NAME_MAP = new HashMap<>(); + NAME_TO_MIBENUM_MAP = new HashMap<>(); assert(MIBENUM_NUMBERS.length == MIME_NAMES.length); int count = MIBENUM_NUMBERS.length - 1; for(int i = 0; i <= count; i++) { diff --git a/src/android/support/v7/mms/pdu/ContentType.java b/src/android/support/v7/mms/pdu/ContentType.java index c52c75b..3bcda8e 100644 --- a/src/android/support/v7/mms/pdu/ContentType.java +++ b/src/android/support/v7/mms/pdu/ContentType.java @@ -78,10 +78,10 @@ public class ContentType { public static final String APP_DRM_CONTENT = "application/vnd.oma.drm.content"; public static final String APP_DRM_MESSAGE = "application/vnd.oma.drm.message"; - private static final ArrayList sSupportedContentTypes = new ArrayList(); - private static final ArrayList sSupportedImageTypes = new ArrayList(); - private static final ArrayList sSupportedAudioTypes = new ArrayList(); - private static final ArrayList sSupportedVideoTypes = new ArrayList(); + private static final ArrayList sSupportedContentTypes = new ArrayList<>(); + private static final ArrayList sSupportedImageTypes = new ArrayList<>(); + private static final ArrayList sSupportedAudioTypes = new ArrayList<>(); + private static final ArrayList sSupportedVideoTypes = new ArrayList<>(); static { sSupportedContentTypes.add(TEXT_PLAIN); diff --git a/src/android/support/v7/mms/pdu/EncodedStringValue.java b/src/android/support/v7/mms/pdu/EncodedStringValue.java index 4e05b24..2cbe6cd 100644 --- a/src/android/support/v7/mms/pdu/EncodedStringValue.java +++ b/src/android/support/v7/mms/pdu/EncodedStringValue.java @@ -230,7 +230,7 @@ public class EncodedStringValue implements Cloneable { public static EncodedStringValue[] extract(String src) { String[] values = src.split(";"); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < values.length; i++) { if (values[i].length() > 0) { list.add(new EncodedStringValue(values[i])); diff --git a/src/android/support/v7/mms/pdu/PduBody.java b/src/android/support/v7/mms/pdu/PduBody.java index 4fdc503..d4830eb 100644 --- a/src/android/support/v7/mms/pdu/PduBody.java +++ b/src/android/support/v7/mms/pdu/PduBody.java @@ -34,12 +34,12 @@ public class PduBody { * Constructor. */ public PduBody() { - mParts = new Vector(); + mParts = new Vector<>(); - mPartMapByContentId = new HashMap(); - mPartMapByContentLocation = new HashMap(); - mPartMapByName = new HashMap(); - mPartMapByFileName = new HashMap(); + mPartMapByContentId = new HashMap<>(); + mPartMapByContentLocation = new HashMap<>(); + mPartMapByName = new HashMap<>(); + mPartMapByFileName = new HashMap<>(); } private void putPartToMaps(PduPart part) { diff --git a/src/android/support/v7/mms/pdu/PduHeaders.java b/src/android/support/v7/mms/pdu/PduHeaders.java index 7c6f68b..f7cde51 100644 --- a/src/android/support/v7/mms/pdu/PduHeaders.java +++ b/src/android/support/v7/mms/pdu/PduHeaders.java @@ -327,7 +327,7 @@ public class PduHeaders { * Constructor of PduHeaders. */ public PduHeaders() { - mHeaderMap = new HashMap(); + mHeaderMap = new HashMap<>(); } /** @@ -633,7 +633,7 @@ public class PduHeaders { throw new RuntimeException("Invalid header field!"); } - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < value.length; i++) { list.add(value[i]); } @@ -665,7 +665,7 @@ public class PduHeaders { ArrayList list = (ArrayList) mHeaderMap.get(field); if (null == list) { - list = new ArrayList(); + list = new ArrayList<>(); } list.add(value); mHeaderMap.put(field, list); diff --git a/src/android/support/v7/mms/pdu/PduParser.java b/src/android/support/v7/mms/pdu/PduParser.java index 02c452d..9d3da30 100644 --- a/src/android/support/v7/mms/pdu/PduParser.java +++ b/src/android/support/v7/mms/pdu/PduParser.java @@ -779,8 +779,7 @@ public class PduParser { } case PduHeaders.CONTENT_TYPE: { - HashMap map = - new HashMap(); + HashMap map = new HashMap<>(); byte[] contentType = parseContentType(pduDataStream, map); @@ -849,7 +848,7 @@ public class PduParser { } /* parse part's content-type */ - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); byte[] contentType = parseContentType(pduDataStream, map); if (null != contentType) { part.setContentType(contentType); diff --git a/src/android/support/v7/mms/pdu/PduPart.java b/src/android/support/v7/mms/pdu/PduPart.java index 8c438b4..8b447e2 100644 --- a/src/android/support/v7/mms/pdu/PduPart.java +++ b/src/android/support/v7/mms/pdu/PduPart.java @@ -126,7 +126,7 @@ public class PduPart { * Empty Constructor. */ public PduPart() { - mPartHeader = new HashMap(); + mPartHeader = new HashMap<>(); } /** diff --git a/src/com/android/messaging/FactoryImpl.java b/src/com/android/messaging/FactoryImpl.java index 5870626..53bd83d 100644 --- a/src/com/android/messaging/FactoryImpl.java +++ b/src/com/android/messaging/FactoryImpl.java @@ -92,7 +92,7 @@ class FactoryImpl extends Factory { factory.mUIIntents = new UIIntentsImpl(); factory.mContactContentObserver = new ContactContentObserver(); factory.mMediaUtil = new MediaUtilImpl(); - factory.mSubscriptionPrefs = new SparseArray(); + factory.mSubscriptionPrefs = new SparseArray<>(); factory.mCarrierConfigValuesLoader = new BugleCarrierConfigValuesLoader(applicationContext); if (OsUtil.hasRequiredPermissions()) { diff --git a/src/com/android/messaging/datamodel/BitmapPool.java b/src/com/android/messaging/datamodel/BitmapPool.java index 1a673ba..b619754 100644 --- a/src/com/android/messaging/datamodel/BitmapPool.java +++ b/src/com/android/messaging/datamodel/BitmapPool.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,7 +88,7 @@ public class BitmapPool implements MemoryCache { Assert.isTrue(!TextUtils.isEmpty(name)); mPoolName = name; mMaxSize = maxSize; - mPool = new SparseArray(); + mPool = new SparseArray<>(); } @Override diff --git a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java index 9364f0c..7a448b7 100644 --- a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java +++ b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java @@ -67,7 +67,7 @@ public class BugleDatabaseOperations { // Global cache of phone numbers -> participant id mapping since this call is expensive. private static final ArrayMap sNormalizedPhoneNumberToParticipantIdCache = - new ArrayMap(); + new ArrayMap<>(); /** * Convert list of recipient strings (email/phone number) into list of ConversationParticipants @@ -78,8 +78,7 @@ public class BugleDatabaseOperations { static ArrayList getConversationParticipantsFromRecipients( final List recipients, final int refSubId) { // Generate a list of partially formed participants - final ArrayList participants = new - ArrayList(); + final ArrayList participants = new ArrayList<>(); if (recipients != null) { for (final String recipient : recipients) { @@ -98,7 +97,7 @@ public class BugleDatabaseOperations { Assert.isNotMainThread(); if (participants.size() > 0) { // First remove redundant phone numbers - final HashSet recipients = new HashSet(); + final HashSet recipients = new HashSet<>(); for (int i = participants.size() - 1; i >= 0; i--) { final String recipient = participants.get(i).getNormalizedDestination(); if (!recipients.contains(recipient)) { @@ -141,7 +140,7 @@ public class BugleDatabaseOperations { final List participants) { Assert.isNotMainThread(); // First find the thread id for this list of participants. - final ArrayList recipients = new ArrayList(); + final ArrayList recipients = new ArrayList<>(); for (final ParticipantData participant : participants) { recipients.add(participant.getSendDestination()); @@ -854,7 +853,7 @@ public class BugleDatabaseOperations { final ArrayList participants = getParticipantsForConversation(dbWrapper, conversationId); - final ArrayList recipients = new ArrayList(); + final ArrayList recipients = new ArrayList<>(); for (final ParticipantData participant : participants) { recipients.add(participant.getSendDestination()); } @@ -913,8 +912,7 @@ public class BugleDatabaseOperations { public static ArrayList getParticipantsForConversation( final DatabaseWrapper dbWrapper, final String conversationId) { Assert.isNotMainThread(); - final ArrayList participants = - new ArrayList(); + final ArrayList participants = new ArrayList<>(); try (Cursor cursor = dbWrapper.query(DatabaseHelper.PARTICIPANTS_TABLE, ParticipantData.ParticipantsQuery.PROJECTION, ParticipantColumns._ID + " IN ( " + "SELECT " @@ -1684,7 +1682,7 @@ public class BugleDatabaseOperations { private static HashSet getConversationsForParticipants( final ArrayList participantIds) { final DatabaseWrapper db = DataModel.get().getDatabase(); - final HashSet conversationIds = new HashSet(); + final HashSet conversationIds = new HashSet<>(); final String selection = ConversationParticipantsColumns.PARTICIPANT_ID + "=?"; for (final String participantId : participantIds) { @@ -1734,7 +1732,7 @@ public class BugleDatabaseOperations { @DoesNotRunOnMainThread public static void refreshConversationsForParticipant(final String participantId) { Assert.isNotMainThread(); - final ArrayList participantList = new ArrayList(1); + final ArrayList participantList = new ArrayList<>(1); participantList.add(participantId); refreshConversationsForParticipants(participantList); } @@ -1764,7 +1762,7 @@ public class BugleDatabaseOperations { final String rowKey, final String rowId, final ContentValues values) { Assert.isNotMainThread(); final StringBuilder sb = new StringBuilder(); - final ArrayList whereValues = new ArrayList(values.size() + 1); + final ArrayList whereValues = new ArrayList<>(values.size() + 1); whereValues.add(rowId); for (final String key : values.keySet()) { diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java index 80db602..0fee9d1 100644 --- a/src/com/android/messaging/datamodel/BugleNotifications.java +++ b/src/com/android/messaging/datamodel/BugleNotifications.java @@ -119,8 +119,7 @@ public class BugleNotifications { private static final String WEARABLE_COMPANION_APP_PACKAGE = "com.google.android.wearable.app"; - private static final Set sPendingNotifications = - new HashSet(); + private static final Set sPendingNotifications = new HashSet<>(); private static int sWearableImageWidth; private static int sWearableImageHeight; @@ -134,8 +133,7 @@ public class BugleNotifications { // sLastMessageDingTime is a map between a conversation id and a time. It's used to keep track // of the time we last dinged a message for this conversation. When messages are coming in // at flurry, we don't want to over-ding the user. - private static final SimpleArrayMap sLastMessageDingTime = - new SimpleArrayMap(); + private static final SimpleArrayMap sLastMessageDingTime = new SimpleArrayMap<>(); private static int sTimeBetweenDingsMs; /** diff --git a/src/com/android/messaging/datamodel/DatabaseWrapper.java b/src/com/android/messaging/datamodel/DatabaseWrapper.java index c27f5cd..6f9282c 100644 --- a/src/com/android/messaging/datamodel/DatabaseWrapper.java +++ b/src/com/android/messaging/datamodel/DatabaseWrapper.java @@ -57,7 +57,7 @@ public class DatabaseWrapper { // track transaction on a per thread basis private static final ThreadLocal> sTransactionDepth = - ThreadLocal.withInitial(() -> new Stack()); + ThreadLocal.withInitial(() -> new Stack<>()); private static final String[] sFormatStrings = new String[] { "took %d ms to %s", @@ -69,7 +69,7 @@ public class DatabaseWrapper { mLog = LogUtil.isLoggable(LogUtil.BUGLE_DATABASE_PERF_TAG, LogUtil.VERBOSE); mDatabase = db; mContext = context; - mCompiledStatements = new SparseArray(); + mCompiledStatements = new SparseArray<>(); } public SQLiteStatement getStatementInTransaction(final int index, final String statement) { diff --git a/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java b/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java index 1fb9aa9..a89cb0c 100644 --- a/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java +++ b/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java @@ -86,8 +86,7 @@ public class FrequentContactsCursorBuilder { // First, go through the frequents cursor and take note of all lookup keys and their // corresponding rank in the frequents list. - final SimpleArrayMap lookupKeyToRankMap = - new SimpleArrayMap(); + final SimpleArrayMap lookupKeyToRankMap = new SimpleArrayMap<>(); int oldPosition = mFrequentContactsCursor.getPosition(); int rank = 0; mFrequentContactsCursor.moveToPosition(-1); @@ -102,8 +101,7 @@ public class FrequentContactsCursorBuilder { // (multiple phone numbers etc.) and store that in an array list. Since the all // contacts list only contains phone contacts, this step will ensure that we filter // out any invalid/email contacts in the frequents list. - final ArrayList rows = - new ArrayList(mFrequentContactsCursor.getCount()); + final ArrayList rows = new ArrayList<>(mFrequentContactsCursor.getCount()); oldPosition = mAllContactsCursor.getPosition(); mAllContactsCursor.moveToPosition(-1); while (mAllContactsCursor.moveToNext()) { diff --git a/src/com/android/messaging/datamodel/MediaScratchFileProvider.java b/src/com/android/messaging/datamodel/MediaScratchFileProvider.java index 4e01ad6..dddddb7 100644 --- a/src/com/android/messaging/datamodel/MediaScratchFileProvider.java +++ b/src/com/android/messaging/datamodel/MediaScratchFileProvider.java @@ -44,8 +44,7 @@ import java.util.List; public class MediaScratchFileProvider extends FileProvider { private static final String TAG = LogUtil.BUGLE_TAG; - private static final SimpleArrayMap sUriToDisplayNameMap = - new SimpleArrayMap(); + private static final SimpleArrayMap sUriToDisplayNameMap = new SimpleArrayMap<>(); @VisibleForTesting public static final String AUTHORITY = diff --git a/src/com/android/messaging/datamodel/MemoryCacheManager.java b/src/com/android/messaging/datamodel/MemoryCacheManager.java index 0968cff..33690bc 100644 --- a/src/com/android/messaging/datamodel/MemoryCacheManager.java +++ b/src/com/android/messaging/datamodel/MemoryCacheManager.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +26,7 @@ import java.util.HashSet; * is memory pressure provide a callback to reclaim the memory in the caches. */ public class MemoryCacheManager { - private final HashSet mMemoryCaches = new HashSet(); + private final HashSet mMemoryCaches = new HashSet<>(); private final Object mMemoryCacheLock = new Object(); public static MemoryCacheManager get() { diff --git a/src/com/android/messaging/datamodel/MessageNotificationState.java b/src/com/android/messaging/datamodel/MessageNotificationState.java index 2bced65..6f78298 100644 --- a/src/com/android/messaging/datamodel/MessageNotificationState.java +++ b/src/com/android/messaging/datamodel/MessageNotificationState.java @@ -226,7 +226,7 @@ public abstract class MessageNotificationState extends NotificationState { mIncludeEmailAddress = includeEmailAddress; mReceivedTimestamp = receivedTimestamp; mSelfParticipantId = selfParticipantId; - mLineInfos = new ArrayList(); + mLineInfos = new ArrayList<>(); mTotalMessageCount = 0; mAvatarUri = avatarUri; mContactUri = contactUri; @@ -340,8 +340,7 @@ public abstract class MessageNotificationState extends NotificationState { */ public static class MultiConversationNotificationState extends MessageNotificationState { - public final List - mChildren = new ArrayList(); + public final List mChildren = new ArrayList<>(); public MultiConversationNotificationState( final ConversationInfoList convList, final MessageNotificationState state) { @@ -618,7 +617,7 @@ public abstract class MessageNotificationState extends NotificationState { final Iterator iter = participantsData.iterator(); - final HashMap firstNames = new HashMap(); + final HashMap firstNames = new HashMap<>(); boolean seenSelf = false; while (iter.hasNext()) { final ParticipantData participant = iter.next(); @@ -1040,13 +1039,13 @@ public abstract class MessageNotificationState extends NotificationState { // For now, only show avatars for notifications for a single conversation. if (convInfo.mAvatarUri != null) { if (state.mParticipantAvatarsUris == null) { - state.mParticipantAvatarsUris = new ArrayList(1); + state.mParticipantAvatarsUris = new ArrayList<>(1); } state.mParticipantAvatarsUris.add(convInfo.mAvatarUri); } if (convInfo.mContactUri != null) { if (state.mParticipantContactUris == null) { - state.mParticipantContactUris = new ArrayList(1); + state.mParticipantContactUris = new ArrayList<>(1); } state.mParticipantContactUris.add(convInfo.mContactUri); } @@ -1160,11 +1159,11 @@ public abstract class MessageNotificationState extends NotificationState { if (messageDataCursor != null) { final MessageData messageData = new MessageData(); - final HashSet conversationsWithFailedMessages = new HashSet(); + final HashSet conversationsWithFailedMessages = new HashSet<>(); // track row ids in case we want to display something that requires this // information - final ArrayList failedMessages = new ArrayList(); + final ArrayList failedMessages = new ArrayList<>(); int cursorPosition = -1; final long when = 0; diff --git a/src/com/android/messaging/datamodel/NotificationState.java b/src/com/android/messaging/datamodel/NotificationState.java index f867a99..a548e51 100644 --- a/src/com/android/messaging/datamodel/NotificationState.java +++ b/src/com/android/messaging/datamodel/NotificationState.java @@ -71,7 +71,7 @@ public abstract class NotificationState { NotificationState(final ConversationIdSet conversationIds) { mConversationIds = conversationIds; - mPeople = new HashSet(); + mPeople = new HashSet<>(); } /** diff --git a/src/com/android/messaging/datamodel/ParticipantRefresh.java b/src/com/android/messaging/datamodel/ParticipantRefresh.java index 60a0d05..a5a6595 100644 --- a/src/com/android/messaging/datamodel/ParticipantRefresh.java +++ b/src/com/android/messaging/datamodel/ParticipantRefresh.java @@ -234,7 +234,7 @@ public class ParticipantRefresh { refreshSelfParticipantList(); } - final ArrayList changedParticipants = new ArrayList(); + final ArrayList changedParticipants = new ArrayList<>(); String selection = null; String[] selectionArgs = null; @@ -306,7 +306,7 @@ public class ParticipantRefresh { private static Set getExistingSubIds() { final DatabaseWrapper db = DataModel.get().getDatabase(); - final HashSet existingSubIds = new HashSet(); + final HashSet existingSubIds = new HashSet<>(); try (Cursor cursor = db.query(DatabaseHelper.PARTICIPANTS_TABLE, ParticipantsQuery.PROJECTION, @@ -346,7 +346,7 @@ public class ParticipantRefresh { final List subInfoRecords = PhoneUtils.getDefault().getActiveSubscriptionInfoList(); final ArrayMap activeSubscriptionIdToRecordMap = - new ArrayMap(); + new ArrayMap<>(); db.beginTransaction(); final Set existingSubIds = getExistingSubIds(); @@ -603,7 +603,7 @@ public class ParticipantRefresh { */ private static List getInactiveSelfParticipantIds() { final DatabaseWrapper db = DataModel.get().getDatabase(); - final List inactiveSelf = new ArrayList(); + final List inactiveSelf = new ArrayList<>(); final String selection = ParticipantColumns.SIM_SLOT_ID + "=? AND " + SELF_PARTICIPANTS_CLAUSE; @@ -628,7 +628,7 @@ public class ParticipantRefresh { */ private static List getConversationsWithSelfParticipantIds(final List selfIds) { final DatabaseWrapper db = DataModel.get().getDatabase(); - final List conversationIds = new ArrayList(); + final List conversationIds = new ArrayList<>(); Cursor cursor = null; try { diff --git a/src/com/android/messaging/datamodel/SyncManager.java b/src/com/android/messaging/datamodel/SyncManager.java index 2f7e269..1362439 100644 --- a/src/com/android/messaging/datamodel/SyncManager.java +++ b/src/com/android/messaging/datamodel/SyncManager.java @@ -365,12 +365,10 @@ public class SyncManager { public static class ThreadInfoCache { // Cache of thread->conversationId map - private final LongSparseArray mThreadToConversationId = - new LongSparseArray(); + private final LongSparseArray mThreadToConversationId = new LongSparseArray<>(); // Cache of thread->recipients map - private final LongSparseArray> mThreadToRecipients = - new LongSparseArray>(); + private final LongSparseArray> mThreadToRecipients = new LongSparseArray<>(); // Remember the conversation ids that need to be archived private final HashSet mArchivedConversations = new HashSet<>(); diff --git a/src/com/android/messaging/datamodel/action/Action.java b/src/com/android/messaging/datamodel/action/Action.java index 63873e8..bd548c9 100644 --- a/src/com/android/messaging/datamodel/action/Action.java +++ b/src/com/android/messaging/datamodel/action/Action.java @@ -47,7 +47,7 @@ public abstract class Action implements Parcelable { protected final Bundle actionParameters; // This does not get written to the parcel - private final List mBackgroundActions = new LinkedList(); + private final List mBackgroundActions = new LinkedList<>(); /** * Process the action locally - runs on action service thread. diff --git a/src/com/android/messaging/datamodel/action/ActionMonitor.java b/src/com/android/messaging/datamodel/action/ActionMonitor.java index 0edd75b..bf14671 100644 --- a/src/com/android/messaging/datamodel/action/ActionMonitor.java +++ b/src/com/android/messaging/datamodel/action/ActionMonitor.java @@ -413,8 +413,7 @@ public class ActionMonitor { * Map of action monitors indexed by actionKey */ @VisibleForTesting - static final SimpleArrayMap sActionMonitors = - new SimpleArrayMap(); + static final SimpleArrayMap sActionMonitors = new SimpleArrayMap<>(); /** * Insert new monitor into map diff --git a/src/com/android/messaging/datamodel/action/DeleteConversationAction.java b/src/com/android/messaging/datamodel/action/DeleteConversationAction.java index 69d12e1..81e14db 100644 --- a/src/com/android/messaging/datamodel/action/DeleteConversationAction.java +++ b/src/com/android/messaging/datamodel/action/DeleteConversationAction.java @@ -188,7 +188,7 @@ public class DeleteConversationAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public DeleteConversationAction createFromParcel(final Parcel in) { return new DeleteConversationAction(in); diff --git a/src/com/android/messaging/datamodel/action/DeleteMessageAction.java b/src/com/android/messaging/datamodel/action/DeleteMessageAction.java index 4ea939a..46ed7af 100644 --- a/src/com/android/messaging/datamodel/action/DeleteMessageAction.java +++ b/src/com/android/messaging/datamodel/action/DeleteMessageAction.java @@ -119,7 +119,7 @@ public class DeleteMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public DeleteMessageAction createFromParcel(final Parcel in) { return new DeleteMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/DownloadMmsAction.java b/src/com/android/messaging/datamodel/action/DownloadMmsAction.java index 8595b65..c69bac9 100644 --- a/src/com/android/messaging/datamodel/action/DownloadMmsAction.java +++ b/src/com/android/messaging/datamodel/action/DownloadMmsAction.java @@ -327,8 +327,7 @@ public class DownloadMmsAction extends Action implements Parcelable { super(in); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public DownloadMmsAction createFromParcel(final Parcel in) { return new DownloadMmsAction(in); diff --git a/src/com/android/messaging/datamodel/action/FixupMessageStatusOnStartupAction.java b/src/com/android/messaging/datamodel/action/FixupMessageStatusOnStartupAction.java index bcb60df..722fea2 100644 --- a/src/com/android/messaging/datamodel/action/FixupMessageStatusOnStartupAction.java +++ b/src/com/android/messaging/datamodel/action/FixupMessageStatusOnStartupAction.java @@ -97,7 +97,7 @@ public class FixupMessageStatusOnStartupAction extends Action implements Parcela } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public FixupMessageStatusOnStartupAction createFromParcel(final Parcel in) { return new FixupMessageStatusOnStartupAction(in); diff --git a/src/com/android/messaging/datamodel/action/GetOrCreateConversationAction.java b/src/com/android/messaging/datamodel/action/GetOrCreateConversationAction.java index 5c492fc..35e0fc3 100644 --- a/src/com/android/messaging/datamodel/action/GetOrCreateConversationAction.java +++ b/src/com/android/messaging/datamodel/action/GetOrCreateConversationAction.java @@ -157,7 +157,7 @@ public class GetOrCreateConversationAction extends Action implements Parcelable } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public GetOrCreateConversationAction createFromParcel(final Parcel in) { return new GetOrCreateConversationAction(in); diff --git a/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java b/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java index 4724c89..b53c212 100644 --- a/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java +++ b/src/com/android/messaging/datamodel/action/InsertNewMessageAction.java @@ -463,7 +463,7 @@ public class InsertNewMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public InsertNewMessageAction createFromParcel(final Parcel in) { return new InsertNewMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/MarkAsReadAction.java b/src/com/android/messaging/datamodel/action/MarkAsReadAction.java index 61e135e..c7450e0 100644 --- a/src/com/android/messaging/datamodel/action/MarkAsReadAction.java +++ b/src/com/android/messaging/datamodel/action/MarkAsReadAction.java @@ -96,8 +96,7 @@ public class MarkAsReadAction extends Action implements Parcelable { super(in); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public MarkAsReadAction createFromParcel(final Parcel in) { return new MarkAsReadAction(in); diff --git a/src/com/android/messaging/datamodel/action/MarkAsSeenAction.java b/src/com/android/messaging/datamodel/action/MarkAsSeenAction.java index 115aa51..8f84d67 100644 --- a/src/com/android/messaging/datamodel/action/MarkAsSeenAction.java +++ b/src/com/android/messaging/datamodel/action/MarkAsSeenAction.java @@ -109,8 +109,7 @@ public class MarkAsSeenAction extends Action implements Parcelable { super(in); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public MarkAsSeenAction createFromParcel(final Parcel in) { return new MarkAsSeenAction(in); diff --git a/src/com/android/messaging/datamodel/action/ProcessDeliveryReportAction.java b/src/com/android/messaging/datamodel/action/ProcessDeliveryReportAction.java index 05c6b11..3821484 100644 --- a/src/com/android/messaging/datamodel/action/ProcessDeliveryReportAction.java +++ b/src/com/android/messaging/datamodel/action/ProcessDeliveryReportAction.java @@ -106,7 +106,7 @@ public class ProcessDeliveryReportAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ProcessDeliveryReportAction createFromParcel(final Parcel in) { return new ProcessDeliveryReportAction(in); diff --git a/src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java b/src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java index 18ddfd1..49562d2 100644 --- a/src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java +++ b/src/com/android/messaging/datamodel/action/ProcessDownloadedMmsAction.java @@ -565,7 +565,7 @@ public class ProcessDownloadedMmsAction extends Action { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ProcessDownloadedMmsAction createFromParcel(final Parcel in) { return new ProcessDownloadedMmsAction(in); diff --git a/src/com/android/messaging/datamodel/action/ProcessPendingMessagesAction.java b/src/com/android/messaging/datamodel/action/ProcessPendingMessagesAction.java index 24ae456..1a360cf 100644 --- a/src/com/android/messaging/datamodel/action/ProcessPendingMessagesAction.java +++ b/src/com/android/messaging/datamodel/action/ProcessPendingMessagesAction.java @@ -457,7 +457,7 @@ public class ProcessPendingMessagesAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ProcessPendingMessagesAction createFromParcel(final Parcel in) { return new ProcessPendingMessagesAction(in); diff --git a/src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java b/src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java index 393667b..bd7ee3d 100644 --- a/src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java +++ b/src/com/android/messaging/datamodel/action/ProcessSentMessageAction.java @@ -296,7 +296,7 @@ public class ProcessSentMessageAction extends Action { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ProcessSentMessageAction createFromParcel(final Parcel in) { return new ProcessSentMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/ReadDraftDataAction.java b/src/com/android/messaging/datamodel/action/ReadDraftDataAction.java index 9d519b4..64584e0 100644 --- a/src/com/android/messaging/datamodel/action/ReadDraftDataAction.java +++ b/src/com/android/messaging/datamodel/action/ReadDraftDataAction.java @@ -150,7 +150,7 @@ public class ReadDraftDataAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ReadDraftDataAction createFromParcel(final Parcel in) { return new ReadDraftDataAction(in); diff --git a/src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java b/src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java index 13b16ad..b4ccb60 100644 --- a/src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java +++ b/src/com/android/messaging/datamodel/action/ReceiveMmsMessageAction.java @@ -181,7 +181,7 @@ public class ReceiveMmsMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ReceiveMmsMessageAction createFromParcel(final Parcel in) { return new ReceiveMmsMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java b/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java index 382d4ad..013c352 100644 --- a/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java +++ b/src/com/android/messaging/datamodel/action/ReceiveSmsMessageAction.java @@ -184,7 +184,7 @@ public class ReceiveSmsMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ReceiveSmsMessageAction createFromParcel(final Parcel in) { return new ReceiveSmsMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/RedownloadMmsAction.java b/src/com/android/messaging/datamodel/action/RedownloadMmsAction.java index c226643..7b2cf2d 100644 --- a/src/com/android/messaging/datamodel/action/RedownloadMmsAction.java +++ b/src/com/android/messaging/datamodel/action/RedownloadMmsAction.java @@ -115,7 +115,7 @@ public class RedownloadMmsAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public RedownloadMmsAction createFromParcel(final Parcel in) { return new RedownloadMmsAction(in); diff --git a/src/com/android/messaging/datamodel/action/ResendMessageAction.java b/src/com/android/messaging/datamodel/action/ResendMessageAction.java index e7dbdd3..147fdd7 100644 --- a/src/com/android/messaging/datamodel/action/ResendMessageAction.java +++ b/src/com/android/messaging/datamodel/action/ResendMessageAction.java @@ -115,7 +115,7 @@ public class ResendMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ResendMessageAction createFromParcel(final Parcel in) { return new ResendMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/SendMessageAction.java b/src/com/android/messaging/datamodel/action/SendMessageAction.java index 5ed3d11..2f8d00b 100644 --- a/src/com/android/messaging/datamodel/action/SendMessageAction.java +++ b/src/com/android/messaging/datamodel/action/SendMessageAction.java @@ -435,8 +435,7 @@ public class SendMessageAction extends Action implements Parcelable { super(in); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public SendMessageAction createFromParcel(final Parcel in) { return new SendMessageAction(in); diff --git a/src/com/android/messaging/datamodel/action/SyncMessageBatch.java b/src/com/android/messaging/datamodel/action/SyncMessageBatch.java index 20c03fc..73f6096 100644 --- a/src/com/android/messaging/datamodel/action/SyncMessageBatch.java +++ b/src/com/android/messaging/datamodel/action/SyncMessageBatch.java @@ -73,7 +73,7 @@ class SyncMessageBatch { mMmsToAdd = mmsToAdd; mMessagesToDelete = messagesToDelete; mCache = cache; - mConversationsToUpdate = new HashSet(); + mConversationsToUpdate = new HashSet<>(); } void updateLocalDatabase() { diff --git a/src/com/android/messaging/datamodel/action/SyncMessagesAction.java b/src/com/android/messaging/datamodel/action/SyncMessagesAction.java index 3e441fe..21e7d83 100644 --- a/src/com/android/messaging/datamodel/action/SyncMessagesAction.java +++ b/src/com/android/messaging/datamodel/action/SyncMessagesAction.java @@ -221,12 +221,11 @@ public class SyncMessagesAction extends Action implements Parcelable { cache.clear(); // Sms messages to store - final ArrayList smsToAdd = new ArrayList(); + final ArrayList smsToAdd = new ArrayList<>(); // Mms messages to store - final LongSparseArray mmsToAdd = new LongSparseArray(); + final LongSparseArray mmsToAdd = new LongSparseArray<>(); // List of local SMS/MMS to remove - final ArrayList messagesToDelete = - new ArrayList(); + final ArrayList messagesToDelete = new ArrayList<>(); long lastTimestampMillis = SYNC_FAILED; if (syncManager.isSyncing(upperBoundTimeMillis)) { @@ -242,7 +241,7 @@ public class SyncMessagesAction extends Action implements Parcelable { // If comparison succeeds bundle up the changes for processing in ActionService if (lastTimestampMillis > SYNC_FAILED) { - final ArrayList mmsToAddList = new ArrayList(); + final ArrayList mmsToAddList = new ArrayList<>(); for (int i = 0; i < mmsToAdd.size(); i++) { final MmsMessage mms = mmsToAdd.valueAt(i); mmsToAddList.add(mms); @@ -610,7 +609,7 @@ public class SyncMessagesAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public SyncMessagesAction createFromParcel(final Parcel in) { return new SyncMessagesAction(in); diff --git a/src/com/android/messaging/datamodel/action/UpdateConversationArchiveStatusAction.java b/src/com/android/messaging/datamodel/action/UpdateConversationArchiveStatusAction.java index a1cc319..1b02910 100644 --- a/src/com/android/messaging/datamodel/action/UpdateConversationArchiveStatusAction.java +++ b/src/com/android/messaging/datamodel/action/UpdateConversationArchiveStatusAction.java @@ -77,7 +77,7 @@ public class UpdateConversationArchiveStatusAction extends Action { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public UpdateConversationArchiveStatusAction createFromParcel(final Parcel in) { return new UpdateConversationArchiveStatusAction(in); diff --git a/src/com/android/messaging/datamodel/action/UpdateDestinationBlockedAction.java b/src/com/android/messaging/datamodel/action/UpdateDestinationBlockedAction.java index 9c78725..4d61b0a 100644 --- a/src/com/android/messaging/datamodel/action/UpdateDestinationBlockedAction.java +++ b/src/com/android/messaging/datamodel/action/UpdateDestinationBlockedAction.java @@ -132,7 +132,7 @@ public class UpdateDestinationBlockedAction extends Action { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public UpdateDestinationBlockedAction createFromParcel(final Parcel in) { return new UpdateDestinationBlockedAction(in); diff --git a/src/com/android/messaging/datamodel/action/UpdateMessageNotificationAction.java b/src/com/android/messaging/datamodel/action/UpdateMessageNotificationAction.java index d375da1..88d737d 100644 --- a/src/com/android/messaging/datamodel/action/UpdateMessageNotificationAction.java +++ b/src/com/android/messaging/datamodel/action/UpdateMessageNotificationAction.java @@ -47,7 +47,7 @@ public class UpdateMessageNotificationAction extends Action { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public UpdateMessageNotificationAction createFromParcel(final Parcel in) { return new UpdateMessageNotificationAction(in); diff --git a/src/com/android/messaging/datamodel/action/UpdateMessagePartSizeAction.java b/src/com/android/messaging/datamodel/action/UpdateMessagePartSizeAction.java index 2a6a223..5dcb387 100644 --- a/src/com/android/messaging/datamodel/action/UpdateMessagePartSizeAction.java +++ b/src/com/android/messaging/datamodel/action/UpdateMessagePartSizeAction.java @@ -87,7 +87,7 @@ public class UpdateMessagePartSizeAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public UpdateMessagePartSizeAction createFromParcel(final Parcel in) { return new UpdateMessagePartSizeAction(in); diff --git a/src/com/android/messaging/datamodel/action/WriteDraftMessageAction.java b/src/com/android/messaging/datamodel/action/WriteDraftMessageAction.java index ca8caaf..6efe9c2 100644 --- a/src/com/android/messaging/datamodel/action/WriteDraftMessageAction.java +++ b/src/com/android/messaging/datamodel/action/WriteDraftMessageAction.java @@ -88,7 +88,7 @@ public class WriteDraftMessageAction extends Action implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public WriteDraftMessageAction createFromParcel(final Parcel in) { return new WriteDraftMessageAction(in); diff --git a/src/com/android/messaging/datamodel/binding/BindingBase.java b/src/com/android/messaging/datamodel/binding/BindingBase.java index 3d6da9b..94ce2e5 100644 --- a/src/com/android/messaging/datamodel/binding/BindingBase.java +++ b/src/com/android/messaging/datamodel/binding/BindingBase.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +34,7 @@ public abstract class BindingBase { * Creates a new exclusively owned binding for the owner object. */ public static Binding createBinding(final Object owner) { - return new Binding(owner); + return new Binding<>(owner); } /** @@ -43,7 +44,7 @@ public abstract class BindingBase { */ public static ImmutableBindingRef createBindingReference( final BindingBase srcBinding) { - return new ImmutableBindingRef(srcBinding); + return new ImmutableBindingRef<>(srcBinding); } /** @@ -52,7 +53,7 @@ public abstract class BindingBase { */ public static DetachableBinding createDetachableBinding( final Object owner) { - return new DetachableBinding(owner); + return new DetachableBinding<>(owner); } public abstract T getData(); diff --git a/src/com/android/messaging/datamodel/data/ConversationData.java b/src/com/android/messaging/datamodel/data/ConversationData.java index 5d5161f..c8d96fb 100644 --- a/src/com/android/messaging/datamodel/data/ConversationData.java +++ b/src/com/android/messaging/datamodel/data/ConversationData.java @@ -72,7 +72,7 @@ public class ConversationData extends BindableData { * for each message. */ public List getPositions(final String conversationId, final List ids) { - final ArrayList result = new ArrayList(); + final ArrayList result = new ArrayList<>(); if (ids.isEmpty()) { return result; @@ -84,7 +84,7 @@ public class ConversationData extends BindableData { new String [] { conversationId })); if (c != null) { try { - final Set idsSet = new HashSet(ids); + final Set idsSet = new HashSet<>(ids); if (c.moveToLast()) { do { final long messageId = c.getLong(0); diff --git a/src/com/android/messaging/datamodel/data/ConversationListData.java b/src/com/android/messaging/datamodel/data/ConversationListData.java index ace2595..c33ebf8 100644 --- a/src/com/android/messaging/datamodel/data/ConversationListData.java +++ b/src/com/android/messaging/datamodel/data/ConversationListData.java @@ -81,7 +81,7 @@ public class ConversationListData extends BindableData private static final int INDEX_BLOCKED_PARTICIPANTS_NORMALIZED_DESTINATION = 1; // all blocked participants - private final HashSet mBlockedParticipants = new HashSet(); + private final HashSet mBlockedParticipants = new HashSet<>(); @NonNull @Override diff --git a/src/com/android/messaging/datamodel/data/ConversationListItemData.java b/src/com/android/messaging/datamodel/data/ConversationListItemData.java index d426744..73cfbd2 100644 --- a/src/com/android/messaging/datamodel/data/ConversationListItemData.java +++ b/src/com/android/messaging/datamodel/data/ConversationListItemData.java @@ -489,7 +489,7 @@ public class ConversationListItemData { return participants.get(0).getDisplayName(true); } - final ArrayList participantNames = new ArrayList(); + final ArrayList participantNames = new ArrayList<>(); for (final ParticipantData participant : participants) { // Prefer first name over full name for group conversation participantNames.add(participant.getDisplayName(false)); diff --git a/src/com/android/messaging/datamodel/data/ConversationMessageData.java b/src/com/android/messaging/datamodel/data/ConversationMessageData.java index e4b18ad..db2ba2c 100644 --- a/src/com/android/messaging/datamodel/data/ConversationMessageData.java +++ b/src/com/android/messaging/datamodel/data/ConversationMessageData.java @@ -163,7 +163,7 @@ public class ConversationMessageData { // statics to avoid unnecessary object allocation private static final StringBuilder sUnquoteStringBuilder = new StringBuilder(); - private static final ArrayList sUnquoteResults = new ArrayList(); + private static final ArrayList sUnquoteResults = new ArrayList<>(); // this lock is used to guard access to the above statics private static final Object sUnquoteLock = new Object(); @@ -281,7 +281,7 @@ public class ConversationMessageData { final String rawTexts, final int partsCount, final String messageId) { - final List parts = new LinkedList(); + final List parts = new LinkedList<>(); if (partsCount == 1) { parts.add(makePartData( rawIds, diff --git a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java index aeae41d..18da8bf 100644 --- a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java +++ b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java @@ -42,7 +42,7 @@ public class ConversationParticipantsData implements Iterable { private int mParticipantCountExcludingSelf = 0; public ConversationParticipantsData() { - mConversationParticipantsMap = new SimpleArrayMap(); + mConversationParticipantsMap = new SimpleArrayMap<>(); } public void bind(final Cursor cursor) { @@ -66,7 +66,7 @@ public class ConversationParticipantsData implements Iterable { ArrayList getParticipantListExcludingSelf() { final ArrayList retList = - new ArrayList(mConversationParticipantsMap.size()); + new ArrayList<>(mConversationParticipantsMap.size()); for (int i = 0; i < mConversationParticipantsMap.size(); i++) { final ParticipantData participant = mConversationParticipantsMap.valueAt(i); if (!participant.isSelf()) { @@ -103,7 +103,7 @@ public class ConversationParticipantsData implements Iterable { @NonNull @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { private int mCurrentIndex = -1; @Override diff --git a/src/com/android/messaging/datamodel/data/DraftMessageData.java b/src/com/android/messaging/datamodel/data/DraftMessageData.java index 85ffb80..0231e28 100644 --- a/src/com/android/messaging/datamodel/data/DraftMessageData.java +++ b/src/com/android/messaging/datamodel/data/DraftMessageData.java @@ -117,9 +117,9 @@ public class DraftMessageData extends BindableData implements ReadDraftDataActio public DraftMessageData(final String conversationId) { mConversationId = conversationId; - mAttachments = new ArrayList(); + mAttachments = new ArrayList<>(); mReadOnlyAttachments = Collections.unmodifiableList(mAttachments); - mPendingAttachments = new ArrayList(); + mPendingAttachments = new ArrayList<>(); mReadOnlyPendingAttachments = Collections.unmodifiableList(mPendingAttachments); mListeners = new DraftMessageDataEventDispatcher(); mMessageTextStats = new MessageTextStats(); @@ -773,7 +773,7 @@ public class DraftMessageData extends BindableData implements ReadDraftDataActio mBindingId = binding.getBindingId(); // Obtain an immutable copy of the attachment list so we can operate on it in the // background thread. - mAttachmentsCopy = new ArrayList(mAttachments); + mAttachmentsCopy = new ArrayList<>(mAttachments); mCheckDraftForSendTask = this; } diff --git a/src/com/android/messaging/datamodel/data/MessageData.java b/src/com/android/messaging/datamodel/data/MessageData.java index fc22d8c..117485c 100644 --- a/src/com/android/messaging/datamodel/data/MessageData.java +++ b/src/com/android/messaging/datamodel/data/MessageData.java @@ -202,7 +202,7 @@ public class MessageData implements Parcelable { * Create an "empty" message */ public MessageData() { - mParts = new ArrayList(); + mParts = new ArrayList<>(); } public static String[] getProjection() { @@ -846,7 +846,7 @@ public class MessageData implements Parcelable { mRetryStartTimestamp = in.readLong(); // Read parts - mParts = new ArrayList(); + mParts = new ArrayList<>(); final int partCount = in.readInt(); for (int i = 0; i < partCount; i++) { mParts.add((MessagePartData) in.readParcelable(MessagePartData.class.getClassLoader())); @@ -889,7 +889,7 @@ public class MessageData implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public MessageData createFromParcel(final Parcel in) { return new MessageData(in); diff --git a/src/com/android/messaging/datamodel/data/MessagePartData.java b/src/com/android/messaging/datamodel/data/MessagePartData.java index 4e0c577..48be25e 100644 --- a/src/com/android/messaging/datamodel/data/MessagePartData.java +++ b/src/com/android/messaging/datamodel/data/MessagePartData.java @@ -413,7 +413,7 @@ public class MessagePartData implements Parcelable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public MessagePartData createFromParcel(final Parcel in) { return new MessagePartData(in); diff --git a/src/com/android/messaging/datamodel/data/ParticipantData.java b/src/com/android/messaging/datamodel/data/ParticipantData.java index 6a7690e..48adc55 100644 --- a/src/com/android/messaging/datamodel/data/ParticipantData.java +++ b/src/com/android/messaging/datamodel/data/ParticipantData.java @@ -45,8 +45,7 @@ import com.android.messaging.util.TextUtil; */ public class ParticipantData implements Parcelable { - private static final ArrayMap sSubIdtoParticipantIdCache = - new ArrayMap(); + private static final ArrayMap sSubIdtoParticipantIdCache = new ArrayMap<>(); // We always use -1 as default/invalid sub id although system may give us anything negative public static final int DEFAULT_SELF_SUB_ID = MmsManager.DEFAULT_SUB_ID; @@ -583,8 +582,7 @@ public class ParticipantData implements Parcelable { dest.writeString(mSubscriptionName); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public ParticipantData createFromParcel(final Parcel in) { return new ParticipantData(in); diff --git a/src/com/android/messaging/datamodel/data/PendingAttachmentData.java b/src/com/android/messaging/datamodel/data/PendingAttachmentData.java index a5b5460..34b3b30 100644 --- a/src/com/android/messaging/datamodel/data/PendingAttachmentData.java +++ b/src/com/android/messaging/datamodel/data/PendingAttachmentData.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,15 +163,15 @@ public class PendingAttachmentData extends MessagePartData { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { - @Override - public PendingAttachmentData createFromParcel(final Parcel in) { - return new PendingAttachmentData(in); - } + = new Parcelable.Creator<>() { + @Override + public PendingAttachmentData createFromParcel(final Parcel in) { + return new PendingAttachmentData(in); + } - @Override - public PendingAttachmentData[] newArray(final int size) { - return new PendingAttachmentData[size]; - } - }; + @Override + public PendingAttachmentData[] newArray(final int size) { + return new PendingAttachmentData[size]; + } + }; } diff --git a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java index e646de5..852fcd6 100644 --- a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java +++ b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java @@ -37,7 +37,7 @@ public class SelfParticipantsData { private final ArrayMap mSelfParticipantMap; public SelfParticipantsData() { - mSelfParticipantMap = new ArrayMap(); + mSelfParticipantMap = new ArrayMap<>(); } public void bind(final Cursor cursor) { @@ -55,7 +55,7 @@ public class SelfParticipantsData { * @param activeOnly if set, returns active self entries only (i.e. those with SIMs plugged in). */ public List getSelfParticipants(final boolean activeOnly) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (final ParticipantData self : mSelfParticipantMap.values()) { if (!activeOnly || self.isActiveSubscription()) { list.add(self); diff --git a/src/com/android/messaging/datamodel/data/SettingsData.java b/src/com/android/messaging/datamodel/data/SettingsData.java index 88f8af0..69622f2 100644 --- a/src/com/android/messaging/datamodel/data/SettingsData.java +++ b/src/com/android/messaging/datamodel/data/SettingsData.java @@ -196,7 +196,7 @@ public class SettingsData extends BindableData implements public List getSettingsItems() { final List selfs = mSelfParticipantsData.getSelfParticipants(true); - final List settingsItems = new ArrayList(); + final List settingsItems = new ArrayList<>(); // First goes the general settings, followed by per-subscription settings. settingsItems.add(SettingsItem.createGeneralSettingsItem(mContext)); // For per-subscription settings, show the actual SIM name with phone number if the diff --git a/src/com/android/messaging/datamodel/data/SubscriptionListData.java b/src/com/android/messaging/datamodel/data/SubscriptionListData.java index b5d4e4b..3e87ae3 100644 --- a/src/com/android/messaging/datamodel/data/SubscriptionListData.java +++ b/src/com/android/messaging/datamodel/data/SubscriptionListData.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,7 +87,7 @@ public class SubscriptionListData { private final Context mContext; public SubscriptionListData(final Context context) { - mEntriesExcludingDefault = new ArrayList(); + mEntriesExcludingDefault = new ArrayList<>(); mContext = context; } diff --git a/src/com/android/messaging/datamodel/media/AsyncMediaRequestWrapper.java b/src/com/android/messaging/datamodel/media/AsyncMediaRequestWrapper.java index 380d93c..d9a7391 100644 --- a/src/com/android/messaging/datamodel/media/AsyncMediaRequestWrapper.java +++ b/src/com/android/messaging/datamodel/media/AsyncMediaRequestWrapper.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,7 @@ class AsyncMediaRequestWrapper extends Bindab public static AsyncMediaRequestWrapper createWith(final MediaRequest wrappedRequest, final MediaResourceLoadListener listener) { - return new AsyncMediaRequestWrapper(listener, wrappedRequest); + return new AsyncMediaRequestWrapper<>(listener, wrappedRequest); } private final MediaRequest mWrappedRequest; @@ -71,4 +72,4 @@ class AsyncMediaRequestWrapper extends Bindab public MediaRequestDescriptor getDescriptor() { return mWrappedRequest.getDescriptor(); } -} \ No newline at end of file +} diff --git a/src/com/android/messaging/datamodel/media/AvatarGroupRequestDescriptor.java b/src/com/android/messaging/datamodel/media/AvatarGroupRequestDescriptor.java index 719b296..385cc83 100644 --- a/src/com/android/messaging/datamodel/media/AvatarGroupRequestDescriptor.java +++ b/src/com/android/messaging/datamodel/media/AvatarGroupRequestDescriptor.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +45,7 @@ public class AvatarGroupRequestDescriptor extends CompositeImageRequestDescripto final int desiredWidth, final int desiredHeight) { final List participantUriStrings = AvatarUriUtil.getGroupParticipantUris(uri); final List avatarDescriptors = - new ArrayList(participantUriStrings.size()); + new ArrayList<>(participantUriStrings.size()); for (final String uriString : participantUriStrings) { final AvatarRequestDescriptor descriptor = new AvatarRequestDescriptor( Uri.parse(uriString), desiredWidth, desiredHeight); @@ -55,7 +56,7 @@ public class AvatarGroupRequestDescriptor extends CompositeImageRequestDescripto @Override public CompositeImageRequest buildBatchImageRequest(final Context context) { - return new CompositeImageRequest(context, this); + return new CompositeImageRequest<>(context, this); } @Override diff --git a/src/com/android/messaging/datamodel/media/CustomVCardEntryConstructor.java b/src/com/android/messaging/datamodel/media/CustomVCardEntryConstructor.java index 200e4d2..db71514 100644 --- a/src/com/android/messaging/datamodel/media/CustomVCardEntryConstructor.java +++ b/src/com/android/messaging/datamodel/media/CustomVCardEntryConstructor.java @@ -59,13 +59,13 @@ public class CustomVCardEntryConstructor implements VCardInterpreter { /** * Represents current stack of VCardEntry. Used to support nested vCard (vCard 2.1). */ - private final List mEntryStack = new ArrayList(); + private final List mEntryStack = new ArrayList<>(); private CustomVCardEntry mCurrentEntry; private final int mVCardType; private final Account mAccount; - private final List mEntryHandlers = new ArrayList(); + private final List mEntryHandlers = new ArrayList<>(); public CustomVCardEntryConstructor() { this(VCardConfig.VCARD_TYPE_V21_GENERIC, null); diff --git a/src/com/android/messaging/datamodel/media/MediaCacheManager.java b/src/com/android/messaging/datamodel/media/MediaCacheManager.java index 6e029f2..ccc4cfe 100644 --- a/src/com/android/messaging/datamodel/media/MediaCacheManager.java +++ b/src/com/android/messaging/datamodel/media/MediaCacheManager.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +34,7 @@ public abstract class MediaCacheManager implements MemoryCache { protected final SparseArray> mCaches; public MediaCacheManager() { - mCaches = new SparseArray>(); + mCaches = new SparseArray<>(); MemoryCacheManager.get().registerMemoryCache(this); } @@ -66,4 +67,4 @@ public abstract class MediaCacheManager implements MemoryCache { } protected abstract MediaCache createMediaCacheById(final int id); -} \ No newline at end of file +} diff --git a/src/com/android/messaging/datamodel/media/MediaResourceManager.java b/src/com/android/messaging/datamodel/media/MediaResourceManager.java index 2c7c8f8..4f40e3f 100644 --- a/src/com/android/messaging/datamodel/media/MediaResourceManager.java +++ b/src/com/android/messaging/datamodel/media/MediaResourceManager.java @@ -233,8 +233,7 @@ public class MediaResourceManager { } // We don't use SafeAsyncTask here since it enforces the shared thread pool executor // whereas we want a dedicated thread pool executor. - AsyncTask> mediaLoadingTask = - new AsyncTask>() { + AsyncTask> mediaLoadingTask = new AsyncTask<>() { private Exception mException; @Override diff --git a/src/com/android/messaging/datamodel/media/PoolableImageCache.java b/src/com/android/messaging/datamodel/media/PoolableImageCache.java index 1d8ebc1..b64813e 100644 --- a/src/com/android/messaging/datamodel/media/PoolableImageCache.java +++ b/src/com/android/messaging/datamodel/media/PoolableImageCache.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -118,7 +119,7 @@ public class PoolableImageCache extends MediaCache { private final SparseArray> mImageListSparseArray; public ReusableImageResourcePool() { - mImageListSparseArray = new SparseArray>(); + mImageListSparseArray = new SparseArray<>(); } /** @@ -232,7 +233,7 @@ public class PoolableImageCache extends MediaCache { Assert.isTrue(poolKey != INVALID_POOL_KEY); LinkedList imageList = mImageListSparseArray.get(poolKey); if (imageList == null) { - imageList = new LinkedList(); + imageList = new LinkedList<>(); mImageListSparseArray.put(poolKey, imageList); } imageList.addLast(imageResource); diff --git a/src/com/android/messaging/datamodel/media/RefCountedMediaResource.java b/src/com/android/messaging/datamodel/media/RefCountedMediaResource.java index c21f477..b17bcd8 100644 --- a/src/com/android/messaging/datamodel/media/RefCountedMediaResource.java +++ b/src/com/android/messaging/datamodel/media/RefCountedMediaResource.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +49,7 @@ public abstract class RefCountedMediaResource { // to find out where each ref change happens. private static final boolean DEBUG = false; private static final String TAG = "bugle_media_ref_history"; - private final ArrayList mRefHistory = new ArrayList(); + private final ArrayList mRefHistory = new ArrayList<>(); // A lock that guards access to shared members in this class (and all its subclasses). private final ReentrantLock mLock = new ReentrantLock(); @@ -161,4 +162,4 @@ public abstract class RefCountedMediaResource { public abstract int getMediaSize(); protected abstract void close(); -} \ No newline at end of file +} diff --git a/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java b/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java index ccc99b2..c981beb 100644 --- a/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java +++ b/src/com/android/messaging/datamodel/media/UriImageRequestDescriptor.java @@ -83,9 +83,9 @@ public class UriImageRequestDescriptor extends ImageRequestDescriptor { @Override public MediaRequest buildSyncMediaRequest(final Context context) { if (uri == null || UriUtil.isLocalUri(uri)) { - return new UriImageRequest(context, this); + return new UriImageRequest<>(context, this); } else { - return new NetworkUriImageRequest(context, this); + return new NetworkUriImageRequest<>(context, this); } } } diff --git a/src/com/android/messaging/datamodel/media/VCardRequest.java b/src/com/android/messaging/datamodel/media/VCardRequest.java index 62d78ac..2d57012 100644 --- a/src/com/android/messaging/datamodel/media/VCardRequest.java +++ b/src/com/android/messaging/datamodel/media/VCardRequest.java @@ -71,7 +71,7 @@ public class VCardRequest implements MediaRequest { VCardRequest(final Context context, final VCardRequestDescriptor descriptor) { mDescriptor = descriptor; mContext = context; - mLoadedVCards = new ArrayList(); + mLoadedVCards = new ArrayList<>(); } @Override diff --git a/src/com/android/messaging/datamodel/media/VCardResourceEntry.java b/src/com/android/messaging/datamodel/media/VCardResourceEntry.java index d66d763..0b33d16 100644 --- a/src/com/android/messaging/datamodel/media/VCardResourceEntry.java +++ b/src/com/android/messaging/datamodel/media/VCardResourceEntry.java @@ -163,7 +163,7 @@ public class VCardResourceEntry { final VCardEntry vcard) { final Resources resources = Factory.get().getApplicationContext().getResources(); final List retList = - new ArrayList(); + new ArrayList<>(); if (vcard.getPhoneList() != null) { for (final PhoneData phone : vcard.getPhoneList()) { final Intent intent = new Intent(Intent.ACTION_DIAL); @@ -264,7 +264,7 @@ public class VCardResourceEntry { if (vcard.getNotes() != null) { for (final NoteData note : vcard.getNotes()) { - final ArrayMap curChildMap = new ArrayMap(); + final ArrayMap curChildMap = new ArrayMap<>(); if (TextUtils.isGraphic(note.getNote())){ retList.add(new VCardResourceEntryDestinationItem(note.getNote(), resources.getString(R.string.vcard_detail_notes_label), null)); diff --git a/src/com/android/messaging/mmslib/pdu/CharacterSets.java b/src/com/android/messaging/mmslib/pdu/CharacterSets.java index 3a49e37..43b1548 100644 --- a/src/com/android/messaging/mmslib/pdu/CharacterSets.java +++ b/src/com/android/messaging/mmslib/pdu/CharacterSets.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007 Esmertec AG. * Copyright (C) 2007 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -402,8 +403,8 @@ public class CharacterSets { static { // Create the HashMaps. - MIBENUM_TO_NAME_MAP = new SparseArray(); - NAME_TO_MIBENUM_MAP = new SimpleArrayMap(); + MIBENUM_TO_NAME_MAP = new SparseArray<>(); + NAME_TO_MIBENUM_MAP = new SimpleArrayMap<>(); assert (MIBENUM_NUMBERS.length == MIME_NAMES.length); final int count = MIBENUM_NUMBERS.length - 1; for (int i = 0; i <= count; i++) { diff --git a/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java b/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java index dd67e19..74ea086 100644 --- a/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java +++ b/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java @@ -245,7 +245,7 @@ public class EncodedStringValue implements Cloneable { public static EncodedStringValue[] extract(String src) { String[] values = src.split(";"); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < values.length; i++) { if (values[i].length() > 0) { list.add(new EncodedStringValue(values[i])); diff --git a/src/com/android/messaging/mmslib/pdu/PduBody.java b/src/com/android/messaging/mmslib/pdu/PduBody.java index 8cbb2e6..95dc637 100644 --- a/src/com/android/messaging/mmslib/pdu/PduBody.java +++ b/src/com/android/messaging/mmslib/pdu/PduBody.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007 Esmertec AG. * Copyright (C) 2007 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ public class PduBody { * Constructor. */ public PduBody() { - mParts = new Vector(); + mParts = new Vector<>(); } /** diff --git a/src/com/android/messaging/mmslib/pdu/PduComposer.java b/src/com/android/messaging/mmslib/pdu/PduComposer.java index ace49d1..b7b322f 100644 --- a/src/com/android/messaging/mmslib/pdu/PduComposer.java +++ b/src/com/android/messaging/mmslib/pdu/PduComposer.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007-2008 Esmertec AG. * Copyright (C) 2007-2008 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -120,7 +121,7 @@ public class PduComposer { private static SimpleArrayMap mContentTypeMap = null; static { - mContentTypeMap = new SimpleArrayMap(); + mContentTypeMap = new SimpleArrayMap<>(); int i; for (i = 0; i < PduContentTypes.contentTypes.length; i++) { diff --git a/src/com/android/messaging/mmslib/pdu/PduHeaders.java b/src/com/android/messaging/mmslib/pdu/PduHeaders.java index 96d18ee..9e5d404 100644 --- a/src/com/android/messaging/mmslib/pdu/PduHeaders.java +++ b/src/com/android/messaging/mmslib/pdu/PduHeaders.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007 Esmertec AG. * Copyright (C) 2007 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -346,7 +347,7 @@ public class PduHeaders { * Constructor of PduHeaders. */ public PduHeaders() { - mHeaderMap = new SparseArray(); + mHeaderMap = new SparseArray<>(); } /** @@ -652,7 +653,7 @@ public class PduHeaders { throw new RuntimeException("Invalid header field!"); } - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < value.length; i++) { list.add(value[i]); } @@ -684,7 +685,7 @@ public class PduHeaders { ArrayList list = (ArrayList) mHeaderMap.get(field); if (null == list) { - list = new ArrayList(); + list = new ArrayList<>(); } list.add(value); mHeaderMap.put(field, list); diff --git a/src/com/android/messaging/mmslib/pdu/PduParser.java b/src/com/android/messaging/mmslib/pdu/PduParser.java index e392fb5..c384794 100644 --- a/src/com/android/messaging/mmslib/pdu/PduParser.java +++ b/src/com/android/messaging/mmslib/pdu/PduParser.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007-2008 Esmertec AG. * Copyright (C) 2007-2008 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -811,7 +812,7 @@ public class PduParser { } case PduHeaders.CONTENT_TYPE: { - SparseArray map = new SparseArray(); + SparseArray map = new SparseArray<>(); byte[] contentType = parseContentType(pduDataStream, map); @@ -882,7 +883,7 @@ public class PduParser { } /* parse part's content-type */ - SparseArray map = new SparseArray(); + SparseArray map = new SparseArray<>(); byte[] contentType = parseContentType(pduDataStream, map); if (null != contentType) { part.setContentType(contentType); diff --git a/src/com/android/messaging/mmslib/pdu/PduPart.java b/src/com/android/messaging/mmslib/pdu/PduPart.java index dcdb7a6..3098982 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPart.java +++ b/src/com/android/messaging/mmslib/pdu/PduPart.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007-2008 Esmertec AG. * Copyright (C) 2007-2008 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +124,7 @@ public class PduPart { * Empty Constructor. */ public PduPart() { - mPartHeader = new SparseArray(); + mPartHeader = new SparseArray<>(); } /** diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index 19e2e0f..ecfe8c0 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java @@ -213,7 +213,7 @@ public class PduPersister { private static final SparseArray LONG_COLUMN_NAME_MAP; static { - MESSAGE_BOX_MAP = new SimpleArrayMap(); + MESSAGE_BOX_MAP = new SimpleArrayMap<>(); MESSAGE_BOX_MAP.put(Mms.Inbox.CONTENT_URI, Mms.MESSAGE_BOX_INBOX); MESSAGE_BOX_MAP.put(Mms.Sent.CONTENT_URI, Mms.MESSAGE_BOX_SENT); MESSAGE_BOX_MAP.put(Mms.Draft.CONTENT_URI, Mms.MESSAGE_BOX_DRAFTS); @@ -223,7 +223,7 @@ public class PduPersister { CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT_CHARSET); CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT_CHARSET); - CHARSET_COLUMN_NAME_MAP = new SparseArray(); + CHARSET_COLUMN_NAME_MAP = new SparseArray<>(); CHARSET_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT_CHARSET); CHARSET_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT_CHARSET); @@ -232,7 +232,7 @@ public class PduPersister { ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT); ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT); - ENCODED_STRING_COLUMN_NAME_MAP = new SparseArray(); + ENCODED_STRING_COLUMN_NAME_MAP = new SparseArray<>(); ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT); ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT); @@ -245,7 +245,7 @@ public class PduPersister { TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RESPONSE_TEXT, PDU_COLUMN_RESPONSE_TEXT); TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.TRANSACTION_ID, PDU_COLUMN_TRANSACTION_ID); - TEXT_STRING_COLUMN_NAME_MAP = new SparseArray(); + TEXT_STRING_COLUMN_NAME_MAP = new SparseArray<>(); TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_LOCATION, Mms.CONTENT_LOCATION); TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_TYPE, Mms.CONTENT_TYPE); TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_CLASS, Mms.MESSAGE_CLASS); @@ -266,7 +266,7 @@ public class PduPersister { OCTET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_STATUS, PDU_COLUMN_RETRIEVE_STATUS); OCTET_COLUMN_INDEX_MAP.put(PduHeaders.STATUS, PDU_COLUMN_STATUS); - OCTET_COLUMN_NAME_MAP = new SparseArray(); + OCTET_COLUMN_NAME_MAP = new SparseArray<>(); OCTET_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_CLASS, Mms.CONTENT_CLASS); OCTET_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_REPORT, Mms.DELIVERY_REPORT); OCTET_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_TYPE, Mms.MESSAGE_TYPE); @@ -285,7 +285,7 @@ public class PduPersister { LONG_COLUMN_INDEX_MAP.put(PduHeaders.EXPIRY, PDU_COLUMN_EXPIRY); LONG_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_SIZE, PDU_COLUMN_MESSAGE_SIZE); - LONG_COLUMN_NAME_MAP = new SparseArray(); + LONG_COLUMN_NAME_MAP = new SparseArray<>(); LONG_COLUMN_NAME_MAP.put(PduHeaders.DATE, Mms.DATE); LONG_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_TIME, Mms.DELIVERY_TIME); LONG_COLUMN_NAME_MAP.put(PduHeaders.EXPIRY, Mms.EXPIRY); @@ -1135,7 +1135,7 @@ public class PduPersister { } final PduHeaders headers = sendReq.getPduHeaders(); - final HashSet recipients = new HashSet(); + final HashSet recipients = new HashSet<>(); for (final int addrType : ADDRESS_FIELDS) { EncodedStringValue[] array = null; if (addrType == PduHeaders.FROM) { @@ -1233,8 +1233,8 @@ public class PduPersister { PDU_CACHE_INSTANCE.setUpdating(uri, true); } - final ArrayList toBeCreated = new ArrayList(); - final ArrayMap toBeUpdated = new ArrayMap(); + final ArrayList toBeCreated = new ArrayList<>(); + final ArrayMap toBeUpdated = new ArrayMap<>(); final int partsNum = body.getPartsNum(); final StringBuilder filter = new StringBuilder().append('('); @@ -1376,7 +1376,7 @@ public class PduPersister { } final SparseArray addressMap = - new SparseArray(ADDRESS_FIELDS.length); + new SparseArray<>(ADDRESS_FIELDS.length); // Save address information. for (final int addrType : ADDRESS_FIELDS) { EncodedStringValue[] array = null; @@ -1392,7 +1392,7 @@ public class PduPersister { addressMap.put(addrType, array); } - final HashSet recipients = new HashSet(); + final HashSet recipients = new HashSet<>(); final int msgType = pdu.getMessageType(); // Here we only allocate thread ID for M-Notification.ind, // M-Retrieve.conf and M-Send.req. @@ -1553,7 +1553,7 @@ public class PduPersister { final SparseArray addressMap, final String selfNumber) { final EncodedStringValue[] arrayTo = addressMap.get(PduHeaders.TO); final EncodedStringValue[] arrayCc = addressMap.get(PduHeaders.CC); - final ArrayList numbers = new ArrayList(); + final ArrayList numbers = new ArrayList<>(); if (arrayTo != null) { for (final EncodedStringValue v : arrayTo) { if (v != null) { diff --git a/src/com/android/messaging/mmslib/util/AbstractCache.java b/src/com/android/messaging/mmslib/util/AbstractCache.java index a4d678a..c13a260 100644 --- a/src/com/android/messaging/mmslib/util/AbstractCache.java +++ b/src/com/android/messaging/mmslib/util/AbstractCache.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2008 Esmertec AG. * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +30,7 @@ public abstract class AbstractCache { private final SimpleArrayMap> mCacheMap; protected AbstractCache() { - mCacheMap = new SimpleArrayMap>(); + mCacheMap = new SimpleArrayMap<>(); } public boolean put(K key, V value) { @@ -47,7 +48,7 @@ public abstract class AbstractCache { } if (key != null) { - CacheEntry cacheEntry = new CacheEntry(); + CacheEntry cacheEntry = new CacheEntry<>(); cacheEntry.value = value; mCacheMap.put(key, cacheEntry); diff --git a/src/com/android/messaging/mmslib/util/PduCache.java b/src/com/android/messaging/mmslib/util/PduCache.java index 59ade37..2dc22d8 100644 --- a/src/com/android/messaging/mmslib/util/PduCache.java +++ b/src/com/android/messaging/mmslib/util/PduCache.java @@ -65,7 +65,7 @@ public final class PduCache extends AbstractCache { URI_MATCHER.addURI("mms-sms", "conversations", MMS_CONVERSATION); URI_MATCHER.addURI("mms-sms", "conversations/#", MMS_CONVERSATION_ID); - MATCH_TO_MSGBOX_ID_MAP = new SparseArray(); + MATCH_TO_MSGBOX_ID_MAP = new SparseArray<>(); MATCH_TO_MSGBOX_ID_MAP.put(MMS_INBOX, Mms.MESSAGE_BOX_INBOX); MATCH_TO_MSGBOX_ID_MAP.put(MMS_SENT, Mms.MESSAGE_BOX_SENT); MATCH_TO_MSGBOX_ID_MAP.put(MMS_DRAFTS, Mms.MESSAGE_BOX_DRAFTS); @@ -77,9 +77,9 @@ public final class PduCache extends AbstractCache { private final HashSet mUpdating; private PduCache() { - mMessageBoxes = new SparseArray>(); - mThreads = new SimpleArrayMap>(); - mUpdating = new HashSet(); + mMessageBoxes = new SparseArray<>(); + mThreads = new SimpleArrayMap<>(); + mUpdating = new HashSet<>(); } public static synchronized PduCache getInstance() { @@ -97,14 +97,14 @@ public final class PduCache extends AbstractCache { int msgBoxId = entry.getMessageBox(); HashSet msgBox = mMessageBoxes.get(msgBoxId); if (msgBox == null) { - msgBox = new HashSet(); + msgBox = new HashSet<>(); mMessageBoxes.put(msgBoxId, msgBox); } long threadId = entry.getThreadId(); HashSet thread = mThreads.get(threadId); if (thread == null) { - thread = new HashSet(); + thread = new HashSet<>(); mThreads.put(threadId, thread); } diff --git a/src/com/android/messaging/sms/DatabaseMessages.java b/src/com/android/messaging/sms/DatabaseMessages.java index 2e5e16f..ac0f73c 100644 --- a/src/com/android/messaging/sms/DatabaseMessages.java +++ b/src/com/android/messaging/sms/DatabaseMessages.java @@ -218,8 +218,7 @@ public class DatabaseMessages { mBody = in.readString(); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public SmsMessage createFromParcel(final Parcel in) { return new SmsMessage(in); @@ -488,15 +487,14 @@ public class DatabaseMessages { mRetrieveStatus = in.readInt(); final int nParts = in.readInt(); - mParts = new ArrayList(); + mParts = new ArrayList<>(); mPartsProcessed = false; for (int i = 0; i < nParts; i++) { mParts.add((MmsPart) in.readParcelable(getClass().getClassLoader())); } } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public MmsMessage createFromParcel(final Parcel in) { return new MmsMessage(in); @@ -822,8 +820,7 @@ public class DatabaseMessages { mSize = in.readLong(); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public MmsPart createFromParcel(final Parcel in) { return new MmsPart(in); @@ -905,7 +902,7 @@ public class DatabaseMessages { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public LocalDatabaseMessage createFromParcel(final Parcel in) { return new LocalDatabaseMessage(in); diff --git a/src/com/android/messaging/sms/MmsSmsUtils.java b/src/com/android/messaging/sms/MmsSmsUtils.java index ecee84a..90e345e 100644 --- a/src/com/android/messaging/sms/MmsSmsUtils.java +++ b/src/com/android/messaging/sms/MmsSmsUtils.java @@ -163,7 +163,7 @@ public class MmsSmsUtils { * messages. */ public static long getOrCreateThreadId(final Context context, final String recipient) { - final Set recipients = new HashSet(); + final Set recipients = new HashSet<>(); recipients.add(recipient); return getOrCreateThreadId(context, recipients); diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index eb155f7..08d020a 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -763,7 +763,7 @@ public class MmsUtils { Uri.parse("content://mms-sms/canonical-address"); private static List getAddresses(final Context context, final String spaceSepIds) { - final List numbers = new ArrayList(); + final List numbers = new ArrayList<>(); final String[] ids = spaceSepIds.split(" "); for (final String id : ids) { long longId; @@ -813,7 +813,7 @@ public class MmsUtils { // Get telephony SMS thread ID public static long getOrCreateSmsThreadId(final Context context, final String dest) { // use destinations to determine threadId - final Set recipients = new HashSet(); + final Set recipients = new HashSet<>(); recipients.add(dest); try { return MmsSmsUtils.Threads.getOrCreateThreadId(context, recipients); @@ -829,7 +829,7 @@ public class MmsUtils { return -1; } // use destinations to determine threadId - final Set recipients = new HashSet(dests); + final Set recipients = new HashSet<>(dests); try { return MmsSmsUtils.Threads.getOrCreateThreadId(context, recipients); } catch (final IllegalArgumentException e) { diff --git a/src/com/android/messaging/sms/SmsSender.java b/src/com/android/messaging/sms/SmsSender.java index d5f56c5..00ad0ec 100644 --- a/src/com/android/messaging/sms/SmsSender.java +++ b/src/com/android/messaging/sms/SmsSender.java @@ -62,7 +62,7 @@ public class SmsSender { * A map for pending sms messages. The key is the random request UUID. */ private static final ConcurrentHashMap sPendingMessageMap = - new ConcurrentHashMap(); + new ConcurrentHashMap<>(); private static final Random RANDOM = new Random(); @@ -256,8 +256,8 @@ public class SmsSender { Assert.notNull(context); final SmsManager smsManager = PhoneUtils.get(subId).getSmsManager(); final int messageCount = messages.size(); - final ArrayList deliveryIntents = new ArrayList(messageCount); - final ArrayList sentIntents = new ArrayList(messageCount); + final ArrayList deliveryIntents = new ArrayList<>(messageCount); + final ArrayList sentIntents = new ArrayList<>(messageCount); for (int i = 0; i < messageCount; i++) { // Make pending intents different for each message part final int partId = (messageCount <= 1 ? 0 : i + 1); diff --git a/src/com/android/messaging/ui/AsyncImageView.java b/src/com/android/messaging/ui/AsyncImageView.java index 2376c8d..4e7688c 100644 --- a/src/com/android/messaging/ui/AsyncImageView.java +++ b/src/com/android/messaging/ui/AsyncImageView.java @@ -417,7 +417,7 @@ public class AsyncImageView extends ImageView implements MediaResourceLoadListen private final HashSet mAttachedViews; public AsyncImageViewDelayLoader() { - mAttachedViews = new HashSet(); + mAttachedViews = new HashSet<>(); } private void registerView(final AsyncImageView view) { diff --git a/src/com/android/messaging/ui/ClassZeroActivity.java b/src/com/android/messaging/ui/ClassZeroActivity.java index a1ea035..5e0653e 100644 --- a/src/com/android/messaging/ui/ClassZeroActivity.java +++ b/src/com/android/messaging/ui/ClassZeroActivity.java @@ -119,7 +119,7 @@ public class ClassZeroActivity extends Activity { requestWindowFeature(Window.FEATURE_NO_TITLE); if (mMessageQueue == null) { - mMessageQueue = new ArrayList(); + mMessageQueue = new ArrayList<>(); } if (!queueMsgFromIntent(getIntent())) { return; diff --git a/src/com/android/messaging/ui/LineWrapLayout.java b/src/com/android/messaging/ui/LineWrapLayout.java index 032666a..06c3fde 100644 --- a/src/com/android/messaging/ui/LineWrapLayout.java +++ b/src/com/android/messaging/ui/LineWrapLayout.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,7 +104,7 @@ public class LineWrapLayout extends ViewGroup { int currLineHeight = 0; // Do a dry-run first to get the line heights. - final ArrayList lineHeights = new ArrayList(); + final ArrayList lineHeights = new ArrayList<>(); for (int i = 0; i < childCount; i++) { View currChild = getChildAt(i); if (currChild.getVisibility() == GONE) { diff --git a/src/com/android/messaging/ui/MultiAttachmentLayout.java b/src/com/android/messaging/ui/MultiAttachmentLayout.java index 5bae8a5..64e28d9 100644 --- a/src/com/android/messaging/ui/MultiAttachmentLayout.java +++ b/src/com/android/messaging/ui/MultiAttachmentLayout.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -158,13 +159,13 @@ public class MultiAttachmentLayout extends FrameLayout { public MultiAttachmentLayout(final Context context, final AttributeSet attrs) { super(context, attrs); - mPreviewViews = new ArrayList(); + mPreviewViews = new ArrayList<>(); } public void bindAttachments(final Iterable attachments, final Rect transitionRect, final int count) { final ArrayList previousViews = mPreviewViews; - mPreviewViews = new ArrayList(); + mPreviewViews = new ArrayList<>(); removeView(mPlusTextView); mPlusTextView = null; diff --git a/src/com/android/messaging/ui/SnackBar.java b/src/com/android/messaging/ui/SnackBar.java index 265ee86..f638877 100644 --- a/src/com/android/messaging/ui/SnackBar.java +++ b/src/com/android/messaging/ui/SnackBar.java @@ -118,8 +118,7 @@ public class SnackBar { } public static class Builder { - private static final List NO_INTERACTIONS = - new ArrayList(); + private static final List NO_INTERACTIONS = new ArrayList<>(); private final Context mContext; private final SnackBarManager mSnackBarManager; @@ -213,7 +212,7 @@ public class SnackBar { mPlacement = builder.mPlacement; mParentView = builder.mParentView; if (builder.mInteractions == null) { - mInteractions = new ArrayList(); + mInteractions = new ArrayList<>(); } else { mInteractions = builder.mInteractions; } diff --git a/src/com/android/messaging/ui/appsettings/SettingsActivity.java b/src/com/android/messaging/ui/appsettings/SettingsActivity.java index bc97748..b3d14c9 100644 --- a/src/com/android/messaging/ui/appsettings/SettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/SettingsActivity.java @@ -122,7 +122,7 @@ public class SettingsActivity extends BugleActionBarActivity { */ private class SettingsListAdapter extends ArrayAdapter { public SettingsListAdapter(final Context context) { - super(context, R.layout.settings_item_view, new ArrayList()); + super(context, R.layout.settings_item_view, new ArrayList<>()); } public void setSettingsItems(final List newList) { diff --git a/src/com/android/messaging/ui/attachmentchooser/AttachmentGridView.java b/src/com/android/messaging/ui/attachmentchooser/AttachmentGridView.java index abf61dc..d092e51 100644 --- a/src/com/android/messaging/ui/attachmentchooser/AttachmentGridView.java +++ b/src/com/android/messaging/ui/attachmentchooser/AttachmentGridView.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,12 +158,12 @@ public class AttachmentGridView extends GridView implements } } - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { @Override public SavedState createFromParcel(final Parcel in) { return new SavedState(in); } + @Override public SavedState[] newArray(final int size) { return new SavedState[size]; diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java index 1429a3d..7cacc58 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java @@ -310,7 +310,7 @@ public final class ContactRecipientAdapter extends BaseRecipientAdapter { final RecipientMatchCallback callback) { final int addressesSize = Math.min( RecipientAlternatesAdapter.MAX_LOOKUPS, inAddresses.size()); - final HashSet addresses = new HashSet(); + final HashSet addresses = new HashSet<>(); for (int i = 0; i < addressesSize; i++) { final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(inAddresses.get(i).toLowerCase()); addresses.add(tokens.length > 0 ? tokens[0].getAddress() : inAddresses.get(i)); diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java index a2ef296..dbdc71a 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java @@ -259,8 +259,7 @@ public class ContactRecipientAutoCompleteView extends RecipientEditTextView { public ArrayList getRecipientParticipantDataForConversationCreation() { final DrawableRecipientChip[] recips = getText() .getSpans(0, getText().length(), DrawableRecipientChip.class); - final ArrayList contacts = - new ArrayList(recips.length); + final ArrayList contacts = new ArrayList<>(recips.length); for (final DrawableRecipientChip recipient : recips) { final RecipientEntry entry = recipient.getEntry(); if (entry != null && entry.isValid() && entry.getDestination() != null && @@ -277,7 +276,7 @@ public class ContactRecipientAutoCompleteView extends RecipientEditTextView { * consumer with determining quickly whether a contact is currently selected. */ public Set getSelectedDestinations() { - Set set = new HashSet(); + Set set = new HashSet<>(); final DrawableRecipientChip[] recips = getText() .getSpans(0, getText().length(), DrawableRecipientChip.class); diff --git a/src/com/android/messaging/ui/contact/ContactRecipientPhotoManager.java b/src/com/android/messaging/ui/contact/ContactRecipientPhotoManager.java index a2b54a3..601286b 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientPhotoManager.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientPhotoManager.java @@ -67,7 +67,7 @@ public class ContactRecipientPhotoManager implements PhotoManager { new AvatarRequestDescriptor(avatarUri, mIconSize, mIconSize); final BindableMediaRequest req = descriptor.buildAsyncMediaRequest( mContext, - new MediaResourceLoadListener() { + new MediaResourceLoadListener<>() { @Override public void onMediaResourceLoaded(final MediaRequest request, final ImageResource resource, final boolean isCached) { diff --git a/src/com/android/messaging/ui/contact/ContactSectionIndexer.java b/src/com/android/messaging/ui/contact/ContactSectionIndexer.java index 1d5abf3..d768b2d 100644 --- a/src/com/android/messaging/ui/contact/ContactSectionIndexer.java +++ b/src/com/android/messaging/ui/contact/ContactSectionIndexer.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -111,7 +112,7 @@ public class ContactSectionIndexer implements SectionIndexer { } this.mSections = sections; - mSectionStartingPositions = new ArrayList(counts.length); + mSectionStartingPositions = new ArrayList<>(counts.length); int position = 0; for (int i = 0; i < counts.length; i++) { if (TextUtils.isEmpty(mSections[i])) { @@ -131,8 +132,8 @@ public class ContactSectionIndexer implements SectionIndexer { // The result is stored into two arrays, one for the section header (i.e. the first // character), and one for the starting position, which is guaranteed to be sorted in // ascending order. - final ArrayList sections = new ArrayList(); - mSectionStartingPositions = new ArrayList(); + final ArrayList sections = new ArrayList<>(); + mSectionStartingPositions = new ArrayList<>(); if (cursor != null) { cursor.moveToPosition(-1); int currentPosition = 0; diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index 025b634..d2cb7c1 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -655,7 +655,7 @@ public class ComposeMessageView extends LinearLayout mBinding.getData().hasAttachments(); final List attachments = - new ArrayList(draftMessageData.getReadOnlyAttachments()); + new ArrayList<>(draftMessageData.getReadOnlyAttachments()); if (draftMessageData.getIsMms()) { // MMS case if (draftMessageData.hasAttachments()) { if (hasAttachmentsChanged) { diff --git a/src/com/android/messaging/ui/conversation/ConversationActivityUiState.java b/src/com/android/messaging/ui/conversation/ConversationActivityUiState.java index a763188..1bbefdc 100644 --- a/src/com/android/messaging/ui/conversation/ConversationActivityUiState.java +++ b/src/com/android/messaging/ui/conversation/ConversationActivityUiState.java @@ -276,7 +276,7 @@ public class ConversationActivityUiState implements Parcelable, Cloneable { } public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + = new Parcelable.Creator<>() { @Override public ConversationActivityUiState createFromParcel(final Parcel in) { return new ConversationActivityUiState(in); diff --git a/src/com/android/messaging/ui/conversation/ConversationFragment.java b/src/com/android/messaging/ui/conversation/ConversationFragment.java index 496b42d..cfa566a 100644 --- a/src/com/android/messaging/ui/conversation/ConversationFragment.java +++ b/src/com/android/messaging/ui/conversation/ConversationFragment.java @@ -508,7 +508,7 @@ public class ConversationFragment extends Fragment implements ConversationDataLi mRecyclerView.setHasFixedSize(true); mRecyclerView.setLayoutManager(manager); mRecyclerView.setItemAnimator(new DefaultItemAnimator() { - private final List mAddAnimations = new ArrayList(); + private final List mAddAnimations = new ArrayList<>(); private PopupTransitionAnimation mPopupTransitionAnimation; @Override diff --git a/src/com/android/messaging/ui/conversation/SimSelectorView.java b/src/com/android/messaging/ui/conversation/SimSelectorView.java index d8f0f90..8aecb1b 100644 --- a/src/com/android/messaging/ui/conversation/SimSelectorView.java +++ b/src/com/android/messaging/ui/conversation/SimSelectorView.java @@ -126,7 +126,7 @@ public class SimSelectorView extends FrameLayout implements SimSelectorItemView. */ private class SimSelectorAdapter extends ArrayAdapter { public SimSelectorAdapter(final Context context) { - super(context, R.layout.sim_selector_item_view, new ArrayList()); + super(context, R.layout.sim_selector_item_view, new ArrayList<>()); } public void bindData(final List newList) { diff --git a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java index 25d0f89..c677d6d 100644 --- a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java @@ -134,7 +134,7 @@ public abstract class AbstractConversationListActivity extends BugleActionBarAct @Override public void onActionBarArchive(final Iterable conversations, final boolean isToArchive) { - final ArrayList conversationIds = new ArrayList(); + final ArrayList conversationIds = new ArrayList<>(); for (final SelectedConversation conversation : conversations) { final String conversationId = conversation.conversationId; conversationIds.add(conversationId); diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java index 4e3a9c6..9cb1162 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java @@ -385,7 +385,7 @@ public class ConversationListFragment extends Fragment implements ConversationLi @Override public List getSnackBarInteractions() { - final List interactions = new ArrayList(1); + final List interactions = new ArrayList<>(1); final SnackBarInteraction fabInteraction = new SnackBarInteraction.BasicSnackBarInteraction(mStartNewConversationButton); interactions.add(fabInteraction); diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java index 1cc0c15..761da5d 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java @@ -136,7 +136,7 @@ public class ShareIntentActivity extends BaseBugleActivity implements // Handle sharing multiple contents. final ArrayList uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); if (uris != null && !uris.isEmpty()) { - ArrayMap uriMap = new ArrayMap(); + ArrayMap uriMap = new ArrayMap<>(); StringBuffer strBuffer = new StringBuffer(); for (final Uri uri : uris) { if (UriUtil.isFileUri(uri)) { diff --git a/src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsFragment.java b/src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsFragment.java index e6c59cc..d499451 100644 --- a/src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsFragment.java +++ b/src/com/android/messaging/ui/conversationsettings/PeopleAndOptionsFragment.java @@ -127,7 +127,7 @@ public class PeopleAndOptionsFragment extends Fragment public void onOptionsItemViewClicked(final PeopleOptionsItemData item) { switch (item.getItemId()) { case PeopleOptionsItemData.SETTING_NOTIFICATION: - ArrayList participantsNames = new ArrayList(); + ArrayList participantsNames = new ArrayList<>(); for (ParticipantData participant : mOtherParticipants) { participantsNames.add(participant.getDisplayName(true)); } @@ -236,7 +236,7 @@ public class PeopleAndOptionsFragment extends Fragment */ private class PeopleListAdapter extends ArrayAdapter { public PeopleListAdapter(final Context context) { - super(context, R.layout.people_list_item_view, new ArrayList()); + super(context, R.layout.people_list_item_view, new ArrayList<>()); } public void updateParticipants(final List newList) { diff --git a/src/com/android/messaging/ui/mediapicker/CameraManager.java b/src/com/android/messaging/ui/mediapicker/CameraManager.java index 5fae086..de87180 100644 --- a/src/com/android/messaging/ui/mediapicker/CameraManager.java +++ b/src/com/android/messaging/ui/mediapicker/CameraManager.java @@ -408,7 +408,7 @@ class CameraManager implements FocusOverlayManager.Listener { } mPendingOpenCameraIndex = mCameraIndex; - mOpenCameraTask = new AsyncTask() { + mOpenCameraTask = new AsyncTask<>() { private Exception mException; @Override @@ -974,7 +974,7 @@ class CameraManager implements FocusOverlayManager.Listener { screenHeight *= scaleFactor; final float aspectRatio = screenWidth / (float) screenHeight; - final List sizes = new ArrayList( + final List sizes = new ArrayList<>( mCamera.getParameters().getSupportedPictureSizes()); final int maxPixels = maxWidth * maxHeight; @@ -989,7 +989,7 @@ class CameraManager implements FocusOverlayManager.Listener { * aspect ratio and size as the picture if possible */ private Camera.Size chooseBestPreviewSize(final Camera.Size pictureSize) { - final List sizes = new ArrayList( + final List sizes = new ArrayList<>( mCamera.getParameters().getSupportedPreviewSizes()); final float aspectRatio = pictureSize.width / (float) pictureSize.height; final int capturePixels = pictureSize.width * pictureSize.height; diff --git a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java index 39912f9..b85a5c9 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +72,7 @@ public class GalleryGridView extends MediaPickerGridView implements public GalleryGridView(final Context context, final AttributeSet attrs) { super(context, attrs); - mSelectedImages = new ArrayMap(); + mSelectedImages = new ArrayMap<>(); } public void setHostInterface(final GalleryGridViewListener hostInterface) { @@ -301,15 +302,16 @@ public class GalleryGridView extends MediaPickerGridView implements } public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - @Override - public SavedState createFromParcel(final Parcel in) { - return new SavedState(in); - } - @Override - public SavedState[] newArray(final int size) { - return new SavedState[size]; - } - }; + new Parcelable.Creator<>() { + @Override + public SavedState createFromParcel(final Parcel in) { + return new SavedState(in); + } + + @Override + public SavedState[] newArray(final int size) { + return new SavedState[size]; + } + }; } } diff --git a/src/com/android/messaging/ui/mediapicker/MediaPicker.java b/src/com/android/messaging/ui/mediapicker/MediaPicker.java index 2642feb..772bf2f 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaPicker.java +++ b/src/com/android/messaging/ui/mediapicker/MediaPicker.java @@ -173,7 +173,7 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat public MediaPicker(final Context context) { mBinding.bind(DataModel.get().createMediaPickerData(context)); - mEnabledChoosers = new ArrayList(); + mEnabledChoosers = new ArrayList<>(); mChoosers = new MediaChooser[] { new CameraMediaChooser(this), new GalleryMediaChooser(this), @@ -432,7 +432,7 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat } final MediaChooser[] enabledChoosers = new MediaChooser[mEnabledChoosers.size()]; mEnabledChoosers.toArray(enabledChoosers); - mPagerAdapter = new FixedViewPagerAdapter(enabledChoosers); + mPagerAdapter = new FixedViewPagerAdapter<>(enabledChoosers); if (mViewPager != null) { mViewPager.setAdapter(mPagerAdapter); } @@ -574,7 +574,7 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat } void dispatchItemsSelected(final MessagePartData item, final boolean dismissMediaPicker) { - final List items = new ArrayList(1); + final List items = new ArrayList<>(1); items.add(item); dispatchItemsSelected(items, dismissMediaPicker); } diff --git a/src/com/android/messaging/ui/mediapicker/camerafocus/FocusOverlayManager.java b/src/com/android/messaging/ui/mediapicker/camerafocus/FocusOverlayManager.java index 488dd04..e215376 100644 --- a/src/com/android/messaging/ui/mediapicker/camerafocus/FocusOverlayManager.java +++ b/src/com/android/messaging/ui/mediapicker/camerafocus/FocusOverlayManager.java @@ -306,7 +306,7 @@ public class FocusOverlayManager { private void initializeFocusAreas(int focusWidth, int focusHeight, int x, int y, int previewWidth, int previewHeight) { if (mFocusArea == null) { - mFocusArea = new ArrayList(); + mFocusArea = new ArrayList<>(); mFocusArea.add(new Area(new Rect(), 1)); } @@ -318,7 +318,7 @@ public class FocusOverlayManager { private void initializeMeteringAreas(int focusWidth, int focusHeight, int x, int y, int previewWidth, int previewHeight) { if (mMeteringArea == null) { - mMeteringArea = new ArrayList(); + mMeteringArea = new ArrayList<>(); mMeteringArea.add(new Area(new Rect(), 1)); } diff --git a/src/com/android/messaging/ui/mediapicker/camerafocus/PieItem.java b/src/com/android/messaging/ui/mediapicker/camerafocus/PieItem.java index ef8d28c..c6e3f29 100644 --- a/src/com/android/messaging/ui/mediapicker/camerafocus/PieItem.java +++ b/src/com/android/messaging/ui/mediapicker/camerafocus/PieItem.java @@ -74,7 +74,7 @@ public class PieItem { public void addItem(PieItem item) { if (mItems == null) { - mItems = new ArrayList(); + mItems = new ArrayList<>(); } mItems.add(item); } diff --git a/src/com/android/messaging/ui/mediapicker/camerafocus/PieRenderer.java b/src/com/android/messaging/ui/mediapicker/camerafocus/PieRenderer.java index f5db115..db89faa 100644 --- a/src/com/android/messaging/ui/mediapicker/camerafocus/PieRenderer.java +++ b/src/com/android/messaging/ui/mediapicker/camerafocus/PieRenderer.java @@ -149,7 +149,7 @@ public class PieRenderer extends OverlayRenderer private void init(Context ctx) { setVisible(false); - mItems = new ArrayList(); + mItems = new ArrayList<>(); Resources res = ctx.getResources(); mRadius = (int) res.getDimensionPixelSize(R.dimen.pie_radius_start); mCircleSize = mRadius - res.getDimensionPixelSize(R.dimen.focus_radius_offset); diff --git a/src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java b/src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java index 717760e..9702607 100644 --- a/src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java +++ b/src/com/android/messaging/ui/mediapicker/camerafocus/RenderOverlay.java @@ -53,8 +53,8 @@ public class RenderOverlay extends FrameLayout { mRenderView = new RenderView(context); addView(mRenderView, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - mClients = new ArrayList(10); - mTouchClients = new ArrayList(10); + mClients = new ArrayList<>(10); + mTouchClients = new ArrayList<>(10); setWillNotDraw(false); addRenderer(new PieRenderer(context)); diff --git a/src/com/android/messaging/util/AvatarUriUtil.java b/src/com/android/messaging/util/AvatarUriUtil.java index ff516ac..4c6c6a0 100644 --- a/src/com/android/messaging/util/AvatarUriUtil.java +++ b/src/com/android/messaging/util/AvatarUriUtil.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,7 +104,7 @@ public class AvatarUriUtil { } final int numParticipants = Math.min(participants.size(), MAX_GROUP_PARTICIPANTS); - final ArrayList avatarUris = new ArrayList(numParticipants); + final ArrayList avatarUris = new ArrayList<>(numParticipants); for (int i = 0; i < numParticipants; i++) { avatarUris.add(createAvatarUri(participants.get(i))); } diff --git a/src/com/android/messaging/util/FallbackStrategies.java b/src/com/android/messaging/util/FallbackStrategies.java index 57c208f..7c70f81 100644 --- a/src/com/android/messaging/util/FallbackStrategies.java +++ b/src/com/android/messaging/util/FallbackStrategies.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,13 +55,13 @@ public class FallbackStrategies { private final List> mChainedStrategies; private FallbackStrategies(final Strategy primaryStrategy) { - mChainedStrategies = new ArrayList>(); + mChainedStrategies = new ArrayList<>(); mChainedStrategies.add(primaryStrategy); } public static FallbackStrategies startWith( final Strategy primaryStrategy) { - return new FallbackStrategies(primaryStrategy); + return new FallbackStrategies<>(primaryStrategy); } public FallbackStrategies thenTry(final Strategy strategy) { diff --git a/src/com/android/messaging/util/LongSparseSet.java b/src/com/android/messaging/util/LongSparseSet.java index bb3843e..1df81d5 100644 --- a/src/com/android/messaging/util/LongSparseSet.java +++ b/src/com/android/messaging/util/LongSparseSet.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +24,7 @@ import androidx.collection.LongSparseArray; */ public class LongSparseSet { private static final Object THE_ONLY_VALID_VALUE = new Object(); - private final LongSparseArray mSet = new LongSparseArray(); + private final LongSparseArray mSet = new LongSparseArray<>(); public LongSparseSet() { } diff --git a/src/com/android/messaging/util/NotificationPlayer.java b/src/com/android/messaging/util/NotificationPlayer.java index f03f26b..ab451c9 100644 --- a/src/com/android/messaging/util/NotificationPlayer.java +++ b/src/com/android/messaging/util/NotificationPlayer.java @@ -64,7 +64,7 @@ public class NotificationPlayer implements OnCompletionListener { } } - private final LinkedList mCmdQueue = new LinkedList(); + private final LinkedList mCmdQueue = new LinkedList<>(); private Looper mLooper; diff --git a/src/com/android/messaging/util/OsUtil.java b/src/com/android/messaging/util/OsUtil.java index b0adabe..dd7983c 100644 --- a/src/com/android/messaging/util/OsUtil.java +++ b/src/com/android/messaging/util/OsUtil.java @@ -77,7 +77,7 @@ public class OsUtil { return null; } - private static final Hashtable sPermissions = new Hashtable(); + private static final Hashtable sPermissions = new Hashtable<>(); /** * Check if the app has the specified permission. If it does not, the app needs to use @@ -139,7 +139,7 @@ public class OsUtil { * again, and its up to the app to only request permissions that are missing. */ public static String[] getMissingPermissions(final String[] permissions) { - final ArrayList missingList = new ArrayList(); + final ArrayList missingList = new ArrayList<>(); for (final String permission : permissions) { if (!hasPermission(permission)) { missingList.add(permission); diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java index 29219a9..7aaec85 100644 --- a/src/com/android/messaging/util/UriUtil.java +++ b/src/com/android/messaging/util/UriUtil.java @@ -48,13 +48,13 @@ public class UriUtil { private static final String SCHEME_SMSTO = "smsto"; private static final String SCHEME_MMS = "mms"; private static final String SCHEME_MMSTO = "smsto"; - public static final HashSet SMS_MMS_SCHEMES = new HashSet( + public static final HashSet SMS_MMS_SCHEMES = new HashSet<>( Arrays.asList(SCHEME_SMS, SCHEME_MMS, SCHEME_SMSTO, SCHEME_MMSTO)); private static final String SCHEME_HTTP = "http"; private static final String SCHEME_HTTPS = "https"; public static final String SCHEME_BUGLE = "bugle"; - public static final HashSet SUPPORTED_SCHEME = new HashSet( + public static final HashSet SUPPORTED_SCHEME = new HashSet<>( Arrays.asList(ContentResolver.SCHEME_ANDROID_RESOURCE, ContentResolver.SCHEME_CONTENT, ContentResolver.SCHEME_FILE, diff --git a/src/com/android/messaging/util/exif/ExifData.java b/src/com/android/messaging/util/exif/ExifData.java index f6725ae..d323fca 100644 --- a/src/com/android/messaging/util/exif/ExifData.java +++ b/src/com/android/messaging/util/exif/ExifData.java @@ -48,7 +48,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) { @@ -256,7 +256,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(); @@ -286,7 +286,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); } @@ -301,7 +301,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/src/com/android/messaging/util/exif/ExifInterface.java b/src/com/android/messaging/util/exif/ExifInterface.java index 80ad554..aa9051a 100644 --- a/src/com/android/messaging/util/exif/ExifInterface.java +++ b/src/com/android/messaging/util/exif/ExifInterface.java @@ -323,7 +323,7 @@ public class ExifInterface { * Tags that contain offset markers. These are included in the banned * defines. */ - private static final HashSet sOffsetTags = new HashSet(); + private static final HashSet sOffsetTags = new HashSet<>(); static { sOffsetTags.add(getTrueTagKey(TAG_GPS_IFD)); sOffsetTags.add(getTrueTagKey(TAG_EXIF_IFD)); @@ -335,7 +335,7 @@ public class ExifInterface { /** * Tags with definitions that cannot be overridden (banned defines). */ - protected static final HashSet sBannedDefines = new HashSet(sOffsetTags); + protected static final HashSet sBannedDefines = new HashSet<>(sOffsetTags); static { sBannedDefines.add(getTrueTagKey(TAG_NULL)); sBannedDefines.add(getTrueTagKey(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH)); @@ -2392,7 +2392,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/src/com/android/messaging/util/exif/ExifModifier.java b/src/com/android/messaging/util/exif/ExifModifier.java index 274022c..c9ca593 100644 --- a/src/com/android/messaging/util/exif/ExifModifier.java +++ b/src/com/android/messaging/util/exif/ExifModifier.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,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/src/com/android/messaging/util/exif/ExifOutputStream.java b/src/com/android/messaging/util/exif/ExifOutputStream.java index 48c995f..2c73c04 100644 --- a/src/com/android/messaging/util/exif/ExifOutputStream.java +++ b/src/com/android/messaging/util/exif/ExifOutputStream.java @@ -243,7 +243,7 @@ class ExifOutputStream extends FilterOutputStream { } private ArrayList stripNullValueTags(ExifData data) { - ArrayList nullTags = new ArrayList(); + ArrayList nullTags = new ArrayList<>(); if (data.getAllTags() == null) { return nullTags; } diff --git a/src/com/android/messaging/util/exif/ExifParser.java b/src/com/android/messaging/util/exif/ExifParser.java index 62acf0d..2ae5c6f 100644 --- a/src/com/android/messaging/util/exif/ExifParser.java +++ b/src/com/android/messaging/util/exif/ExifParser.java @@ -179,7 +179,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/src/com/android/messaging/util/exif/IfdData.java b/src/com/android/messaging/util/exif/IfdData.java index 6b8c293..867fde3 100644 --- a/src/com/android/messaging/util/exif/IfdData.java +++ b/src/com/android/messaging/util/exif/IfdData.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2024 The LineageOS Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +29,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,