archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore notification activity for all platforms

Browse Source
pull/574/head
Alex Baker 7 years ago
parent 51e29f46d6
commit 73865a7a0c
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File

5
app/src/main/java/org/tasks/notifications/NotificationManager.java
Unescape Escape View File

@ -45,7 +45,6 @@ import timber.log.Timber;
import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static com.google.common.collect.Iterables.isEmpty;
import static com.google.common.collect.Iterables.tryFind; import static com.google.common.collect.Iterables.tryFind;
import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.transform; import static com.google.common.collect.Lists.transform;
@ -331,16 +330,12 @@ public class NotificationManager {
builder.setTicker(taskTitle); builder.setTicker(taskTitle);
} }
if (atLeastJellybean()) {
builder.setContentIntent(PendingIntent.getActivity(context, (int) id, TaskIntents.getEditTaskIntent(context, null, id), PendingIntent.FLAG_UPDATE_CURRENT));
} else {
final Intent intent = new Intent(context, NotificationActivity.class); final Intent intent = new Intent(context, NotificationActivity.class);
intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK); intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK);
intent.setAction("NOTIFY" + id); //$NON-NLS-1$ intent.setAction("NOTIFY" + id); //$NON-NLS-1$
intent.putExtra(NotificationActivity.EXTRA_TASK_ID, id); intent.putExtra(NotificationActivity.EXTRA_TASK_ID, id);
intent.putExtra(NotificationActivity.EXTRA_TITLE, taskTitle); intent.putExtra(NotificationActivity.EXTRA_TITLE, taskTitle);
builder.setContentIntent(PendingIntent.getActivity(context, (int) id, intent, PendingIntent.FLAG_UPDATE_CURRENT)); builder.setContentIntent(PendingIntent.getActivity(context, (int) id, intent, PendingIntent.FLAG_UPDATE_CURRENT));
}
if (!Strings.isNullOrEmpty(taskDescription)) { if (!Strings.isNullOrEmpty(taskDescription)) {
builder.setStyle(new NotificationCompat.BigTextStyle().bigText(taskDescription)); builder.setStyle(new NotificationCompat.BigTextStyle().bigText(taskDescription));

Write Preview
Loading…
Cancel
Save