Messaging: Replace explicit types
Change-Id: I2165b3dec73973a2a82d8b3c7c364b5f011e597d
This commit is contained in:
@@ -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<Action> mBackgroundActions = new LinkedList<Action>();
|
||||
private final List<Action> mBackgroundActions = new LinkedList<>();
|
||||
|
||||
/**
|
||||
* Process the action locally - runs on action service thread.
|
||||
|
||||
@@ -413,8 +413,7 @@ public class ActionMonitor {
|
||||
* Map of action monitors indexed by actionKey
|
||||
*/
|
||||
@VisibleForTesting
|
||||
static final SimpleArrayMap<String, ActionMonitor> sActionMonitors =
|
||||
new SimpleArrayMap<String, ActionMonitor>();
|
||||
static final SimpleArrayMap<String, ActionMonitor> sActionMonitors = new SimpleArrayMap<>();
|
||||
|
||||
/**
|
||||
* Insert new monitor into map
|
||||
|
||||
@@ -188,7 +188,7 @@ public class DeleteConversationAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<DeleteConversationAction> CREATOR
|
||||
= new Parcelable.Creator<DeleteConversationAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public DeleteConversationAction createFromParcel(final Parcel in) {
|
||||
return new DeleteConversationAction(in);
|
||||
|
||||
@@ -119,7 +119,7 @@ public class DeleteMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<DeleteMessageAction> CREATOR
|
||||
= new Parcelable.Creator<DeleteMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public DeleteMessageAction createFromParcel(final Parcel in) {
|
||||
return new DeleteMessageAction(in);
|
||||
|
||||
@@ -327,8 +327,7 @@ public class DownloadMmsAction extends Action implements Parcelable {
|
||||
super(in);
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<DownloadMmsAction> CREATOR
|
||||
= new Parcelable.Creator<DownloadMmsAction>() {
|
||||
public static final Parcelable.Creator<DownloadMmsAction> CREATOR = new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public DownloadMmsAction createFromParcel(final Parcel in) {
|
||||
return new DownloadMmsAction(in);
|
||||
|
||||
@@ -97,7 +97,7 @@ public class FixupMessageStatusOnStartupAction extends Action implements Parcela
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<FixupMessageStatusOnStartupAction> CREATOR
|
||||
= new Parcelable.Creator<FixupMessageStatusOnStartupAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public FixupMessageStatusOnStartupAction createFromParcel(final Parcel in) {
|
||||
return new FixupMessageStatusOnStartupAction(in);
|
||||
|
||||
@@ -157,7 +157,7 @@ public class GetOrCreateConversationAction extends Action implements Parcelable
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<GetOrCreateConversationAction> CREATOR
|
||||
= new Parcelable.Creator<GetOrCreateConversationAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public GetOrCreateConversationAction createFromParcel(final Parcel in) {
|
||||
return new GetOrCreateConversationAction(in);
|
||||
|
||||
@@ -463,7 +463,7 @@ public class InsertNewMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<InsertNewMessageAction> CREATOR
|
||||
= new Parcelable.Creator<InsertNewMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public InsertNewMessageAction createFromParcel(final Parcel in) {
|
||||
return new InsertNewMessageAction(in);
|
||||
|
||||
@@ -96,8 +96,7 @@ public class MarkAsReadAction extends Action implements Parcelable {
|
||||
super(in);
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<MarkAsReadAction> CREATOR
|
||||
= new Parcelable.Creator<MarkAsReadAction>() {
|
||||
public static final Parcelable.Creator<MarkAsReadAction> CREATOR = new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public MarkAsReadAction createFromParcel(final Parcel in) {
|
||||
return new MarkAsReadAction(in);
|
||||
|
||||
@@ -109,8 +109,7 @@ public class MarkAsSeenAction extends Action implements Parcelable {
|
||||
super(in);
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<MarkAsSeenAction> CREATOR
|
||||
= new Parcelable.Creator<MarkAsSeenAction>() {
|
||||
public static final Parcelable.Creator<MarkAsSeenAction> CREATOR = new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public MarkAsSeenAction createFromParcel(final Parcel in) {
|
||||
return new MarkAsSeenAction(in);
|
||||
|
||||
@@ -106,7 +106,7 @@ public class ProcessDeliveryReportAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ProcessDeliveryReportAction> CREATOR
|
||||
= new Parcelable.Creator<ProcessDeliveryReportAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ProcessDeliveryReportAction createFromParcel(final Parcel in) {
|
||||
return new ProcessDeliveryReportAction(in);
|
||||
|
||||
@@ -565,7 +565,7 @@ public class ProcessDownloadedMmsAction extends Action {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ProcessDownloadedMmsAction> CREATOR
|
||||
= new Parcelable.Creator<ProcessDownloadedMmsAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ProcessDownloadedMmsAction createFromParcel(final Parcel in) {
|
||||
return new ProcessDownloadedMmsAction(in);
|
||||
|
||||
@@ -457,7 +457,7 @@ public class ProcessPendingMessagesAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ProcessPendingMessagesAction> CREATOR
|
||||
= new Parcelable.Creator<ProcessPendingMessagesAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ProcessPendingMessagesAction createFromParcel(final Parcel in) {
|
||||
return new ProcessPendingMessagesAction(in);
|
||||
|
||||
@@ -296,7 +296,7 @@ public class ProcessSentMessageAction extends Action {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ProcessSentMessageAction> CREATOR
|
||||
= new Parcelable.Creator<ProcessSentMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ProcessSentMessageAction createFromParcel(final Parcel in) {
|
||||
return new ProcessSentMessageAction(in);
|
||||
|
||||
@@ -150,7 +150,7 @@ public class ReadDraftDataAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ReadDraftDataAction> CREATOR
|
||||
= new Parcelable.Creator<ReadDraftDataAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ReadDraftDataAction createFromParcel(final Parcel in) {
|
||||
return new ReadDraftDataAction(in);
|
||||
|
||||
@@ -181,7 +181,7 @@ public class ReceiveMmsMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ReceiveMmsMessageAction> CREATOR
|
||||
= new Parcelable.Creator<ReceiveMmsMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ReceiveMmsMessageAction createFromParcel(final Parcel in) {
|
||||
return new ReceiveMmsMessageAction(in);
|
||||
|
||||
@@ -184,7 +184,7 @@ public class ReceiveSmsMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ReceiveSmsMessageAction> CREATOR
|
||||
= new Parcelable.Creator<ReceiveSmsMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ReceiveSmsMessageAction createFromParcel(final Parcel in) {
|
||||
return new ReceiveSmsMessageAction(in);
|
||||
|
||||
@@ -115,7 +115,7 @@ public class RedownloadMmsAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<RedownloadMmsAction> CREATOR
|
||||
= new Parcelable.Creator<RedownloadMmsAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public RedownloadMmsAction createFromParcel(final Parcel in) {
|
||||
return new RedownloadMmsAction(in);
|
||||
|
||||
@@ -115,7 +115,7 @@ public class ResendMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<ResendMessageAction> CREATOR
|
||||
= new Parcelable.Creator<ResendMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public ResendMessageAction createFromParcel(final Parcel in) {
|
||||
return new ResendMessageAction(in);
|
||||
|
||||
@@ -435,8 +435,7 @@ public class SendMessageAction extends Action implements Parcelable {
|
||||
super(in);
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<SendMessageAction> CREATOR
|
||||
= new Parcelable.Creator<SendMessageAction>() {
|
||||
public static final Parcelable.Creator<SendMessageAction> CREATOR = new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public SendMessageAction createFromParcel(final Parcel in) {
|
||||
return new SendMessageAction(in);
|
||||
|
||||
@@ -73,7 +73,7 @@ class SyncMessageBatch {
|
||||
mMmsToAdd = mmsToAdd;
|
||||
mMessagesToDelete = messagesToDelete;
|
||||
mCache = cache;
|
||||
mConversationsToUpdate = new HashSet<String>();
|
||||
mConversationsToUpdate = new HashSet<>();
|
||||
}
|
||||
|
||||
void updateLocalDatabase() {
|
||||
|
||||
@@ -221,12 +221,11 @@ public class SyncMessagesAction extends Action implements Parcelable {
|
||||
cache.clear();
|
||||
|
||||
// Sms messages to store
|
||||
final ArrayList<SmsMessage> smsToAdd = new ArrayList<SmsMessage>();
|
||||
final ArrayList<SmsMessage> smsToAdd = new ArrayList<>();
|
||||
// Mms messages to store
|
||||
final LongSparseArray<MmsMessage> mmsToAdd = new LongSparseArray<MmsMessage>();
|
||||
final LongSparseArray<MmsMessage> mmsToAdd = new LongSparseArray<>();
|
||||
// List of local SMS/MMS to remove
|
||||
final ArrayList<LocalDatabaseMessage> messagesToDelete =
|
||||
new ArrayList<LocalDatabaseMessage>();
|
||||
final ArrayList<LocalDatabaseMessage> 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<MmsMessage> mmsToAddList = new ArrayList<MmsMessage>();
|
||||
final ArrayList<MmsMessage> 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<SyncMessagesAction> CREATOR
|
||||
= new Parcelable.Creator<SyncMessagesAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public SyncMessagesAction createFromParcel(final Parcel in) {
|
||||
return new SyncMessagesAction(in);
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ public class UpdateConversationArchiveStatusAction extends Action {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<UpdateConversationArchiveStatusAction> CREATOR
|
||||
= new Parcelable.Creator<UpdateConversationArchiveStatusAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public UpdateConversationArchiveStatusAction createFromParcel(final Parcel in) {
|
||||
return new UpdateConversationArchiveStatusAction(in);
|
||||
|
||||
@@ -132,7 +132,7 @@ public class UpdateDestinationBlockedAction extends Action {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<UpdateDestinationBlockedAction> CREATOR
|
||||
= new Parcelable.Creator<UpdateDestinationBlockedAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public UpdateDestinationBlockedAction createFromParcel(final Parcel in) {
|
||||
return new UpdateDestinationBlockedAction(in);
|
||||
|
||||
@@ -47,7 +47,7 @@ public class UpdateMessageNotificationAction extends Action {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<UpdateMessageNotificationAction> CREATOR
|
||||
= new Parcelable.Creator<UpdateMessageNotificationAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public UpdateMessageNotificationAction createFromParcel(final Parcel in) {
|
||||
return new UpdateMessageNotificationAction(in);
|
||||
|
||||
@@ -87,7 +87,7 @@ public class UpdateMessagePartSizeAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<UpdateMessagePartSizeAction> CREATOR
|
||||
= new Parcelable.Creator<UpdateMessagePartSizeAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public UpdateMessagePartSizeAction createFromParcel(final Parcel in) {
|
||||
return new UpdateMessagePartSizeAction(in);
|
||||
|
||||
@@ -88,7 +88,7 @@ public class WriteDraftMessageAction extends Action implements Parcelable {
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<WriteDraftMessageAction> CREATOR
|
||||
= new Parcelable.Creator<WriteDraftMessageAction>() {
|
||||
= new Parcelable.Creator<>() {
|
||||
@Override
|
||||
public WriteDraftMessageAction createFromParcel(final Parcel in) {
|
||||
return new WriteDraftMessageAction(in);
|
||||
|
||||
Reference in New Issue
Block a user