From 2027ab68582603a0a2e9b9b14df5c8b200d94166 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 9 Jul 2020 11:04:00 -0500
Subject: [PATCH] Fix snooze intent flags

---
 app/src/main/AndroidManifest.xml              |  3 +--
 .../notifications/NotificationManager.java    | 12 +++------
 .../tasks/reminders/NotificationActivity.java |  7 +----
 .../org/tasks/reminders/SnoozeActivity.java   | 27 ++++++++++++-------
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98c099105..432c26e84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -287,9 +287,8 @@
 
     <activity
       android:excludeFromRecents="true"
-      android:launchMode="singleTask"
       android:name=".reminders.SnoozeActivity"
-      android:taskAffinity=""
+      android:taskAffinity=":snooze"
       android:theme="@style/TranslucentDialog"/>
 
     <activity
diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.java b/app/src/main/java/org/tasks/notifications/NotificationManager.java
index 360ca8cb1..3013433fc 100644
--- a/app/src/main/java/org/tasks/notifications/NotificationManager.java
+++ b/app/src/main/java/org/tasks/notifications/NotificationManager.java
@@ -304,9 +304,7 @@ public class NotificationManager {
                     ? NotificationCompat.GROUP_ALERT_SUMMARY
                     : NotificationCompat.GROUP_ALERT_CHILDREN);
 
-    Intent snoozeIntent = new Intent(context, SnoozeActivity.class);
-    snoozeIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
-    snoozeIntent.putExtra(SnoozeActivity.EXTRA_TASK_IDS, taskIds);
+    Intent snoozeIntent = SnoozeActivity.newIntent(context, taskIds);
     builder.addAction(
         R.drawable.ic_snooze_white_24dp,
         context.getString(R.string.snooze_all),
@@ -410,9 +408,7 @@ public class NotificationManager {
                 completePendingIntent)
             .build();
 
-    Intent snoozeIntent = new Intent(context, SnoozeActivity.class);
-    snoozeIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
-    snoozeIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id);
+    Intent snoozeIntent = SnoozeActivity.newIntent(context, id);
     PendingIntent snoozePendingIntent =
         PendingIntent.getActivity(
             context, (int) id, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -422,10 +418,8 @@ public class NotificationManager {
     wearableExtender.addAction(completeAction);
     for (final SnoozeOption snoozeOption : SnoozeDialog.getSnoozeOptions(preferences)) {
       final long timestamp = snoozeOption.getDateTime().getMillis();
-      Intent wearableIntent = new Intent(context, SnoozeActivity.class);
-      wearableIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      Intent wearableIntent = SnoozeActivity.newIntent(context, id);
       wearableIntent.setAction(String.format("snooze-%s-%s", id, timestamp));
-      wearableIntent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id);
       wearableIntent.putExtra(SnoozeActivity.EXTRA_SNOOZE_TIME, timestamp);
       PendingIntent wearablePendingIntent =
           PendingIntent.getActivity(
diff --git a/app/src/main/java/org/tasks/reminders/NotificationActivity.java b/app/src/main/java/org/tasks/reminders/NotificationActivity.java
index 6dd62ee85..9c754bc8d 100644
--- a/app/src/main/java/org/tasks/reminders/NotificationActivity.java
+++ b/app/src/main/java/org/tasks/reminders/NotificationActivity.java
@@ -1,7 +1,5 @@
 package org.tasks.reminders;
 
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.fragment.app.FragmentManager;
@@ -100,10 +98,7 @@ public class NotificationActivity extends InjectingAppCompatActivity
   @Override
   public void snooze() {
     finish();
-    Intent intent = new Intent(this, SnoozeActivity.class);
-    intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
-    intent.putExtra(SnoozeActivity.EXTRA_TASK_ID, taskId);
-    startActivity(intent);
+    startActivity(SnoozeActivity.newIntent(this, taskId));
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/reminders/SnoozeActivity.java b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
index e1dd5c771..8a5389168 100644
--- a/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
+++ b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
@@ -1,5 +1,6 @@
 package org.tasks.reminders;
 
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -21,6 +22,7 @@ import org.tasks.time.DateTime;
 public class SnoozeActivity extends InjectingAppCompatActivity
     implements SnoozeCallback, DialogInterface.OnCancelListener {
 
+  private static final int FLAGS = Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK;
   public static final String EXTRA_TASK_ID = "id";
   public static final String EXTRA_TASK_IDS = "ids";
   public static final String EXTRA_SNOOZE_TIME = "snooze_time";
@@ -34,23 +36,28 @@ public class SnoozeActivity extends InjectingAppCompatActivity
   @Inject ThemeAccent themeAccent;
   private boolean pickingDateTime;
 
+  public static Intent newIntent(Context context, Long id) {
+    Intent intent = new Intent(context, SnoozeActivity.class);
+    intent.setFlags(FLAGS);
+    intent.putExtra(SnoozeActivity.EXTRA_TASK_ID, id);
+    return intent;
+  }
+
+  public static Intent newIntent(Context context, ArrayList<Long> ids) {
+    Intent intent = new Intent(context, SnoozeActivity.class);
+    intent.setFlags(FLAGS);
+    intent.putExtra(SnoozeActivity.EXTRA_TASK_IDS, ids);
+    return intent;
+  }
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
     themeAccent.applyStyle(getTheme());
 
-    setup(getIntent(), savedInstanceState);
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-
-    setup(intent, null);
-  }
+    Intent intent = getIntent();
 
-  private void setup(Intent intent, Bundle savedInstanceState) {
     if (intent.hasExtra(EXTRA_TASK_ID)) {
       taskIds.add(intent.getLongExtra(EXTRA_TASK_ID, -1L));
     } else if (intent.hasExtra(EXTRA_TASK_IDS)) {