From ee5e15c3849249f4e9c3d86563496437691ff171 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 14 Mar 2018 18:21:34 +0100
Subject: [PATCH] remove Reminder activity on notification swipe

---
 app/src/main/AndroidManifest.xml              |  4 +++-
 .../clock/activities/ReminderActivity.kt      |  8 +++++++-
 .../clock/extensions/Context.kt               | 19 +++++++++++++++----
 .../clock/fragments/TimerFragment.kt          |  2 +-
 .../clock/helpers/Constants.kt                |  1 +
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 66bd8762..258f3db6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,9 @@
             android:name=".activities.MainActivity"
             android:launchMode="singleTask"/>
 
-        <activity android:name=".activities.ReminderActivity"/>
+        <activity
+            android:name=".activities.ReminderActivity"
+            android:launchMode="singleTask"/>
 
         <activity
             android:name=".activities.SettingsActivity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
index cf16aeb4..a437d573 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
@@ -1,5 +1,6 @@
 package com.simplemobiletools.clock.activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import com.simplemobiletools.clock.R
@@ -39,7 +40,7 @@ class ReminderActivity : SimpleActivity() {
             if (isAlarmReminder) {
                 showAlarmNotification(alarm!!)
             } else {
-                showTimerNotification()
+                showTimerNotification(true)
             }
 
             val maxDuration = if (isAlarmReminder) config.alarmMaxReminderSecs else config.timerMaxReminderSecs
@@ -49,6 +50,11 @@ class ReminderActivity : SimpleActivity() {
         }, 1000L)
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        finish()
+    }
+
     override fun onStop() {
         super.onStop()
         if (isAlarmReminder) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
index 695265dd..f9388276 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
@@ -16,6 +16,7 @@ import android.text.SpannableString
 import android.text.style.RelativeSizeSpan
 import android.widget.Toast
 import com.simplemobiletools.clock.R
+import com.simplemobiletools.clock.activities.ReminderActivity
 import com.simplemobiletools.clock.activities.SnoozeReminderActivity
 import com.simplemobiletools.clock.activities.SplashActivity
 import com.simplemobiletools.clock.helpers.*
@@ -243,15 +244,15 @@ fun Context.showAlarmNotification(alarm: Alarm) {
     scheduleNextAlarm(alarm, false)
 }
 
-fun Context.showTimerNotification() {
+fun Context.showTimerNotification(addDeleteIntent: Boolean) {
     val pendingIntent = getOpenTimerTabIntent()
-    val notification = getTimerNotification(pendingIntent)
+    val notification = getTimerNotification(pendingIntent, addDeleteIntent)
     val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     notificationManager.notify(TIMER_NOTIF_ID, notification)
 }
 
 @SuppressLint("NewApi")
-fun Context.getTimerNotification(pendingIntent: PendingIntent): Notification {
+fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent: Boolean): Notification {
     val channelId = "timer_channel"
     if (isOreoPlus()) {
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -265,6 +266,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent): Notification {
         }
     }
 
+    val reminderActivityIntent = getReminderActivityIntent()
     val builder = NotificationCompat.Builder(this)
             .setContentTitle(getString(R.string.timer))
             .setContentText(getString(R.string.time_expired))
@@ -275,7 +277,11 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent): Notification {
             .setAutoCancel(true)
             .setSound(Uri.parse(config.timerSoundUri), AudioManager.STREAM_SYSTEM)
             .setChannelId(channelId)
-            .addAction(R.drawable.ic_cross, getString(R.string.dismiss), getTimerPendingIntent())
+            .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getTimerPendingIntent())
+
+    if (addDeleteIntent) {
+        builder.setDeleteIntent(reminderActivityIntent)
+    }
 
     if (isLollipopPlus()) {
         builder.setVisibility(Notification.VISIBILITY_PUBLIC)
@@ -347,3 +353,8 @@ fun Context.getSnoozePendingIntent(alarm: Alarm): PendingIntent {
         PendingIntent.getActivity(this, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 }
+
+fun Context.getReminderActivityIntent(): PendingIntent {
+    val intent = Intent(this, ReminderActivity::class.java)
+    return PendingIntent.getActivity(this, REMINDER_ACTIVITY_INTENT_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
index 5fda5a98..d937a74d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
@@ -170,7 +170,7 @@ class TimerFragment : Fragment() {
         view.timer_time.text = formattedDuration
         if (diff == 0) {
             if (context?.isScreenOn() == true) {
-                context!!.showTimerNotification()
+                context!!.showTimerNotification(false)
                 Handler().postDelayed({
                     context?.hideTimerNotification()
                 }, context?.config!!.timerMaxReminderSecs * 1000L)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
index 9b5503ae..126200bb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
@@ -23,6 +23,7 @@ const val DAY_MINUTES = 1440
 const val DEFAULT_MAX_ALARM_REMINDER_SECS = 300
 const val DEFAULT_MAX_TIMER_REMINDER_SECS = 60
 
+const val REMINDER_ACTIVITY_INTENT_ID = 9995
 const val OPEN_ALARMS_TAB_INTENT_ID = 9996
 const val UPDATE_WIDGET_INTENT_ID = 9997
 const val OPEN_APP_INTENT_ID = 9998