moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-09 12:48:02 -05:00
Code Issues Releases Wiki Activity

#619 "Add android wear support"

Browse Source 
removed dontCancel
update (stacked) notifications after a notification action was invoked
This commit is contained in:
Marcus Wolschon 2015-07-05 11:11:15 +02:00
parent 59287e0af0
commit 5fed2684e1
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
View File

@ -34,6 +34,7 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder; import android.support.v4.app.TaskStackBuilder;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -4673,6 +4674,7 @@ public class MessagingController implements Runnable {
return false; return false;
} }
return true;
} }
/** /**
@ -4686,7 +4688,7 @@ public class MessagingController implements Runnable {
* @return A pending data instance, or null if one doesn't exist and * @return A pending data instance, or null if one doesn't exist and
* previousUnreadMessageCount was passed as null. * previousUnreadMessageCount was passed as null.
*/ */
private NotificationData getNotificationData(Account account, Integer previousUnreadMessageCount) { private NotificationData getNotificationData(Account account, @Nullable Integer previousUnreadMessageCount) {
NotificationData data; NotificationData data;
synchronized (notificationData) { synchronized (notificationData) {
@ -4807,6 +4809,16 @@ public class MessagingController implements Runnable {
return null; return null;
} }
/**
* Creates a notification of a newly received message.
*/
public void updateAccountNotification(final Context context, final Account account) {
final NotificationData data = getNotificationData(account, null);
//noinspection SynchronizationOnLocalVariableOrMethodParameter
synchronized (data) {
notifyAccountWithDataLocked(context, account, null, data);
}
}
/** /**
* Creates a notification of a newly received message. * Creates a notification of a newly received message.
*/ */
@ -4879,7 +4891,7 @@ public class MessagingController implements Runnable {
new NotificationCompat.Action.Builder( new NotificationCompat.Action.Builder(
R.drawable.ic_action_archive_dark, R.drawable.ic_action_archive_dark,
context.getString(R.string.notification_action_archive), context.getString(R.string.notification_action_archive),
NotificationActionService.getArchiveAllMessagesIntent(context, account, allRefs, totalMsgCount > msgCount, notificationID)) NotificationActionService.getArchiveAllMessagesIntent(context, account, allRefs, notificationID))
.build(); .build();
builder.extend(wearableExtender.addAction(wearActionArchive)); builder.extend(wearableExtender.addAction(wearActionArchive));
} }
@ -4890,7 +4902,7 @@ public class MessagingController implements Runnable {
new NotificationCompat.Action.Builder( new NotificationCompat.Action.Builder(
R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark,
context.getString(R.string.notification_action_spam), context.getString(R.string.notification_action_spam),
NotificationActionService.getSpamAllMessagesIntent(context, account, allRefs, totalMsgCount > msgCount, notificationID)) NotificationActionService.getSpamAllMessagesIntent(context, account, allRefs, notificationID))
.build(); .build();
builder.extend(wearableExtender.addAction(wearActionSpam)); builder.extend(wearableExtender.addAction(wearActionSpam));
} }

34
k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java
View File

@ -35,7 +35,6 @@ public class NotificationActionService extends CoreService {
private final static String EXTRA_ACCOUNT = "account"; private final static String EXTRA_ACCOUNT = "account";
private final static String EXTRA_MESSAGE = "message"; private final static String EXTRA_MESSAGE = "message";
private final static String EXTRA_MESSAGE_LIST = "messages"; private final static String EXTRA_MESSAGE_LIST = "messages";
private final static String EXTRA_DONTCANCEL = "dontcancel";
/** /**
* ID of the notification that triggered an intent. * ID of the notification that triggered an intent.
* Used to cancel exactly that one notification because due to * Used to cancel exactly that one notification because due to
@ -121,7 +120,7 @@ public class NotificationActionService extends CoreService {
* Check if for the given parameters the ArchiveAllMessages intent is possible for Android Wear. * Check if for the given parameters the ArchiveAllMessages intent is possible for Android Wear.
* (No confirmation on the phone required and moving these messages to the spam-folder possible)<br/> * (No confirmation on the phone required and moving these messages to the spam-folder possible)<br/>
* Since we can not show a toast like on the phone screen, we must not offer actions that can not be performed. * Since we can not show a toast like on the phone screen, we must not offer actions that can not be performed.
* @see #getArchiveAllMessagesIntent(android.content.Context, com.fsck.k9.Account, java.io.Serializable, boolean, int) * @see #getArchiveAllMessagesIntent(android.content.Context, com.fsck.k9.Account, java.io.Serializable, int)
* @param context the context to get a {@link MessagingController} * @param context the context to get a {@link MessagingController}
* @param account the account (must allow moving messages to allow true as a result) * @param account the account (must allow moving messages to allow true as a result)
* @param messages the messages to move to the spam folder (must be synchronized to allow true as a result) * @param messages the messages to move to the spam folder (must be synchronized to allow true as a result)
@ -137,18 +136,14 @@ public class NotificationActionService extends CoreService {
* @param context context to use for creating the {@link Intent} * @param context context to use for creating the {@link Intent}
* @param account the account we intent to act on * @param account the account we intent to act on
* @param refs the messages we intent to act on * @param refs the messages we intent to act on
* @param dontCancel if true, after executing the intent, not all notifications for this account are canceled automatically
* @param notificationID ID of the notification, this intent is for. * @param notificationID ID of the notification, this intent is for.
* @return the requested intent. To be used in a Notification. * @return the requested intent. To be used in a Notification.
* @see #EXTRA_NOTIFICATION_ID * @see #EXTRA_NOTIFICATION_ID
*/ */
public static PendingIntent getArchiveAllMessagesIntent(Context context, final Account account, final Serializable refs, final boolean dontCancel, final int notificationID) { public static PendingIntent getArchiveAllMessagesIntent(Context context, final Account account, final Serializable refs, final int notificationID) {
Intent i = new Intent(context, NotificationActionService.class); Intent i = new Intent(context, NotificationActionService.class);
i.putExtra(EXTRA_ACCOUNT, account.getUuid()); i.putExtra(EXTRA_ACCOUNT, account.getUuid());
i.putExtra(EXTRA_MESSAGE_LIST, refs); i.putExtra(EXTRA_MESSAGE_LIST, refs);
if (dontCancel) {
i.putExtra(EXTRA_DONTCANCEL, true);
}
i.putExtra(EXTRA_NOTIFICATION_ID, notificationID); i.putExtra(EXTRA_NOTIFICATION_ID, notificationID);
i.setAction(ARCHIVE_ALL_ACTION); i.setAction(ARCHIVE_ALL_ACTION);
@ -160,7 +155,7 @@ public class NotificationActionService extends CoreService {
* Check if for the given parameters the SpamAllMessages intent is possible for Android Wear. * Check if for the given parameters the SpamAllMessages intent is possible for Android Wear.
* (No confirmation on the phone required and moving these messages to the spam-folder possible)<br/> * (No confirmation on the phone required and moving these messages to the spam-folder possible)<br/>
* Since we can not show a toast like on the phone screen, we must not offer actions that can not be performed. * Since we can not show a toast like on the phone screen, we must not offer actions that can not be performed.
* @see #getSpamAllMessagesIntent(android.content.Context, com.fsck.k9.Account, java.io.Serializable, boolean, int) * @see #getSpamAllMessagesIntent(android.content.Context, com.fsck.k9.Account, java.io.Serializable, int)
* @param context the context to get a {@link MessagingController} * @param context the context to get a {@link MessagingController}
* @param account the account (must allow moving messages to allow true as a result) * @param account the account (must allow moving messages to allow true as a result)
* @param messages the messages to move to the spam folder (must be synchronized to allow true as a result) * @param messages the messages to move to the spam folder (must be synchronized to allow true as a result)
@ -176,18 +171,14 @@ public class NotificationActionService extends CoreService {
* @param context context to use for creating the {@link Intent} * @param context context to use for creating the {@link Intent}
* @param account the account we intent to act on * @param account the account we intent to act on
* @param refs the messages we intent to act on * @param refs the messages we intent to act on
* @param dontCancel if true, after executing the intent, not all notifications for this account are canceled automatically
* @param notificationID ID of the notification, this intent is for. * @param notificationID ID of the notification, this intent is for.
* @return the requested intent. To be used in a Notification. * @return the requested intent. To be used in a Notification.
* @see #EXTRA_NOTIFICATION_ID * @see #EXTRA_NOTIFICATION_ID
*/ */
public static PendingIntent getSpamAllMessagesIntent(Context context, final Account account, final Serializable refs, final boolean dontCancel, final int notificationID) { public static PendingIntent getSpamAllMessagesIntent(Context context, final Account account, final Serializable refs, final int notificationID) {
Intent i = new Intent(context, NotificationActionService.class); Intent i = new Intent(context, NotificationActionService.class);
i.putExtra(EXTRA_ACCOUNT, account.getUuid()); i.putExtra(EXTRA_ACCOUNT, account.getUuid());
i.putExtra(EXTRA_MESSAGE_LIST, refs); i.putExtra(EXTRA_MESSAGE_LIST, refs);
if (dontCancel) {
i.putExtra(EXTRA_DONTCANCEL, true);
}
i.putExtra(EXTRA_NOTIFICATION_ID, notificationID); i.putExtra(EXTRA_NOTIFICATION_ID, notificationID);
i.setAction(SPAM_ALL_ACTION); i.setAction(SPAM_ALL_ACTION);
@ -317,15 +308,16 @@ public class NotificationActionService extends CoreService {
// if this was a stacked notification on Android Wear, update the summary // if this was a stacked notification on Android Wear, update the summary
// notification and keep the other stacked notifications // notification and keep the other stacked notifications
if (!intent.hasExtra(EXTRA_DONTCANCEL)) { if (intent.hasExtra(EXTRA_NOTIFICATION_ID)) {
// there's no point in keeping the notification after the user clicked on it // there's no point in keeping the notification after the user clicked on it
if (intent.hasExtra(EXTRA_NOTIFICATION_ID)) { NotificationManager notificationManager =
NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
(NotificationManager)this.getSystemService(Context.NOTIFICATION_SERVICE); notificationManager.cancel(intent.getIntExtra(EXTRA_NOTIFICATION_ID, account.getAccountNumber()));
notificationManager.cancel(intent.getIntExtra(EXTRA_NOTIFICATION_ID, account.getAccountNumber()));
} else { // update the summary notification
controller.notifyAccountCancel(this, account); MessagingController.getInstance(this).updateAccountNotification(this, account);
} } else {
controller.notifyAccountCancel(this, account);
} }
} else { } else {
Log.w(K9.LOG_TAG, "Could not find account for notification action."); Log.w(K9.LOG_TAG, "Could not find account for notification action.");