From b687b1a4c552a63b9ab2249f4c49fceed48f77a2 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 16 Jun 2020 17:38:16 -0400
Subject: [PATCH] Fix repeat alerts by using explicit reminder intent.

---
 app/src/main/AndroidManifest.xml                            | 6 +-----
 .../securesms/notifications/DefaultMessageNotifier.java     | 4 ++--
 .../securesms/notifications/MessageNotifier.java            | 4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 87b25d3842..365a4b29cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -710,11 +710,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
-        </intent-filter>
-    </receiver>
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
 
     <receiver android:name=".notifications.DeleteNotificationReceiver">
         <intent-filter>
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 5af370f1bb..0e67d25b49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -637,7 +637,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
     }
 
     AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-    Intent       alarmIntent  = new Intent(ReminderReceiver.REMINDER_ACTION);
+    Intent       alarmIntent  = new Intent(context, ReminderReceiver.class);
     alarmIntent.putExtra("reminder_count", count);
 
     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, PendingIntent.FLAG_CANCEL_CURRENT);
@@ -648,7 +648,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
   @Override
   public void clearReminder(@NonNull Context context) {
-    Intent        alarmIntent   = new Intent(ReminderReceiver.REMINDER_ACTION);
+    Intent        alarmIntent   = new Intent(context, ReminderReceiver.class);
     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, PendingIntent.FLAG_CANCEL_CURRENT);
     AlarmManager  alarmManager  = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 16d59410a2..98a903be71 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.notifications;
 
-import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -26,9 +25,6 @@ public interface MessageNotifier {
 
   class ReminderReceiver extends BroadcastReceiver {
 
-    public static final String REMINDER_ACTION = "org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION";
-
-    @SuppressLint("StaticFieldLeak")
     @Override
     public void onReceive(final Context context, final Intent intent) {
       SignalExecutors.BOUNDED.execute(() -> {