From 773de4d966ab3cc7d70923e1ebe71b37743ec7ea Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 22 Aug 2022 15:48:53 +1200
Subject: [PATCH] Fix adding 1 minute after timer has ended

---
 .../src/main/java/com/massive/TimerService.kt | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/com/massive/TimerService.kt b/android/app/src/main/java/com/massive/TimerService.kt
index 40bac39..b165acf 100644
--- a/android/app/src/main/java/com/massive/TimerService.kt
+++ b/android/app/src/main/java/com/massive/TimerService.kt
@@ -88,17 +88,29 @@ class TimerService : Service() {
         super.onDestroy()
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
     private fun getBuilder(context: Context): NotificationCompat.Builder {
         val contentIntent = Intent(context, MainActivity::class.java)
         val pendingContent =
-            PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_IMMUTABLE)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_IMMUTABLE)
+            } else {
+                PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            }
         val stopIntent = Intent(context, StopTimer::class.java)
         val pendingStop =
-            PendingIntent.getService(context, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.getService(context, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE)
+            } else {
+                PendingIntent.getService(context, 0, stopIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            }
         val addIntent = Intent(context, TimerService::class.java)
         addIntent.action = "add"
-        val pendingAdd = PendingIntent.getService(context, 0, addIntent, PendingIntent.FLAG_IMMUTABLE)
+        addIntent.putExtra("vibrate", vibrate)
+        val pendingAdd = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.getService(context, 0, addIntent, PendingIntent.FLAG_MUTABLE)
+        } else {
+            PendingIntent.getService(context, 0, addIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
         return NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_baseline_hourglass_bottom_24)
             .setContentTitle("Resting")