removing some functionality related to hiding reminder activity

app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt

@@ -54,7 +54,7 @@ class ReminderActivity : SimpleActivity() {
 
         Handler().postDelayed({
             if (isAlarmReminder) {
-                showAlarmNotification(alarm!!, true)
+                showAlarmNotification(alarm!!)
             } else {
                 showTimerNotification(true)
             }

app/src/main/kotlin/com/simplemobiletools/clock/activities/SnoozeReminderActivity.kt

@@ -1,6 +1,5 @@
 package com.simplemobiletools.clock.activities
 
-import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.simplemobiletools.clock.extensions.config
@@ -8,7 +7,6 @@ import com.simplemobiletools.clock.extensions.dbHelper
 import com.simplemobiletools.clock.extensions.hideNotification
 import com.simplemobiletools.clock.extensions.setupAlarmClock
 import com.simplemobiletools.clock.helpers.ALARM_ID
-import com.simplemobiletools.clock.helpers.HIDE_REMINDER_ACTIVITY
 import com.simplemobiletools.commons.extensions.showPickSecondsDialog
 import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
 
@@ -26,21 +24,11 @@ class SnoozeReminderActivity : AppCompatActivity() {
     }
 
     private fun dialogCancelled() {
-        checkReminderActivityHiding()
         finishActivity()
     }
 
     private fun finishActivity() {
-        checkReminderActivityHiding()
         finish()
         overridePendingTransition(0, 0)
     }
-
-    private fun checkReminderActivityHiding() {
-        if (intent.getBooleanExtra(HIDE_REMINDER_ACTIVITY, false)) {
-            Intent(this, ReminderActivity::class.java).apply {
-                startActivity(this)
-            }
-        }
-    }
 }

app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt

@@ -224,9 +224,9 @@ fun Context.rescheduleEnabledAlarms() {
 
 fun Context.isScreenOn() = (getSystemService(Context.POWER_SERVICE) as PowerManager).isScreenOn
 
-fun Context.showAlarmNotification(alarm: Alarm, addDeleteIntent: Boolean) {
+fun Context.showAlarmNotification(alarm: Alarm) {
     val pendingIntent = getOpenAlarmTabIntent()
-    val notification = getAlarmNotification(pendingIntent, alarm, addDeleteIntent)
+    val notification = getAlarmNotification(pendingIntent, alarm)
     val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     notificationManager.notify(alarm.id, notification)
     scheduleNextAlarm(alarm, false)
@@ -313,7 +313,7 @@ fun Context.getHideAlarmPendingIntent(alarm: Alarm): PendingIntent {
 }
 
 @SuppressLint("NewApi")
-fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, addDeleteIntent: Boolean): Notification {
+fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): Notification {
     var soundUri = alarm.soundUri
     if (soundUri == SILENT) {
         soundUri = ""
@@ -354,12 +354,8 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add
             .setAutoCancel(true)
             .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
             .setChannelId(channelId)
-            .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm, addDeleteIntent))
+            .addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm))
-            .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideAlarmPendingIntent(alarm))
+            .addAction(R.drawable.ic_cross, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm))
-
-    if (addDeleteIntent) {
-        builder.setDeleteIntent(reminderActivityIntent)
-    }
 
     if (isLollipopPlus()) {
         builder.setVisibility(Notification.VISIBILITY_PUBLIC)
@@ -375,11 +371,10 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm, add
     return notification
 }
 
-fun Context.getSnoozePendingIntent(alarm: Alarm, hideReminderActivity: Boolean): PendingIntent {
+fun Context.getSnoozePendingIntent(alarm: Alarm): PendingIntent {
     val snoozeClass = if (config.useSameSnooze) SnoozeService::class.java else SnoozeReminderActivity::class.java
     val intent = Intent(this, snoozeClass).setAction("Snooze")
     intent.putExtra(ALARM_ID, alarm.id)
-    intent.putExtra(HIDE_REMINDER_ACTIVITY, hideReminderActivity)
     return if (config.useSameSnooze) {
         PendingIntent.getService(this, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
     } else {

app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt

@@ -22,7 +22,6 @@ const val ALARM_ID = "alarm_id"
 const val DEFAULT_ALARM_MINUTES = 480
 const val DEFAULT_MAX_ALARM_REMINDER_SECS = 300
 const val DEFAULT_MAX_TIMER_REMINDER_SECS = 60
-const val HIDE_REMINDER_ACTIVITY = "hide_reminder_activity"
 
 const val PICK_AUDIO_FILE_INTENT_ID = 9994
 const val REMINDER_ACTIVITY_INTENT_ID = 9995

app/src/main/kotlin/com/simplemobiletools/clock/receivers/AlarmReceiver.kt

@@ -14,7 +14,7 @@ class AlarmReceiver : BroadcastReceiver() {
         val alarm = context.dbHelper.getAlarmWithId(id) ?: return
 
         if (context.isScreenOn()) {
-            context.showAlarmNotification(alarm, false)
+            context.showAlarmNotification(alarm)
             Handler().postDelayed({
                 context.hideNotification(id)
             }, context.config.alarmMaxReminderSecs * 1000L)

app/src/main/kotlin/com/simplemobiletools/clock/services/SnoozeService.kt

@@ -2,13 +2,11 @@ package com.simplemobiletools.clock.services
 
 import android.app.IntentService
 import android.content.Intent
-import com.simplemobiletools.clock.activities.ReminderActivity
 import com.simplemobiletools.clock.extensions.config
 import com.simplemobiletools.clock.extensions.dbHelper
 import com.simplemobiletools.clock.extensions.hideNotification
 import com.simplemobiletools.clock.extensions.setupAlarmClock
 import com.simplemobiletools.clock.helpers.ALARM_ID
-import com.simplemobiletools.clock.helpers.HIDE_REMINDER_ACTIVITY
 import com.simplemobiletools.commons.helpers.MINUTE_SECONDS
 
 class SnoozeService : IntentService("Snooze") {
@@ -17,12 +15,5 @@ class SnoozeService : IntentService("Snooze") {
         val alarm = dbHelper.getAlarmWithId(id) ?: return
         hideNotification(id)
         setupAlarmClock(alarm, config.snoozeTime * MINUTE_SECONDS)
-
-        if (intent.getBooleanExtra(HIDE_REMINDER_ACTIVITY, false)) {
-            Intent(this, ReminderActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                startActivity(this)
-            }
-        }
     }
 }