From a9b0907c312bd40ca7535681cc5c5f0e2f60481f Mon Sep 17 00:00:00 2001 From: Art O Cathain Date: Sun, 12 Oct 2014 09:24:08 +0100 Subject: [PATCH] further simplification --- .../fsck/k9/activity/NotificationDeleteConfirmation.java | 2 +- src/com/fsck/k9/service/NotificationActionService.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java b/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java index c3fd3e290..fd6f87db5 100644 --- a/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java +++ b/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java @@ -28,7 +28,7 @@ public class NotificationDeleteConfirmation extends Activity { private Account mAccount; private ArrayList mMessageRefs; - public static & Serializable> PendingIntent getIntent(Context context, final Account account, final T refs) { + public static PendingIntent getIntent(Context context, final Account account, final Serializable refs) { Intent i = new Intent(context, NotificationDeleteConfirmation.class); i.putExtra(EXTRA_ACCOUNT, account.getUuid()); i.putExtra(EXTRA_MESSAGE_LIST, refs); diff --git a/src/com/fsck/k9/service/NotificationActionService.java b/src/com/fsck/k9/service/NotificationActionService.java index 7d6cbd5b4..107bd0f4c 100644 --- a/src/com/fsck/k9/service/NotificationActionService.java +++ b/src/com/fsck/k9/service/NotificationActionService.java @@ -38,8 +38,7 @@ public class NotificationActionService extends CoreService { return PendingIntent.getService(context, account.getAccountNumber(), i, PendingIntent.FLAG_UPDATE_CURRENT); } - public static & Serializable> PendingIntent getReadAllMessagesIntent(Context context, final Account account, - final T refs) { + public static PendingIntent getReadAllMessagesIntent(Context context, final Account account, final Serializable refs) { Intent i = new Intent(context, NotificationActionService.class); i.putExtra(EXTRA_ACCOUNT, account.getUuid()); i.putExtra(EXTRA_MESSAGE_LIST, refs); @@ -56,8 +55,7 @@ public class NotificationActionService extends CoreService { return PendingIntent.getService(context, account.getAccountNumber(), i, PendingIntent.FLAG_UPDATE_CURRENT); } - public static & Serializable> Intent getDeleteAllMessagesIntent(Context context, final Account account, - final T refs) { + public static Intent getDeleteAllMessagesIntent(Context context, final Account account, final Serializable refs) { Intent i = new Intent(context, NotificationActionService.class); i.putExtra(EXTRA_ACCOUNT, account.getUuid()); i.putExtra(EXTRA_MESSAGE_LIST, refs);