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

#619 "Add android wear support"

Browse Source 
cleaned up debugging code
This commit is contained in:
Marcus Wolschon 2015-07-14 18:41:44 +02:00
parent 28889f6430
commit 932397183f
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4833,16 +4833,10 @@ public class MessagingController implements Runnable {
// Delete on wear only if no confirmation is required // Delete on wear only if no confirmation is required
// because they would have to be confirmed on the phone, not the wear device // because they would have to be confirmed on the phone, not the wear device
if (!K9.confirmDeleteFromNotification()) { if (!K9.confirmDeleteFromNotification()) {
String label = null; //TODO: temporary debugging code
if (allRefs.size()>1) {
label = context.getString(R.string.notification_action_delete_all);
} else {
label = context.getString(R.string.notification_action_delete) + " " + allRefs.get(0).restoreToLocalMessage(context).getSubject();
}//TODO: DANGEROUS CODE! In case of 2 new messages, this one deletes the wrong one! No idea why yet.
NotificationCompat.Action wearActionDelete = NotificationCompat.Action wearActionDelete =
new NotificationCompat.Action.Builder( new NotificationCompat.Action.Builder(
R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_dark,
label, //context.getString(allRefs.size()>1?R.string.notification_action_delete_all:R.string.notification_action_delete), context.getString(allRefs.size()>1?R.string.notification_action_delete_all:R.string.notification_action_delete),
NotificationDeleteConfirmation.getIntent(context, account, allRefs, notificationID)) NotificationDeleteConfirmation.getIntent(context, account, allRefs, notificationID))
.build(); .build();
builder.extend(wearableExtender.addAction(wearActionDelete)); builder.extend(wearableExtender.addAction(wearActionDelete));
@ -4960,14 +4954,7 @@ public class MessagingController implements Runnable {
subBuilder.setGroup(NOTIFICATION_GROUP_KEY); // same group as summary subBuilder.setGroup(NOTIFICATION_GROUP_KEY); // same group as summary
subBuilder.setAutoCancel(true); // summary closes all, stacked only itself subBuilder.setAutoCancel(true); // summary closes all, stacked only itself
realnID++;//TODO: test code realnID++;
// nID = 1000 + nID;
// reuse existing notification IDs if some of the stacked messages
// are already shown on the wear device.
//Integer realnID = data.getStackedChildNotification(m);
//if (realnID == null) {
// realnID = nID;
//}
// set content // set content
setNotificationContent(context, m, getMessageSender(context, account, m), getMessageSubject(context, m), subBuilder, accountDescr); setNotificationContent(context, m, getMessageSender(context, account, m), getMessageSubject(context, m), subBuilder, accountDescr);
@ -5051,7 +5038,7 @@ public class MessagingController implements Runnable {
platformSupportsLockScreenNotifications() platformSupportsLockScreenNotifications()
? R.drawable.ic_action_delete_dark_vector ? R.drawable.ic_action_delete_dark_vector
: R.drawable.ic_action_delete_dark, : R.drawable.ic_action_delete_dark,
"test " + context.getString(R.string.notification_action_delete), context.getString(R.string.notification_action_delete),
NotificationDeleteConfirmation.getIntent(context, account, allRefs, account.getAccountNumber())); NotificationDeleteConfirmation.getIntent(context, account, allRefs, account.getAccountNumber()));
} }
} else { } else {