1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
index cf6d7e5a..fdecc104 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
@@ -353,6 +353,9 @@ public class CellBroadcastAlertFullScreen extends Activity {
         setTitle(titleId);
         ((TextView) findViewById(R.id.alertTitle)).setText(titleId);
         ((TextView) findViewById(R.id.message)).setText(message.getMessageBody());
+
+        // Set alert reminder depending on user preference
+        CellBroadcastAlertReminder.queueAlertReminder(this, true);
     }
 
     /**
@@ -386,6 +389,9 @@ public class CellBroadcastAlertFullScreen extends Activity {
         // Stop playing alert sound/vibration/speech (if started)
         stopService(new Intent(this, CellBroadcastAlertAudio.class));
 
+        // Cancel any pending alert reminder
+        CellBroadcastAlertReminder.cancelAlertReminder();
+
         // Remove the current alert message from the list.
         CellBroadcastMessage lastMessage = removeLatestMessage();
         if (lastMessage == null) {